- avoiding possible serialization issues from duplicate names
(cherry picked from commit adcf53818d454c4f428ccc8ffd4e92f4bfa2c40f)