Refactoring : all services are renamed with prefix convention (rather than suffix convention)