Rename some fns