Fixes for package renames