Merge "Update misleading variable names in docs"