fixed more confusion related to the M v/s ambient naming scheme