upd: use unified names for package and service