Merge "Update several stale RenderNode variable names"