Refactoring service wrapper name