Rename service instances for better PEP8