A little bit of cleanup

Renaming the controller to let us know that it is a controller