there are other occurrences of `retry-latch...` in the code base, please change all