r8857: package renaming