code cleanup (no func change): rename, standardize #
Merge pull request #4048 from openscholar/3847-form

code cleanup (no func change): rename, standardize #