[cvs-nhc98] Temporarily rename nhc98 imports: