Move package and service names to default attributes