Changes to the Services Name & Refactoring