Renamed the controllers and directives for ease of use