Clean up service name generation