[cvs-nhc98] Change some symbols in hat-detect and hat-observe: