De-pluralize module names, and fix build