Refactor names & new CloneInterface