Make the lives of operators easier by using consistent opt naming for similar features. Change-Id: Ic05c2c8364e015f6878b0bc25449216624568ad5