Fixes to mappings controller
Metrics name updates
Resolve conflict in my favor