More consistend movement names

I know it is longer, but it is better to be consistend I think.
Even better when consistent between files