changed controller names
small things
Merge pull request #4 from Noahhh/master

Plurals