Merge "Naming micro-service updates."