r9353: package name change