-BEGIN VERIFY SCRIPT-
ren() { sed -i "s:\<$1\>:$2:g" $(git grep -l "\<$1\>" ./src ./test); }
ren MarkBlockAsInFlight BlockRequested
ren MarkBlockAsReceived RemoveBlockRequest
-END VERIFY SCRIPT-This concludes backport of core#22141
https://github.com/bitcoin/bitcoin/pull/22141/commits/2f4ad6b7efa408b8a858e87499bf6cfcdf936d73
Depends on D12709