Making naming scheme agree between data and MC