[cvs-nhc98] patch applied (hat): Fix the generation of module identifiers. We used to get e.g.