BUG-8372: improve forward/replay naming