Second step to fix rename issue.

It's done.