rename states
rename move to origin