move is now a keyword, so adjust fn names