Rename and add note about goto fail