more package class renaming