use Doctrine's inflector for proper singular
Merge pull request #2052 from uwej711/use_inflector

use Doctrine's inflector for proper singular