r8901: package name fixes