1. fixes same name warning.
Merge pull request #7284 from chengstory/v3_fixesWarning

1. fixes same name warning.