rename m to measurement

Change-Id: Ib8f62c97a765b9ed6da6a5b19777f8cf1cccf47e