diff --git a/lib/editors/parser_helper.js b/lib/editors/parser_helper.js
index <HASH>..<HASH> 100644
--- a/lib/editors/parser_helper.js
+++ b/lib/editors/parser_helper.js
@@ -12,7 +12,7 @@ var cardinalities = require('../cardinalities'),
 exports.isAnId = function(name, className) {
   var regex = new RegExp('^' + className.toLowerCase() + 'Id$');
   return name.length === 2 && /^id$/.test(name.toLowerCase())
-    || regex.test(name) || /^id[A-Z].*/.test(name);
+    || regex.test(name) || /^id[A-Z].*/.test(name) || /.*?Id$/.test(name);
 };
 
 /**
Bug fix
If a field's name is "somethingId", then it is now considered as an Id.