fix warnings about name local variable
Merge branch 'fix-warnings'