Added machine name as part of service name