MDL-28972 formslib: Fixed up variable naming