Refactored controller names and code style to conform to the way the project names all other types of classes.