Package naming refactor