Fixed clone name generation