Rename function argument + more comments (related to Issue 6745)