cleaned up references between controller and services
naming tweaks