Fixup last commit for copy+move, rename a fun