renamed the Compartment element

to TargetMapping with an existing type from dataset for consistency
renamed attribute to make to more suitable to work

with macros
changed name