Fix names when using 'controller' and 'view'.