Rename and repackage (again) per convention