fixed the renaming issue
Merge pull request #2504 from yorkerlin/develop

fixed the renaming issue