Fix package name generation