Merge branch 'SCHOLAR-3.x' into 3314
Merge branch 'SCHOLAR-3.x' into 3314
fixed issues with variable names
Merge pull request #6726 from openscholar/3314

fixed mixed-up variable names