Replacing keys in move targets