Service Cleanup
- changed services names
- changed some calls from services