refactoring all wrong name
Merge branch 'rest-service'