wouldn't it be cleaner to replace clitest with a new prefix? That way its easier to tell the difference later on if something break?