Clean up request flow names a bit more