Some instruction fixes, renamings.