fixed pluralization issues with controllers