Update names to apply to both the package and service name.