Switch from -this-package-key to -this-unit-id.