Package name and version tweaks