Make the name to same in same device.
Merge branch 'hotfix/keepSameName'