Replace underscore with dash in PML node names
Cleanup of PML mapping, correctly initialize objects for import