diff --git a/OpenHPL/Examples/Detailed.mo b/OpenHPL/Examples/Detailed.mo
deleted file mode 100644
index 49092e9..0000000
--- a/OpenHPL/Examples/Detailed.mo
+++ /dev/null
@@ -1,5 +0,0 @@
-within OpenHPL.Examples;
-model Detailed "Hydropower system using KP scheme based penstock"
-  extends Simple(redeclare Waterway.PenstockKP penstock);
-  annotation (experiment(StopTime=1000));
-end Detailed;
diff --git a/OpenHPL/Examples/DetailedTurbine.mo b/OpenHPL/Examples/DetailedTurbine.mo
new file mode 100644
index 0000000..1c66a01
--- /dev/null
+++ b/OpenHPL/Examples/DetailedTurbine.mo
@@ -0,0 +1,6 @@
+within OpenHPL.Examples;
+model DetailedTurbine "Hydropower system using KP scheme based penstock"
+  extends SimpleTurbine(
+                 redeclare Waterway.PenstockKP penstock);
+  annotation (experiment(StopTime=1000));
+end DetailedTurbine;
diff --git a/OpenHPL/Examples/SimpleGen.mo b/OpenHPL/Examples/SimpleGen.mo
index f5f77b3..3dc85ac 100644
--- a/OpenHPL/Examples/SimpleGen.mo
+++ b/OpenHPL/Examples/SimpleGen.mo
@@ -1,6 +1,7 @@
 within OpenHPL.Examples;
 model SimpleGen "Model of a hydropower system with a simple turbine turbine and generator"
-  extends Simple(turbine(
+  extends SimpleTurbine(
+                 turbine(
       enable_nomSpeed=false,
       enable_P_out=true));
   ElectroMech.Generators.SimpleGen simpleGen annotation (Placement(transformation(extent={{20,50},{40,70}})));
diff --git a/OpenHPL/Examples/Simple.mo b/OpenHPL/Examples/SimpleTurbine.mo
similarity index 96%
rename from OpenHPL/Examples/Simple.mo
rename to OpenHPL/Examples/SimpleTurbine.mo
index 1424839..80a50a8 100644
--- a/OpenHPL/Examples/Simple.mo
+++ b/OpenHPL/Examples/SimpleTurbine.mo
@@ -1,5 +1,5 @@
 within OpenHPL.Examples;
-model Simple "Model of a hydropower system with a simple turbine turbine"
+model SimpleTurbine "Model of a hydropower system with a simple turbine turbine"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=10) annotation (Placement(transformation(
         origin={-90,30},
@@ -47,4 +47,4 @@ equation
   connect(surgeTank.o, penstock.i) annotation (Line(points={{-20,30},{-10,30}}, color={28,108,200}));
   connect(discharge.o, tail.o) annotation (Line(points={{70,0},{80,0}}, color={28,108,200}));
   annotation (experiment(StopTime=1000));
-end Simple;
+end SimpleTurbine;
diff --git a/OpenHPL/Examples/package.order b/OpenHPL/Examples/package.order
index 0b9e399..a75a0f1 100644
--- a/OpenHPL/Examples/package.order
+++ b/OpenHPL/Examples/package.order
@@ -1,9 +1,9 @@
 BranchingPipes
 SimpleValve
-Simple
+SimpleTurbine
 SimpleGen
 SimpleGenFrancis
-Detailed
+DetailedTurbine
 DetailedGen
 DetailedGenFrancis
 PowerSystemSimple