Use NameGenerator
for composite name generation
#5062
Merged
NameGenerator
for composite name generation
#5062