changed controller names

Controller names now in line with convention used in services.