diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemElementFluid1D.py b/src/Mod/Fem/PyGui/_ViewProviderFemElementFluid1D.py
index 9552b3ac66..f0f52dbd37 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemElementFluid1D.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemElementFluid1D.py
@@ -33,7 +33,7 @@ import FreeCADGui
 
 
 # for the panel
-import PyObjects._FemElementFluid1D
+from PyObjects import _FemElementFluid1D
 from PySide import QtCore
 from PySide import QtGui
 
@@ -138,10 +138,10 @@ class _TaskPanelFemElementFluid1D:
         self.form.list_References.itemSelectionChanged.connect(self.select_clicked_reference_shape)
         self.form.list_References.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.form.list_References.connect(self.form.list_References, QtCore.SIGNAL("customContextMenuRequested(QPoint)"), self.references_list_right_clicked)
-        self.form.cb_section_type.addItems(PyObjects._FemElementFluid1D._FemElementFluid1D.known_fluid_types)
-        self.form.cb_liquid_section_type.addItems(PyObjects._FemElementFluid1D._FemElementFluid1D.known_liquid_types)
-        self.form.cb_gas_section_type.addItems(PyObjects._FemElementFluid1D._FemElementFluid1D.known_gas_types)
-        self.form.cb_channel_section_type.addItems(PyObjects._FemElementFluid1D._FemElementFluid1D.known_channel_types)
+        self.form.cb_section_type.addItems(_FemElementFluid1D._FemElementFluid1D.known_fluid_types)
+        self.form.cb_liquid_section_type.addItems(_FemElementFluid1D._FemElementFluid1D.known_liquid_types)
+        self.form.cb_gas_section_type.addItems(_FemElementFluid1D._FemElementFluid1D.known_gas_types)
+        self.form.cb_channel_section_type.addItems(_FemElementFluid1D._FemElementFluid1D.known_channel_types)
 
         self.get_fluidsection_props()
         self.update()
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemElementGeometry1D.py b/src/Mod/Fem/PyGui/_ViewProviderFemElementGeometry1D.py
index d6394f7704..78701bb6c0 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemElementGeometry1D.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemElementGeometry1D.py
@@ -32,7 +32,7 @@ import FreeCADGui
 
 
 # for the panel
-import PyObjects._FemElementGeometry1D
+from PyObjects import _FemElementGeometry1D
 from PySide import QtCore
 from PySide import QtGui
 
@@ -111,7 +111,7 @@ class _TaskPanelFemElementGeometry1D:
         self.form.list_References.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.form.list_References.connect(self.form.list_References, QtCore.SIGNAL("customContextMenuRequested(QPoint)"), self.references_list_right_clicked)
 
-        self.form.cb_crosssectiontype.addItems(PyObjects._FemElementGeometry1D._FemElementGeometry1D.known_beam_types)  # it is inside the class thus double _FemElementGeometry1D
+        self.form.cb_crosssectiontype.addItems(_FemElementGeometry1D._FemElementGeometry1D.known_beam_types)  # it is inside the class thus double _FemElementGeometry1D
 
         self.get_beamsection_props()
         self.update()
diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemMeshGmsh.py b/src/Mod/Fem/PyGui/_ViewProviderFemMeshGmsh.py
index f1e6528bb3..87ac231688 100644
--- a/src/Mod/Fem/PyGui/_ViewProviderFemMeshGmsh.py
+++ b/src/Mod/Fem/PyGui/_ViewProviderFemMeshGmsh.py
@@ -33,7 +33,7 @@ import FemGui
 
 
 # for the panel
-import PyObjects._FemMeshGmsh
+from PyObjects import _FemMeshGmsh
 from PySide import QtCore
 from PySide import QtGui
 from PySide.QtCore import Qt
@@ -167,7 +167,7 @@ class _TaskPanelFemMeshGmsh:
         QtCore.QObject.connect(self.form.cb_dimension, QtCore.SIGNAL("activated(int)"), self.choose_dimension)
         QtCore.QObject.connect(self.Timer, QtCore.SIGNAL("timeout()"), self.update_timer_text)
 
-        self.form.cb_dimension.addItems(PyObjects._FemMeshGmsh._FemMeshGmsh.known_element_dimensions)
+        self.form.cb_dimension.addItems(_FemMeshGmsh._FemMeshGmsh.known_element_dimensions)
 
         self.get_mesh_params()
         self.get_active_analysis()
diff --git a/src/Mod/Fem/femsolver/elmer/equations/equation.py b/src/Mod/Fem/femsolver/elmer/equations/equation.py
index d88b4901f8..5ad08beb2a 100644
--- a/src/Mod/Fem/femsolver/elmer/equations/equation.py
+++ b/src/Mod/Fem/femsolver/elmer/equations/equation.py
@@ -32,8 +32,7 @@ import FemUtils
 
 if App.GuiUp:
     import FreeCADGui as Gui
-    import PyGui.FemSelectionWidgets as FemSelectionWidgets
-
+    from PyGui import FemSelectionWidgets
 
 class Proxy(equationbase.BaseProxy):
 
diff --git a/src/Mod/Fem/femsolver/solverbase.py b/src/Mod/Fem/femsolver/solverbase.py
index b1ce62bdcf..5a31147c63 100644
--- a/src/Mod/Fem/femsolver/solverbase.py
+++ b/src/Mod/Fem/femsolver/solverbase.py
@@ -33,7 +33,7 @@ from . import run
 
 if App.GuiUp:
     import FreeCADGui as Gui
-    import PyGui._TaskPanelFemSolverControl
+    from PyGui import _TaskPanelFemSolverControl
 
 
 class Proxy(object):
@@ -91,7 +91,7 @@ class ViewProxy(object):
                 "Can't open Task Panel",
                 "Selected working directory doesn't exist.")
             return False
-        task = PyGui._TaskPanelFemSolverControl.ControlTaskPanel(machine)
+        task = _TaskPanelFemSolverControl.ControlTaskPanel(machine)
         Gui.Control.showDialog(task)
         return True