diff --git a/python/mmSolver/tools/centertwodee/ui/centertwodee_window.py b/python/mmSolver/tools/centertwodee/ui/centertwodee_window.py
index ff28e0017..fd90a6958 100644
--- a/python/mmSolver/tools/centertwodee/ui/centertwodee_window.py
+++ b/python/mmSolver/tools/centertwodee/ui/centertwodee_window.py
@@ -188,9 +188,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
+    :returns: A new center 2D window, or None if the window cannot be
               opened.
-    :rtype: SolverWindow or None.
+    :rtype: CenterTwoDeeWindow or None.
     """
     win = CenterTwoDeeWindow.open_window(
         show=show, auto_raise=auto_raise, delete=delete
diff --git a/python/mmSolver/tools/channelsen/ui/channelsen_window.py b/python/mmSolver/tools/channelsen/ui/channelsen_window.py
index 6b3f8ac42..eb6afdcbb 100644
--- a/python/mmSolver/tools/channelsen/ui/channelsen_window.py
+++ b/python/mmSolver/tools/channelsen/ui/channelsen_window.py
@@ -85,9 +85,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
-              opened.
-    :rtype: SolverWindow or None.
+    :returns: A new channel sensitivity window, or None if the window
+              cannot be opened.
+    :rtype: ChannelSenWindow or None.
     """
     win = ChannelSenWindow.open_window(show=show, auto_raise=auto_raise, delete=delete)
     return win
diff --git a/python/mmSolver/tools/convertmarker/ui/convertmarker_window.py b/python/mmSolver/tools/convertmarker/ui/convertmarker_window.py
index 7495592de..f11c0e43c 100644
--- a/python/mmSolver/tools/convertmarker/ui/convertmarker_window.py
+++ b/python/mmSolver/tools/convertmarker/ui/convertmarker_window.py
@@ -107,9 +107,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
+    :returns: A new convert marker window, or None if the window cannot be
               opened.
-    :rtype: SolverWindow or None.
+    :rtype: ConvertMarkerWindow or None.
     """
     win = ConvertMarkerWindow.open_window(
         show=show, auto_raise=auto_raise, delete=delete
diff --git a/python/mmSolver/tools/imagecache/ui/imagecache_window.py b/python/mmSolver/tools/imagecache/ui/imagecache_window.py
index b5fb73f7a..f74e377bf 100644
--- a/python/mmSolver/tools/imagecache/ui/imagecache_window.py
+++ b/python/mmSolver/tools/imagecache/ui/imagecache_window.py
@@ -125,9 +125,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
+    :returns: A new image cache window, or None if the window cannot be
               opened.
-    :rtype: SolverWindow or None.
+    :rtype: ImageCacheWindow or None.
     """
     win = ImageCacheWindow.open_window(show=show, auto_raise=auto_raise, delete=delete)
     return win
diff --git a/python/mmSolver/tools/loadmarker/ui/loadmarker_window.py b/python/mmSolver/tools/loadmarker/ui/loadmarker_window.py
index a2596e707..e0641841b 100644
--- a/python/mmSolver/tools/loadmarker/ui/loadmarker_window.py
+++ b/python/mmSolver/tools/loadmarker/ui/loadmarker_window.py
@@ -259,9 +259,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
+    :returns: A new loadMarker window, or None if the window cannot be
               opened.
-    :rtype: SolverWindow or None.
+    :rtype: LoadMarkerWindow or None.
     """
     win = LoadMarkerWindow.open_window(show=show, auto_raise=auto_raise, delete=delete)
     return win
diff --git a/python/mmSolver/tools/raycastmarker/ui/raycastmarker_window.py b/python/mmSolver/tools/raycastmarker/ui/raycastmarker_window.py
index 8dd9e4e19..6aa2678ce 100644
--- a/python/mmSolver/tools/raycastmarker/ui/raycastmarker_window.py
+++ b/python/mmSolver/tools/raycastmarker/ui/raycastmarker_window.py
@@ -106,9 +106,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
-              opened.
-    :rtype: SolverWindow or None.
+    :returns: A new ray-cast marker window, or None if the window cannot
+              be opened.
+    :rtype: RayCastMarkerWindow or None.
     """
     win = RayCastMarkerWindow.open_window(
         show=show, auto_raise=auto_raise, delete=delete
diff --git a/python/mmSolver/tools/reparent2/ui/reparent2_window.py b/python/mmSolver/tools/reparent2/ui/reparent2_window.py
index 82f24ad6f..5283a60db 100644
--- a/python/mmSolver/tools/reparent2/ui/reparent2_window.py
+++ b/python/mmSolver/tools/reparent2/ui/reparent2_window.py
@@ -140,9 +140,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
+    :returns: A new reparent2 window, or None if the window cannot be
               opened.
-    :rtype: SolverWindow or None.
+    :rtype: Reparent2Window or None.
     """
     win = Reparent2Window.open_window(show=show, auto_raise=auto_raise, delete=delete)
     return win
diff --git a/python/mmSolver/tools/setcameraoriginframe/ui/originframe_window.py b/python/mmSolver/tools/setcameraoriginframe/ui/originframe_window.py
index d6c5a80ac..e0a8e62cd 100644
--- a/python/mmSolver/tools/setcameraoriginframe/ui/originframe_window.py
+++ b/python/mmSolver/tools/setcameraoriginframe/ui/originframe_window.py
@@ -108,9 +108,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
+    :returns: A new origin frame window, or None if the window cannot be
               opened.
-    :rtype: SolverWindow or None.
+    :rtype: OriginFrameWindow or None.
     """
     win = OriginFrameWindow.open_window(show=show, auto_raise=auto_raise, delete=delete)
     return win
diff --git a/python/mmSolver/tools/smoothkeyframes/ui/smoothkeys_window.py b/python/mmSolver/tools/smoothkeyframes/ui/smoothkeys_window.py
index a4c8a33cf..19af36be1 100644
--- a/python/mmSolver/tools/smoothkeyframes/ui/smoothkeys_window.py
+++ b/python/mmSolver/tools/smoothkeyframes/ui/smoothkeys_window.py
@@ -108,9 +108,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
+    :returns: A new smooth keys window, or None if the window cannot be
               opened.
-    :rtype: SolverWindow or None.
+    :rtype: SmoothKeysWindow or None.
     """
     win = SmoothKeysWindow.open_window(show=show, auto_raise=auto_raise, delete=delete)
     return win
diff --git a/python/mmSolver/tools/surfacecluster/ui/surfacecluster_window.py b/python/mmSolver/tools/surfacecluster/ui/surfacecluster_window.py
index 1608bc87c..509472768 100644
--- a/python/mmSolver/tools/surfacecluster/ui/surfacecluster_window.py
+++ b/python/mmSolver/tools/surfacecluster/ui/surfacecluster_window.py
@@ -108,9 +108,9 @@ def main(show=True, auto_raise=True, delete=False):
                    developing the UI in Maya script editor.
     :type delete: bool
 
-    :returns: A new solver window, or None if the window cannot be
+    :returns: A new surface cluster window, or None if the window cannot be
               opened.
-    :rtype: SolverWindow or None.
+    :rtype: SurfaceClusterWindow or None.
     """
     win = SurfaceClusterWindow.open_window(
         show=show, auto_raise=auto_raise, delete=delete