[cvs-nhc98] patch applied (hat): Temporarily rename nhc98 imports: