Fixing service names