Fixed again clone name generation