diff --git a/src/Python/RectilinearGrid/RGrid.py b/src/Python/RectilinearGrid/RGrid.py
index 2d8c7e98b2629ba43ae97bb60c9294779c096f04..c7f0a1ba6141cde03a2549a2a21c31ad17859d6e 100755
--- a/src/Python/RectilinearGrid/RGrid.py
+++ b/src/Python/RectilinearGrid/RGrid.py
@@ -4,11 +4,25 @@
 This example shows how to create a rectilinear grid.
 """
 
-import vtkmodules.all as vtk
+# noinspection PyUnresolvedReferences
+import vtkmodules.vtkInteractionStyle
+# noinspection PyUnresolvedReferences
+import vtkmodules.vtkRenderingOpenGL2
+from vtkmodules.vtkCommonColor import vtkNamedColors
+from vtkmodules.vtkCommonCore import vtkDoubleArray
+from vtkmodules.vtkCommonDataModel import vtkRectilinearGrid
+from vtkmodules.vtkFiltersGeometry import vtkRectilinearGridGeometryFilter
+from vtkmodules.vtkRenderingCore import (
+    vtkActor,
+    vtkPolyDataMapper,
+    vtkRenderWindow,
+    vtkRenderWindowInteractor,
+    vtkRenderer
+)
 
 
 def main():
-    colors = vtk.vtkNamedColors()
+    colors = vtkNamedColors()
 
     x = [-1.22396, -1.17188, -1.11979, -1.06771, -1.01562, -0.963542, -0.911458, -0.859375, -0.807292, -0.755208,
          -0.703125, -0.651042, -0.598958, -0.546875, -0.494792, -0.442708, -0.390625, -0.338542, -0.286458, -0.234375,
@@ -24,13 +38,13 @@ def main():
 
     # Create a rectilinear grid by defining three arrays specifying the
     # coordinates in the x-y-z directions.
-    xCoords = vtk.vtkDoubleArray()
+    xCoords = vtkDoubleArray()
     for i in range(0, len(x)):
         xCoords.InsertNextValue(x[i])
-    yCoords = vtk.vtkDoubleArray()
+    yCoords = vtkDoubleArray()
     for i in range(0, len(y)):
         yCoords.InsertNextValue(y[i])
-    zCoords = vtk.vtkDoubleArray()
+    zCoords = vtkDoubleArray()
     for i in range(0, len(z)):
         zCoords.InsertNextValue(z[i])
 
@@ -38,30 +52,30 @@ def main():
     # the number of values in each of the XCoordinates, YCoordinates,
     # and ZCoordinates is equal to what is defined in SetDimensions().
     #
-    rgrid = vtk.vtkRectilinearGrid()
+    rgrid = vtkRectilinearGrid()
     rgrid.SetDimensions(len(x), len(y), len(z))
     rgrid.SetXCoordinates(xCoords)
     rgrid.SetYCoordinates(yCoords)
     rgrid.SetZCoordinates(zCoords)
 
     # Extract a plane from the grid to see what we've got.
-    plane = vtk.vtkRectilinearGridGeometryFilter()
+    plane = vtkRectilinearGridGeometryFilter()
     plane.SetInputData(rgrid)
     plane.SetExtent(0, len(x) - 1, 16, 16, 0, len(z) - 1)
 
-    rgridMapper = vtk.vtkPolyDataMapper()
+    rgridMapper = vtkPolyDataMapper()
     rgridMapper.SetInputConnection(plane.GetOutputPort())
 
-    wireActor = vtk.vtkActor()
+    wireActor = vtkActor()
     wireActor.SetMapper(rgridMapper)
     wireActor.GetProperty().SetColor(colors.GetColor3d("Banana"))
     wireActor.GetProperty().EdgeVisibilityOn()
 
     # Create the usual rendering stuff.
-    renderer = vtk.vtkRenderer()
-    renWin = vtk.vtkRenderWindow()
+    renderer = vtkRenderer()
+    renWin = vtkRenderWindow()
     renWin.AddRenderer(renderer)
-    iren = vtk.vtkRenderWindowInteractor()
+    iren = vtkRenderWindowInteractor()
     iren.SetRenderWindow(renWin)
 
     renderer.AddActor(wireActor)
diff --git a/src/Python/RectilinearGrid/RectilinearGrid.py b/src/Python/RectilinearGrid/RectilinearGrid.py
index 10a17df9cf44541623be1e1bfbe5f95fca2df4cf..14f3d182654eba2c7b4dad9aa028fc2bfd5ed917 100755
--- a/src/Python/RectilinearGrid/RectilinearGrid.py
+++ b/src/Python/RectilinearGrid/RectilinearGrid.py
@@ -1,25 +1,38 @@
 #!/usr/bin/env python
 
-import vtkmodules.all as vtk
+# noinspection PyUnresolvedReferences
+import vtkmodules.vtkInteractionStyle
+# noinspection PyUnresolvedReferences
+import vtkmodules.vtkRenderingOpenGL2
+from vtkmodules.vtkCommonColor import vtkNamedColors
+from vtkmodules.vtkCommonCore import vtkDoubleArray
+from vtkmodules.vtkCommonDataModel import vtkRectilinearGrid
+from vtkmodules.vtkRenderingCore import (
+    vtkActor,
+    vtkDataSetMapper,
+    vtkRenderWindow,
+    vtkRenderWindowInteractor,
+    vtkRenderer
+)
 
 
 def main():
-    colors = vtk.vtkNamedColors()
+    colors = vtkNamedColors()
 
     # Create a grid
-    grid = vtk.vtkRectilinearGrid()
+    grid = vtkRectilinearGrid()
     grid.SetDimensions(2, 3, 1)
 
-    xArray = vtk.vtkDoubleArray()
+    xArray = vtkDoubleArray()
     xArray.InsertNextValue(0.0)
     xArray.InsertNextValue(2.0)
 
-    yArray = vtk.vtkDoubleArray()
+    yArray = vtkDoubleArray()
     yArray.InsertNextValue(0.0)
     yArray.InsertNextValue(1.0)
     yArray.InsertNextValue(2.0)
 
-    zArray = vtk.vtkDoubleArray()
+    zArray = vtkDoubleArray()
     zArray.InsertNextValue(0.0)
 
     grid.SetXCoordinates(xArray)
@@ -35,20 +48,20 @@ def main():
         print('Point', id, ':(', p[0], ',', p[1], ',', p[2], ')')
 
     # Create a mapper and actor
-    mapper = vtk.vtkDataSetMapper()
+    mapper = vtkDataSetMapper()
     mapper.SetInputData(grid)
 
-    actor = vtk.vtkActor()
+    actor = vtkActor()
     actor.SetMapper(mapper)
     actor.GetProperty().SetColor(colors.GetColor3d('PeachPuff'))
 
     # Visualize
-    renderer = vtk.vtkRenderer()
-    renderWindow = vtk.vtkRenderWindow()
+    renderer = vtkRenderer()
+    renderWindow = vtkRenderWindow()
     renderWindow.AddRenderer(renderer)
     renderWindow.SetWindowName('RectilinearGrid')
 
-    renderWindowInteractor = vtk.vtkRenderWindowInteractor()
+    renderWindowInteractor = vtkRenderWindowInteractor()
     renderWindowInteractor.SetRenderWindow(renderWindow)
 
     renderer.AddActor(actor)
diff --git a/src/Python/RectilinearGrid/VisualizeRectilinearGrid.py b/src/Python/RectilinearGrid/VisualizeRectilinearGrid.py
index 3e97cf88b7869f3d5b924a7b41b20ec28e16fadd..bdadf2d0fcdc55b3b1bb985f3d7d54f9880ec08d 100755
--- a/src/Python/RectilinearGrid/VisualizeRectilinearGrid.py
+++ b/src/Python/RectilinearGrid/VisualizeRectilinearGrid.py
@@ -1,26 +1,40 @@
 #!/usr/bin/env python
 
-import vtkmodules.all as vtk
+# noinspection PyUnresolvedReferences
+import vtkmodules.vtkInteractionStyle
+# noinspection PyUnresolvedReferences
+import vtkmodules.vtkRenderingOpenGL2
+from vtkmodules.vtkCommonColor import vtkNamedColors
+from vtkmodules.vtkCommonCore import vtkDoubleArray
+from vtkmodules.vtkCommonDataModel import vtkRectilinearGrid
+from vtkmodules.vtkFiltersGeneral import vtkShrinkFilter
+from vtkmodules.vtkRenderingCore import (
+    vtkActor,
+    vtkDataSetMapper,
+    vtkRenderWindow,
+    vtkRenderWindowInteractor,
+    vtkRenderer
+)
 
 
 def main():
-    colors = vtk.vtkNamedColors()
+    colors = vtkNamedColors()
 
     # Create a grid    
-    grid = vtk.vtkRectilinearGrid()
+    grid = vtkRectilinearGrid()
 
     grid.SetDimensions(2, 3, 2)
 
-    xArray = vtk.vtkDoubleArray()
+    xArray = vtkDoubleArray()
     xArray.InsertNextValue(0.0)
     xArray.InsertNextValue(2.0)
 
-    yArray = vtk.vtkDoubleArray()
+    yArray = vtkDoubleArray()
     yArray.InsertNextValue(0.0)
     yArray.InsertNextValue(1.0)
     yArray.InsertNextValue(2.0)
 
-    zArray = vtk.vtkDoubleArray()
+    zArray = vtkDoubleArray()
     zArray.InsertNextValue(0.0)
     zArray.InsertNextValue(5.0)
 
@@ -28,25 +42,25 @@ def main():
     grid.SetYCoordinates(yArray)
     grid.SetZCoordinates(zArray)
 
-    shrinkFilter = vtk.vtkShrinkFilter()
+    shrinkFilter = vtkShrinkFilter()
     shrinkFilter.SetInputData(grid)
     shrinkFilter.SetShrinkFactor(.8)
 
     # Create a mapper and actor
-    mapper = vtk.vtkDataSetMapper()
+    mapper = vtkDataSetMapper()
     mapper.SetInputConnection(shrinkFilter.GetOutputPort())
 
-    actor = vtk.vtkActor()
+    actor = vtkActor()
     actor.SetMapper(mapper)
     actor.GetProperty().SetColor(colors.GetColor3d('PeachPuff'))
 
     # Visualize
-    renderer = vtk.vtkRenderer()
-    renderWindow = vtk.vtkRenderWindow()
+    renderer = vtkRenderer()
+    renderWindow = vtkRenderWindow()
     renderWindow.AddRenderer(renderer)
     renderWindow.SetWindowName('VisualizeRectilinearGrid')
 
-    renderWindowInteractor = vtk.vtkRenderWindowInteractor()
+    renderWindowInteractor = vtkRenderWindowInteractor()
     renderWindowInteractor.SetRenderWindow(renderWindow)
 
     renderer.AddActor(actor)