diff --git a/src/Cxx/Qt/BorderWidgetQt.ui b/src/Cxx/Qt/BorderWidgetQt.ui
index 55d89da8c3f3834705aadba91f6126a9dd1f63f5..e0624ab74b6d36e8abcc6d6ca68d8e47c0169862 100644
--- a/src/Cxx/Qt/BorderWidgetQt.ui
+++ b/src/Cxx/Qt/BorderWidgetQt.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>SimpleView</string>
+   <string>BorderWidgetQt</string>
   </property>
   <property name="windowIcon">
    <iconset resource="Icons/icons.qrc">
@@ -87,9 +87,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QVTKOpenGLWidget</class>
+   <class>QVTKOpenGLNativeWidget</class>
    <extends>QWidget</extends>
-   <header>QVTKOpenGLWidget.h</header>
+   <header>QVTKOpenGLNativeWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/Cxx/Qt/EventQtSlotConnect.ui b/src/Cxx/Qt/EventQtSlotConnect.ui
index 5f1052fb4193ab27c7c9963fbb6a61d25235c738..ba7ba5e3b35cbeaf61d8ef1f9efba8a5a5f9916e 100644
--- a/src/Cxx/Qt/EventQtSlotConnect.ui
+++ b/src/Cxx/Qt/EventQtSlotConnect.ui
@@ -16,7 +16,7 @@
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
     <item>
-     <widget class="QVTKOpenGLWidget" name="qvtkWidget">
+     <widget class="QVTKOpenGLNativeWidget" name="qvtkWidget">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
         <horstretch>0</horstretch>
@@ -58,9 +58,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QVTKOpenGLWidget</class>
+   <class>QVTKOpenGLNativeWidget</class>
    <extends>QWidget</extends>
