MDL-43089 more consistent naming in the renderer.