Changed Model Entity Class Names Plurals to Singulars