issue #20715: prevent duplicate-naming error
Merge pull request #538 from shackbarth/20715

issue #20715: prevent duplicate-naming error