Big renaming of move's helpers