services refactoring, duplicated absent after merge, case sensitive names