wgtpkg-unit: improve naming (minor)