rename move-1 to index to make the distinction clear
small renamings