Prepared for package renaming