Rename and rehook controllers
Event emitters
Remove promises
Controller complete