Fixing naming of controllers.