clean up controllers and controller names