Only few name changes
Merge branch 'master' of https://github.com/rohandmello/rohan-cxf-demo