standardize func docs, variable names #2761
Merge pull request #2979 from openscholar/2761-edit-roles2

standardize func docs, variable names #2761