diff --git a/include/sqlpp11/result_row.h b/include/sqlpp11/result_row.h
index 2132390e..60528ed0 100644
--- a/include/sqlpp11/result_row.h
+++ b/include/sqlpp11/result_row.h
@@ -41,9 +41,9 @@ namespace sqlpp
 
 		template<typename Db, std::size_t index, typename FieldSpec>
 			struct result_field:
-				public FieldSpec::_name_t::template _member_t<result_field_t<value_type_of<FieldSpec>, Db, FieldSpec>>
+				public member_t<FieldSpec, result_field_t<value_type_of<FieldSpec>, Db, FieldSpec>>
 		{
-			using _field = typename FieldSpec::_name_t::template _member_t<result_field_t<value_type_of<FieldSpec>, Db, FieldSpec>>;
+			using _field = member_t<FieldSpec, result_field_t<value_type_of<FieldSpec>, Db, FieldSpec>>;
 
 			result_field() = default;
 
@@ -66,9 +66,9 @@ namespace sqlpp
 
 		template<std::size_t index, typename AliasProvider, typename Db, typename... FieldSpecs>
 			struct result_field<Db, index, multi_field_spec_t<AliasProvider, std::tuple<FieldSpecs...>>>: 
-			public AliasProvider::_name_t::template _member_t<result_row_impl<Db, detail::make_field_index_sequence<index, FieldSpecs...>, FieldSpecs...>>
+			public member_t<AliasProvider, result_row_impl<Db, detail::make_field_index_sequence<index, FieldSpecs...>, FieldSpecs...>>
 			{
-				using _multi_field = typename AliasProvider::_name_t::template _member_t<result_row_impl<Db, detail::make_field_index_sequence<index, FieldSpecs...>, FieldSpecs...>>;
+				using _multi_field = member_t<AliasProvider, result_row_impl<Db, detail::make_field_index_sequence<index, FieldSpecs...>, FieldSpecs...>>;
 
 				result_field() = default;
 
diff --git a/include/sqlpp11/table.h b/include/sqlpp11/table.h
index 8a072037..3c370279 100644
--- a/include/sqlpp11/table.h
+++ b/include/sqlpp11/table.h
@@ -42,7 +42,6 @@ namespace sqlpp
 	template<typename Table, typename... ColumnSpec>
 		struct table_t: 
 			public table_base_t, 
-			//public ColumnSpec::_name_t::template _member_t<column_t<Table, ColumnSpec>>...
 			public member_t<ColumnSpec, column_t<Table, ColumnSpec>>...
 	{
 		using _traits = make_traits<no_value_t, tag::is_table>;
diff --git a/include/sqlpp11/table_alias.h b/include/sqlpp11/table_alias.h
index 94ea6716..aa95cd83 100644
--- a/include/sqlpp11/table_alias.h
+++ b/include/sqlpp11/table_alias.h
@@ -36,7 +36,8 @@
 namespace sqlpp
 {
 	template<typename AliasProvider, typename Table, typename... ColumnSpec>
-		struct table_alias_t: public ColumnSpec::_name_t::template _member_t<column_t<AliasProvider, ColumnSpec>>...
+		struct table_alias_t:
+			public member_t<ColumnSpec, column_t<AliasProvider, ColumnSpec>>...
 	{
 		//FIXME: Need to add join functionality
 		using _traits = make_traits<value_type_of<Table>, tag::is_table, tag::is_alias, tag_if<tag::is_named_expression, is_expression_t<Table>::value>>;