diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/FlowLaneTrackingEmailGenerator.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/EntityTrackingEmailGenerator.java
similarity index 94%
rename from deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/FlowLaneTrackingEmailGenerator.java
rename to deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/EntityTrackingEmailGenerator.java
index 5b3f05001619d61cc234e1498dd1595895d4616c..9ab5d058b4399ae5a566068604262683d2f285e5 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/FlowLaneTrackingEmailGenerator.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/EntityTrackingEmailGenerator.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * @author Piotr Buczek
  */
-public class FlowLaneTrackingEmailGenerator implements IFlowLaneTrackingEmailGenerator
+public class EntityTrackingEmailGenerator implements IEntityTrackingEmailGenerator
 {
 
     public List<Email> generateEmails(TrackedEntities trackedEntities)
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/IFlowLaneTrackingEmailGenerator.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/IEntityTrackingEmailGenerator.java
similarity index 95%
rename from deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/IFlowLaneTrackingEmailGenerator.java
rename to deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/IEntityTrackingEmailGenerator.java
index b537b8706e10fe60b508a50817c12883e6bd19e7..1bf17061dff1a2e024111f54e56fdfd7c34f7c27 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/IFlowLaneTrackingEmailGenerator.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/tracking/IEntityTrackingEmailGenerator.java
@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * @author Piotr Buczek
  */
-interface IFlowLaneTrackingEmailGenerator
+interface IEntityTrackingEmailGenerator
 {
     /**
      * Generates all {@link Email}s to be send containing information about