standardize func docs, variable names #2761

#2761