rename files for clarity

Services and Controllers renamed for clarity.