Renamed controllers and directive to be more specific