A few type conversions on affected classes
Rename on most controllers