Fix naming issues with right hand column mediator logic