diff --git a/src/main/jdl-core/cli/parse-jdl.js b/src/main/jdl-core/cli/parse-jdl.js
index ff47903..ef50268 100644
--- a/src/main/jdl-core/cli/parse-jdl.js
+++ b/src/main/jdl-core/cli/parse-jdl.js
@@ -32,8 +32,3 @@ function checkForErrors(jdlObject, configuration, logger = console) {
   }
   validator.checkForErrors();
 }
-
-// eslint-disable-next-line import/order
-// const jdlString = require('fs').readFileSync(process.argv[2], 'utf8');
-
-// parseJDL(jdlString);
diff --git a/src/main/jdl-core/jdl/models/jdl-entity.js b/src/main/jdl-core/jdl/models/jdl-entity.js
index c97fad8..fbb34bf 100644
--- a/src/main/jdl-core/jdl/models/jdl-entity.js
+++ b/src/main/jdl-core/jdl/models/jdl-entity.js
@@ -19,6 +19,7 @@
 
 const merge = require('../utils/object-utils').merge;
 const { getTableNameFromEntityName } = require('../jhipster/entity-table-name-creator');
+const { upperFirst, lowerFirst, pluralize } = require('../utils/string-utils');
 
 module.exports = class JDLEntity {
   constructor(args) {
@@ -28,6 +29,10 @@ module.exports = class JDLEntity {
     }
     this.options = {};
     this.name = merged.name;
+    this.className = upperFirst(this.name);
+    this.instanceName = lowerFirst(this.name);
+    this.classNamePlural = pluralize(this.className);
+    this.instanceNamePlural = pluralize(this.instanceName);
     this.tableName = merged.tableName || merged.name;
     this.fields = merged.fields;
     this.comment = merged.comment;
diff --git a/src/main/jdl-core/jdl/utils/string-utils.js b/src/main/jdl-core/jdl/utils/string-utils.js
index 7a70d21..c1aae02 100644
--- a/src/main/jdl-core/jdl/utils/string-utils.js
+++ b/src/main/jdl-core/jdl/utils/string-utils.js
@@ -16,11 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const pluralize = require('pluralize');
 
 module.exports = {
   camelCase,
   upperFirst,
   lowerFirst,
+  pluralize,
 };
 
 function camelCase(string) {