Merge "Use correct variable name in @param documentation"