Renamed controllers and directives