Fix package, service names in comannd define