Changes to Failure Recovery, Renaming to avoid using reip