Mandatory variable name fixes.