Fix package name construction