Fix node names, replace "-" with "_"