[MGM] Didn't complete option rename prior to last merge

Change-Id: I392aa0b2cc66985a0cd7f56e947af8ff2fdd56ae