clean up xml & compenstate for cmodel naming consistency across solution packs