Adjust capitialization on all Controller-related classes to new standards and update all calling code (cherry picked from commit f1d60958f0)
f1d60958f0