Revert package renaming