A few type conversions on affected classes
Rename on most controllers
Change type on most controllers and services (and managers if necessary)