Use service-package_name in signup forms