diff --git a/src/language/ASTNodeDataTypeBuilder.cpp b/src/language/ASTNodeDataTypeBuilder.cpp
index 04a410306f8e3b0a00fa75b11b54449d31b86b54..eb587fa499d5984e2e02d20a1e61f308b902373b 100644
--- a/src/language/ASTNodeDataTypeBuilder.cpp
+++ b/src/language/ASTNodeDataTypeBuilder.cpp
@@ -56,7 +56,7 @@ ASTNodeDataTypeBuilder::_buildDeclarationNodeDataTypes(ASTNode& type_node, ASTNo
         throw parse_error(os.str(), std::vector{type_node.begin()});
       }
 
-      data_type = ASTNodeDataType{ASTNodeDataType::type_name_id_t, type_name_id};
+      data_type = ASTNodeDataType{ASTNodeDataType::type_id_t, type_name_id};
     }
 
     if (name_node.is_type<language::name_list>()) {
@@ -64,11 +64,7 @@ ASTNodeDataTypeBuilder::_buildDeclarationNodeDataTypes(ASTNode& type_node, ASTNo
     }
 
     Assert(name_node.is_type<language::name>());
-    if (data_type == ASTNodeDataType::type_name_id_t) {
-      name_node.m_data_type = ASTNodeDataType{ASTNodeDataType::type_id_t, data_type.typeName()};
-    } else {
-      name_node.m_data_type = data_type;
-    }
+    name_node.m_data_type = data_type;
 
     const std::string& symbol = name_node.string();