Fixed package name changes