diff --git a/forward_engineering/helpers/udtHelper.js b/forward_engineering/helpers/udtHelper.js
index b31ee40..b47a2e1 100644
--- a/forward_engineering/helpers/udtHelper.js
+++ b/forward_engineering/helpers/udtHelper.js
@@ -132,10 +132,10 @@ const getTypeWithNamespace = type => {
 	}
 
 	if (!udtItem.schema.namespace) {
-		return type;
+		return udtItem.schema.name || type;
 	}
 
-	return udtItem.schema.namespace + '.' + type;
+	return udtItem.schema.namespace + '.' + udtItem.schema.name || type;
 };
 
 const convertNamedTypesToReferences = schema => {