Rename controllers
Refactor controllers and fix references