diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java
index d338c240b..06ae77005 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java
@@ -71,14 +71,10 @@ public SystemInterface getFluid() {
         return getThermoSystem();
     }
 
-    ;
-
     /** {@inheritDoc} */
     @Override
     public void displayResult() {}
 
-    ;
-
     /** {@inheritDoc} */
     @Override
     public String getName() {
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java
index c0230eea8..e029c98d9 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java
@@ -13,13 +13,12 @@
  * @version $Id: $Id
  */
 public interface ProcessEquipmentInterface extends Runnable, java.io.Serializable {
-    /** {@inheritDoc} 
-     *     /
+    /**
      * <p>
      * run
      * </p>
-     * In this method all thermodynamic and unit the operation 
-     * will be calculated in a steady state calculation.
+     * In this method all thermodynamic and unit the operation will be calculated in a steady state
+     * calculation.
      *
      * @return void
      */
@@ -35,14 +34,12 @@ public interface ProcessEquipmentInterface extends Runnable, java.io.Serializabl
      */
     public String[][] reportResults();
 
-    /** {@inheritDoc} 
-     *     /
+    /**
      * <p>
      * runTransient
      * </p>
-     * In this method all thermodynamic and unit the operation 
-     * will be calculated in a dynamic calculation.
-     * dt is the delta time step (seconds)
+     * In this method all thermodynamic and unit the operation will be calculated in a dynamic
+     * calculation. dt is the delta time step (seconds)
      *
      * @return void
      */
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleAbsorber.java b/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleAbsorber.java
index 186bfdee8..4bda2fe3d 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleAbsorber.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleAbsorber.java
@@ -75,9 +75,9 @@ public SimpleAbsorber(Stream inStream1) {
     /** {@inheritDoc} */
     @Override
     public void setName(String name) {
+        super.setName(name);
         // outStream[0].setName(name + "_Sout1");
         // outStream[1].setName(name + "_Sout2");
-        super.setName(name);
     }
 
     /**
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/absorber/WaterStripperColumn.java b/src/main/java/neqsim/processSimulation/processEquipment/absorber/WaterStripperColumn.java
index 4830dbb4c..cddacc13e 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/absorber/WaterStripperColumn.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/absorber/WaterStripperColumn.java
@@ -60,12 +60,6 @@ public WaterStripperColumn(String name) {
         mechanicalDesign = new AbsorberMechanicalDesign(this);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void addStream(StreamInterface newStream) {
@@ -497,12 +491,6 @@ public void displayResult() {
         dialog.setVisible(true);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * Getter for the field <code>waterDewPointTemperature</code>.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/adsorber/SimpleAdsorber.java b/src/main/java/neqsim/processSimulation/processEquipment/adsorber/SimpleAdsorber.java
index 686955bfd..d549c9a8e 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/adsorber/SimpleAdsorber.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/adsorber/SimpleAdsorber.java
@@ -77,9 +77,9 @@ public SimpleAdsorber(StreamInterface inStream1) {
     /** {@inheritDoc} */
     @Override
     public void setName(String name) {
+        super.setName(name);
         outStream[0].setName(name + "_Sout1");
         outStream[1].setName(name + "_Sout2");
-        this.name = name;
     }
 
     /**
@@ -189,12 +189,6 @@ public void displayResult() {
         outStream[1].displayResult();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * runTransient.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java b/src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java
index 8c4197438..b88497445 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java
@@ -4,15 +4,12 @@
 import java.awt.FlowLayout;
 import java.text.DecimalFormat;
 import java.text.FieldPosition;
-
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
 import neqsim.processSimulation.mechanicalDesign.compressor.CompressorMechanicalDesign;
 import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass;
 import neqsim.processSimulation.processEquipment.stream.StreamInterface;
@@ -795,12 +792,6 @@ public String[][] getResultTable() {
         return thermoSystem.getResultTable();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * getTotalWork.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchanger.java b/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchanger.java
index bd86e245a..06e5e221b 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchanger.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchanger.java
@@ -114,9 +114,9 @@ public void setFeedStream(int number, StreamInterface inStream) {
     /** {@inheritDoc} */
     @Override
     public void setName(String name) {
+        super.setName(name);
         outStream[0].setName(name + "_Sout1");
         outStream[1].setName(name + "_Sout2");
-        this.name = name;
     }
 
     /** {@inheritDoc} */
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Heater.java b/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Heater.java
index 14ecd0624..46fe33bc8 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Heater.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Heater.java
@@ -202,12 +202,6 @@ public void displayResult() {
         getOutStream().displayResult();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * runTransient.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/mixer/Mixer.java b/src/main/java/neqsim/processSimulation/processEquipment/mixer/Mixer.java
index df2504a79..f1d774c9c 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/mixer/Mixer.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/mixer/Mixer.java
@@ -359,12 +359,6 @@ public void displayResult() {
         dialog.setVisible(true);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void setPressure(double pres) {
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticNeqMixer.java b/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticNeqMixer.java
index 6dbc4cace..f1a2e49ac 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticNeqMixer.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticNeqMixer.java
@@ -125,10 +125,4 @@ public void run() {
         // System.out.println("temperature: " +
         // mixedStream.getThermoSystem().getTemperature());
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
 }
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticPhaseMixer.java b/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticPhaseMixer.java
index a683aa61e..e8bb41c3d 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticPhaseMixer.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticPhaseMixer.java
@@ -119,10 +119,4 @@ public void run() {
 
         mixedStream.getThermoSystem().init(3);
     }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
 }
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticPipe.java b/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticPipe.java
index cda334003..0c3babe54 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticPipe.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticPipe.java
@@ -65,12 +65,6 @@ public AdiabaticPipe(StreamInterface inStream) {
         outStream = (Stream) inStream.clone();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public StreamInterface getOutStream() {
@@ -231,12 +225,6 @@ public void displayResult() {
         system.display();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void runTransient() {
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticTwoPhasePipe.java b/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticTwoPhasePipe.java
index c1fbd0295..7aed47543 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticTwoPhasePipe.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticTwoPhasePipe.java
@@ -75,12 +75,6 @@ public SystemInterface getThermoSystem() {
         return outStream.getThermoSystem();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public StreamInterface getOutStream() {
@@ -300,12 +294,6 @@ public void displayResult() {
         system.display();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void runTransient() {
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/Pipeline.java b/src/main/java/neqsim/processSimulation/processEquipment/pipeline/Pipeline.java
index c6131cd0e..11e5f0f60 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/Pipeline.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/pipeline/Pipeline.java
@@ -291,18 +291,6 @@ public void setInitialFlowPattern(String flowPattern) {
         this.flowPattern = flowPattern;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /**
      * Getter for property times.
      *
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/SimpleTPoutPipeline.java b/src/main/java/neqsim/processSimulation/processEquipment/pipeline/SimpleTPoutPipeline.java
index 150fce8e3..9e76665d7 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/SimpleTPoutPipeline.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/pipeline/SimpleTPoutPipeline.java
@@ -40,12 +40,6 @@ public SimpleTPoutPipeline(StreamInterface inStream) {
         outStream = (Stream) inStream.clone();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public StreamInterface getOutStream() {
@@ -97,12 +91,6 @@ public void displayResult() {
         System.out.println("Superficial velocity out MEG/water : " + getSuperficialVelocity(2, 1));
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void runTransient() {}
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubber.java b/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubber.java
index 5615dccb2..c4a491408 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubber.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubber.java
@@ -66,12 +66,6 @@ public GasScrubber(String name, Stream inletStream) {
         this.setInletStream(inletStream);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /**
      * <p>
      * Setter for the field <code>inletStream</code>.
@@ -144,12 +138,6 @@ public void run() {
     @Override
     public void displayResult() {}
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * runTransient.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubberSimple.java b/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubberSimple.java
index b5c9d941c..8cc858c16 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubberSimple.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubberSimple.java
@@ -64,12 +64,6 @@ public GasScrubberSimple(String name, Stream inletStream) {
         this.setInletStream(inletStream);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /**
      * <p>
      * Setter for the field <code>inletStream</code>.
@@ -136,12 +130,6 @@ public void run() {
         liquidOutStream.setThermoSystem(liquidSystem);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * calcLiquidCarryoverFraction.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/Hydrocyclone.java b/src/main/java/neqsim/processSimulation/processEquipment/separator/Hydrocyclone.java
index 53e5c1348..c15c76de2 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/separator/Hydrocyclone.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/separator/Hydrocyclone.java
@@ -144,12 +144,6 @@ public void displayResult() {
         thermoSystem.display("from here " + getName());
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * runTransient.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/NeqGasScrubber.java b/src/main/java/neqsim/processSimulation/processEquipment/separator/NeqGasScrubber.java
index 2756eb4d4..4b4d296ae 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/separator/NeqGasScrubber.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/separator/NeqGasScrubber.java
@@ -61,12 +61,6 @@ public NeqGasScrubber(String name, Stream inletStream) {
         this.setInletStream(inletStream);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /**
      * <p>
      * Setter for the field <code>inletStream</code>.
@@ -139,12 +133,6 @@ public void run() {
     @Override
     public void displayResult() {}
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * runTransient.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/ThreePhaseSeparator.java b/src/main/java/neqsim/processSimulation/processEquipment/separator/ThreePhaseSeparator.java
index 45681ac38..b11b5ab88 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/separator/ThreePhaseSeparator.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/separator/ThreePhaseSeparator.java
@@ -227,12 +227,6 @@ public void displayResult() {
         // }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * runTransient.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/TwoPhaseSeparator.java b/src/main/java/neqsim/processSimulation/processEquipment/separator/TwoPhaseSeparator.java
index 8874a8368..6252a7262 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/separator/TwoPhaseSeparator.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/separator/TwoPhaseSeparator.java
@@ -54,12 +54,6 @@ public TwoPhaseSeparator(String name, StreamInterface inletStream) {
         this.setInletStream(inletStream);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void setInletStream(StreamInterface inletStream) {
@@ -116,12 +110,6 @@ public void run() {
     @Override
     public void displayResult() {}
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /**
      * <p>
      * runTransient.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/valve/ThrottlingValve.java b/src/main/java/neqsim/processSimulation/processEquipment/valve/ThrottlingValve.java
index 41247aac6..740925f6e 100644
--- a/src/main/java/neqsim/processSimulation/processEquipment/valve/ThrottlingValve.java
+++ b/src/main/java/neqsim/processSimulation/processEquipment/valve/ThrottlingValve.java
@@ -76,12 +76,6 @@ public ThrottlingValve(String name, StreamInterface inletStream) {
         setInletStream(inletStream);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void setInletStream(StreamInterface inletStream) {
@@ -229,12 +223,6 @@ public String[][] getResultTable() {
         return thermoSystem.getResultTable();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getName() {
-        return name;
-    }
-
     /** {@inheritDoc} */
     @Override
     public void runTransient(double dt) {