refactored controller names 

@Julietbc @jasminmayfield