Updated choices with proper terms

[#78578764 #78579120]