Tweak for new name
More work to make sure clone name is valid (and a bit tidier)