r9337: package rename