diff --git a/forward_engineering/utils/general.js b/forward_engineering/utils/general.js
index aaea408..d5b4a85 100644
--- a/forward_engineering/utils/general.js
+++ b/forward_engineering/utils/general.js
@@ -89,7 +89,7 @@ const replaceDotWithUnderscore = (name = '') => {
 	return name.replace(/\./g, '_');
 };
 
-const getName = entity => entity.code || entity.collectionName || entity.name || '';
+const getName = entity => entity.code || entity.compMod?.code?.new || entity.collectionName || entity.name || '';
 
 const getRelationshipName = relationship => {
 	return replaceDotWithUnderscore(replaceSpaceWithUnderscore(relationship.name || ''));