Fix package renames