Updated service names to be unique
Import cleanup