Fix the name for measurement variable so that we wont have problem during display and saving

Reviewer: Chika Arevalo

Issue: GCP-9707