use make_callable_name_generator instead of construction UniqueNameGenerator by hand

make_callable_name_generator is better as it also accounts for possible
collissions with substitution rule names