Refactor package name construction to expose prefixes