Fix package name breakage