Avoid the use of duplicate names for functions and in-function scope variables where both are used in the same scope

Reference T123747