more package renaming