Refactored services and controllers names