[cvs-nhc98] patch applied (hat): Rename mkX -> nhc_mkX.