Merge pull request #7205 from nabinhait/hotfix

Address naming if multiple address for same type