Some package renaming.