added underscore to the project and make a minor modifications in the service naming