rename variable and form elements

Closes #3584303

Merge request reports

Loading