changes naming convention for controlers

blah