-   <header>QVTKOpenGLWidget.h</header>
+   <header>QVTKOpenGLNativeWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/Cxx/Qt/EventQtSlotConnectDriver.cxx b/src/Cxx/Qt/EventQtSlotConnectDriver.cxx
index f26a15f4f6973e634a9cfe87dadfd8755cc9fb3b..e3d3b4842c3d6efb20bfa2ec66ca8aef8d097106 100644
--- a/src/Cxx/Qt/EventQtSlotConnectDriver.cxx
+++ b/src/Cxx/Qt/EventQtSlotConnectDriver.cxx
@@ -5,7 +5,7 @@
 int main(int argc, char** argv)
 {
   // needed to ensure appropriate OpenGL context is created for VTK rendering.
-  QSurfaceFormat::setDefaultFormat(QVTKOpenGLWidget::defaultFormat());
+  QSurfaceFormat::setDefaultFormat(QVTKOpenGLNativeWidget::defaultFormat());
 
   QApplication app(argc, argv);
 
diff --git a/src/Cxx/Qt/RenderWindowUIMultipleInheritance.ui b/src/Cxx/Qt/RenderWindowUIMultipleInheritance.ui
index d217f45f7b18e4d95c895e58c543337fddbf021b..60f1c3f5e34b6280768dd437fd57a2ca9e3e73dd 100644
--- a/src/Cxx/Qt/RenderWindowUIMultipleInheritance.ui
+++ b/src/Cxx/Qt/RenderWindowUIMultipleInheritance.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>RenderWindowUIMultipleInheritance</class>
- <widget class="QMainWindow" name="SimpleView">
+ <widget class="QMainWindow" name="RenderWindowUIMultipleInheritance">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -14,7 +14,7 @@
    <string>RenderWindowUIMultipleInheritance</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="QVTKOpenGLWidget" name="qvtkWidget">
+   <widget class="QVTKOpenGLNativeWidget" name="qvtkWidget">
     <property name="geometry">
      <rect>
       <x>10</x>
@@ -56,9 +56,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QVTKOpenGLWidget</class>
+   <class>QVTKOpenGLNativeWidget</class>
    <extends>QWidget</extends>
-   <header>QVTKOpenGLWidget.h</header>
+   <header>QVTKOpenGLNativeWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/Cxx/Qt/RenderWindowUIMultipleInheritanceDriver.md b/src/Cxx/Qt/RenderWindowUIMultipleInheritanceDriver.md
index db315d17ddd1cee14181b1e418907f6bcdce34e9..9d4277c370788a4613b241f7547eaad02b552225 100644
--- a/src/Cxx/Qt/RenderWindowUIMultipleInheritanceDriver.md
+++ b/src/Cxx/Qt/RenderWindowUIMultipleInheritanceDriver.md
@@ -1,3 +1,3 @@
 ### Description
 
-Using a QVTKOpenGLWidget with the Qt Multiple Inheritance model. In contrast to the single inheritance example the main widget is here derived from QMainWindow as well as the class defining the form (Ui::RenderWindowUIMultipleInheritance).
+Using a QVTKOpenGLNativeWidget with the Qt Multiple Inheritance model. In contrast to the single inheritance example the main widget is here derived from QMainWindow as well as the class defining the form (Ui::RenderWindowUIMultipleInheritance).
diff --git a/src/Cxx/Qt/RenderWindowUISingleInheritance.ui b/src/Cxx/Qt/RenderWindowUISingleInheritance.ui
index bfa29e2c2225727a246a34318161a4af32e52ce4..f119c726db49e1c831118d0432c57ec5c3031644 100644
--- a/src/Cxx/Qt/RenderWindowUISingleInheritance.ui
+++ b/src/Cxx/Qt/RenderWindowUISingleInheritance.ui
@@ -14,7 +14,7 @@
    <string>RenderWindowUISingleInheritance</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="QVTKOpenGLWidget" name="qvtkWidget">
+   <widget class="QVTKOpenGLNativeWidget" name="qvtkWidget">
     <property name="geometry">
      <rect>
       <x>10</x>
@@ -56,9 +56,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QVTKOpenGLWidget</class>
+   <class>QVTKOpenGLNativeWidget</class>
    <extends>QWidget</extends>
-   <header>QVTKOpenGLWidget.h</header>
+   <header>QVTKOpenGLNativeWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/Cxx/Qt/RenderWindowUISingleInheritanceDriver.cxx b/src/Cxx/Qt/RenderWindowUISingleInheritanceDriver.cxx
index 429ec3deddfb5c675cf60af3ebc9a6210013d15f..9f6c23bf30f14851b017e0bf78dbe7b8e0bfb0e6 100644
--- a/src/Cxx/Qt/RenderWindowUISingleInheritanceDriver.cxx
+++ b/src/Cxx/Qt/RenderWindowUISingleInheritanceDriver.cxx
@@ -1,13 +1,13 @@
 #include <QApplication>
 #include <QSurfaceFormat>
-#include <QVTKOpenGLWidget.h>
+#include <QVTKOpenGLNativeWidget.h>
 
 #include "RenderWindowUISingleInheritance.h"
  
 int main( int argc, char** argv )
 {
   // needed to ensure appropriate OpenGL context is created for VTK rendering.
-  QSurfaceFormat::setDefaultFormat(QVTKOpenGLWidget::defaultFormat());
+  QSurfaceFormat::setDefaultFormat(QVTKOpenGLNativeWidget::defaultFormat());
 
   // QT Stuff
   QApplication app( argc, argv );
diff --git a/src/Cxx/Qt/RenderWindowUISingleInheritanceDriver.md b/src/Cxx/Qt/RenderWindowUISingleInheritanceDriver.md
index ce69b592a77961744f628c686b0f6c5396397a40..8bdd383facaf2130b1a4f3663e8e42406c958edf 100644
--- a/src/Cxx/Qt/RenderWindowUISingleInheritanceDriver.md
+++ b/src/Cxx/Qt/RenderWindowUISingleInheritanceDriver.md
@@ -1,3 +1,3 @@
 ### Description
 
-Using a QVTKOpenGLWidget with the Qt Single Inheritance model
+Using a QVTKOpenGLNativeWidget with the Qt Single Inheritance model
diff --git a/src/Cxx/Qt/ShareCameraQt.ui b/src/Cxx/Qt/ShareCameraQt.ui
index 9d1837355b04a065abe815fee8270df7cbb06e20..00f037c2a350338d2d78882becfc15e105772850 100644
--- a/src/Cxx/Qt/ShareCameraQt.ui
+++ b/src/Cxx/Qt/ShareCameraQt.ui
@@ -97,9 +97,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QVTKOpenGLWidget</class>
+   <class>QVTKOpenGLNativeWidget</class>
    <extends>QWidget</extends>
-   <header>QVTKOpenGLWidget.h</header>
+   <header>QVTKOpenGLNativeWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/Cxx/Qt/SideBySideRenderWindowsQt.ui b/src/Cxx/Qt/SideBySideRenderWindowsQt.ui
index e57eb51a6dba21245857465645c639311235ba90..6d86ff4e4fd0f2909163c5fc914f4c002625d236 100644
--- a/src/Cxx/Qt/SideBySideRenderWindowsQt.ui
+++ b/src/Cxx/Qt/SideBySideRenderWindowsQt.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>SimpleView</string>
+   <string>SideBySideRenderWindowsQt</string>
   </property>
   <property name="windowIcon">
    <iconset resource="Icons/icons.qrc">
@@ -97,9 +97,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QVTKOpenGLWidget</class>
+   <class>QVTKOpenGLNativeWidget</class>
    <extends>QWidget</extends>
-   <header>QVTKOpenGLWidget.h</header>
+   <header>QVTKOpenGLNativeWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources>