Some more package renaming