diff --git a/include/matador/object/object_definition.hpp b/include/matador/object/object_definition.hpp
index c8f9aa7..564dfdf 100644
--- a/include/matador/object/object_definition.hpp
+++ b/include/matador/object/object_definition.hpp
@@ -9,8 +9,8 @@ namespace matador::object {
 
 class object_definition final {
 private:
-  using column_by_index = std::vector<object::attribute_definition>;
-  using column_index_pair = std::pair<std::reference_wrapper<object::attribute_definition>, column_by_index::difference_type>;
+  using column_by_index = std::vector<attribute_definition>;
+  using column_index_pair = std::pair<std::reference_wrapper<attribute_definition>, column_by_index::difference_type>;
   using column_by_name_map = std::unordered_map<std::string, column_index_pair>;
 
 public:
@@ -18,8 +18,8 @@ public:
   using const_iterator = column_by_index::const_iterator;
 
   object_definition() = default;
-  object_definition(std::initializer_list<object::attribute_definition> columns);
-  explicit object_definition(const std::vector<object::attribute_definition> &columns);
+  object_definition(std::initializer_list<attribute_definition> columns);
+  explicit object_definition(const std::vector<attribute_definition> &columns);
   object_definition(const object_definition &x);
   object_definition& operator=(const object_definition &x);
   object_definition(object_definition&&) noexcept = default;
@@ -27,7 +27,7 @@ public:
   ~object_definition() = default;
 
   [[nodiscard]] bool has_primary_key() const;
-  [[nodiscard]] std::optional<object::attribute_definition> primary_key() const;
+  [[nodiscard]] std::optional<attribute_definition> primary_key() const;
 
   template < typename Type >
   void append(const std::string &name, long size = -1) {
@@ -35,7 +35,7 @@ public:
   }
   void append(attribute_definition col);
 
-  [[nodiscard]] const std::vector<object::attribute_definition>& columns() const;
+  [[nodiscard]] const std::vector<attribute_definition>& columns() const;
 
   [[nodiscard]] const attribute_definition& at(const std::string &name) const;
   [[nodiscard]] const attribute_definition& at(size_t index) const;
diff --git a/source/core/object/object_definition.cpp b/source/core/object/object_definition.cpp
index 760e8c6..c537833 100644
--- a/source/core/object/object_definition.cpp
+++ b/source/core/object/object_definition.cpp
@@ -1,13 +1,13 @@
 #include "matador/object/object_definition.hpp"
 
 namespace matador::object {
-object_definition::object_definition(std::initializer_list<object::attribute_definition> columns)
+object_definition::object_definition(const std::initializer_list<attribute_definition> columns)
 : columns_(columns)
 {
   init();
 }
 
-object_definition::object_definition(const std::vector<object::attribute_definition> &columns)
+object_definition::object_definition(const std::vector<attribute_definition> &columns)
 : columns_(columns)
 {
   init();
@@ -42,7 +42,7 @@ bool object_definition::has_primary_key() const
     return pk_index_ > -1;
 }
 
-std::optional<object::attribute_definition> object_definition::primary_key() const
+std::optional<attribute_definition> object_definition::primary_key() const
 {
   if (!has_primary_key()) {
     return std::nullopt;