change module and service names