Fix controller naming inconsistency
Merge pull request #1358 from zachcoyle/master

Fix controller naming inconsistency