modify model names to singular form
Merge pull request #918 from blankhua/patch-1

modify model names to singular form