Improve naming of gviz members: gviz->Gviz, window->GvizWindow