From 4c948a35da35c08208f4edf59088b1d8dd2f8bef Mon Sep 17 00:00:00 2001
From: galpha <k.gomez@freenet.de>
Date: Thu, 20 Jun 2019 14:26:25 +0200
Subject: [PATCH] [#1310] * addressed pr comments

---
 .../model/api/entities/GraphHeadFactory.java  |   2 +-
 .../model/api/entities/VertexFactory.java     |   2 +-
 ...rator.java => IdentifiableComparator.java} |   2 +-
 .../org/gradoop/common/GradoopTestUtils.java  |  16 +--
 .../PropagatePropertyToNeighborTest.java      |   4 +-
 .../btgs/functions/NewBtgGraphHead.java       |   2 +-
 .../flink/algorithms/fsm/dimspan/DIMSpan.java |   6 +-
 .../fsm/dimspan/config/DIMSpanConstants.java  |   4 +-
 .../functions/VCIComputeFunction.java         |   2 +-
 .../vertexdegrees/DistinctVertexDegrees.java  |   4 +-
 .../gelly/vertexdegrees/package-info.java     |   2 +-
 .../api/epgm/BaseGraphCollectionFactory.java  |  14 +-
 .../model/api/epgm/BaseGraphFactory.java      |  16 +--
 .../model/api/epgm/LogicalGraphOperators.java |   6 +-
 .../api/functions/TransformationFunction.java |   4 +-
 .../layouts/GraphCollectionLayoutFactory.java |  14 +-
 .../layouts/LogicalGraphLayoutFactory.java    |  22 ++--
 .../impl/comparators/ElementIdComparator.java |   2 +-
 .../model/impl/functions/epgm/ByLabel.java    |   2 +-
 .../model/impl/functions/epgm/ByProperty.java |   2 +-
 .../model/impl/functions/epgm/BySameId.java   |   2 +-
 .../model/impl/functions/epgm/Label.java      |   4 +-
 .../impl/functions/epgm/RenameLabel.java      |  10 +-
 .../functions/epgm/RenamePropertyKeys.java    |  10 +-
 .../model/impl/functions/epgm/SourceId.java   |   2 +-
 .../model/impl/functions/epgm/TargetId.java   |   2 +-
 .../functions/graphcontainment/InNoGraph.java |   2 +-
 .../operators/combination/Combination.java    |   6 +-
 .../operators/combination/package-info.java   |   2 +-
 .../result/functions/AddGradoopIdToRow.java   |   2 +-
 .../impl/operators/exclusion/Exclusion.java   |   2 +-
 .../fusion/functions/LeftElementId.java       |   2 +-
 .../grouping/tuples/EdgeGroupItem.java        |   2 +-
 .../grouping/tuples/VertexGroupItem.java      |   2 +-
 .../matching/common/query/QueryHandler.java   |   6 +-
 .../matching/common/tuples/Embedding.java     |   2 +-
 .../matching/single/PatternMatching.java      |   6 +-
 .../operators/expand/ExpandEmbeddings.java    |   2 +-
 .../expand/tuples/EdgeWithTiePoint.java       |   4 +-
 .../functions/TransformEdge.java              |   2 +-
 .../functions/TransformGraphHead.java         |   2 +-
 .../model/impl/GradoopFlinkTestUtils.java     |   6 +-
 .../flink/model/impl/LogicalGraphTest.java    |  12 +-
 .../GraphCollectionLayoutFactoryTest.java     |  54 ++++----
 .../LogicalGraphLayoutFactoryTest.java        |  34 ++---
 .../model/impl/layouts/gve/GVELayoutTest.java |  14 +-
 .../transactional/TxCollectionLayoutTest.java |  12 +-
 .../iterator/tserver/BaseElementIterator.java |   2 +-
 .../filter/api/AccumuloElementFilter.java     |  14 +-
 .../filter/impl/AccumuloLabelIn.java          |   2 +-
 .../filter/impl/AccumuloLabelReg.java         |   2 +-
 .../filter/impl/AccumuloPropEquals.java       |   2 +-
 .../filter/impl/AccumuloPropLargerThan.java   |   2 +-
 .../filter/impl/AccumuloPropReg.java          |   2 +-
 .../predicate/query/AccumuloQueryHolder.java  |  30 ++---
 .../impl/accumulo/basic/StoreTest.java        |  28 ++--
 .../storage/impl/accumulo/io/IOBasicTest.java |  24 ++--
 .../io/source/IOEdgePredicateTest.java        |   4 +-
 .../io/source/IOElementIdRangeTest.java       |   8 +-
 .../io/source/IOGraphPredicateTest.java       |   4 +-
 .../io/source/IOVertexPredicateTest.java      |   8 +-
 .../predicate/StoreBasicPredicateTest.java    |   8 +-
 .../predicate/StoreIdsPredicateTest.java      |   8 +-
 .../predicate/StoreLabelPredicateTest.java    |  14 +-
 .../predicate/StorePropPredicateTest.java     |  10 +-
 .../io/inputformats/BaseTableInputFormat.java |   2 +-
 .../filter/api/HBaseElementFilter.java        |   4 +-
 .../predicate/filter/impl/HBaseLabelIn.java   |   2 +-
 .../predicate/filter/impl/HBaseLabelReg.java  |   2 +-
 .../filter/impl/HBasePropEquals.java          |   2 +-
 .../filter/impl/HBasePropLargerThan.java      |   2 +-
 .../predicate/filter/impl/HBasePropReg.java   |   2 +-
 .../hbase/HBaseDefaultGraphStoreTest.java     |  50 +++----
 .../impl/hbase/HBaseEPGMStoreTest.java        |  20 +--
 .../hbase/io/HBaseDataSinkSourceTest.java     | 124 +++++++++---------
 .../predicate/filter/api/ElementFilter.java   |   2 +-
 .../common/predicate/query/ElementQuery.java  |   2 +-
 77 files changed, 354 insertions(+), 366 deletions(-)
 rename gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/{EPGMIdentifiableComparator.java => IdentifiableComparator.java} (91%)

diff --git a/gradoop-common/src/main/java/org/gradoop/common/model/api/entities/GraphHeadFactory.java b/gradoop-common/src/main/java/org/gradoop/common/model/api/entities/GraphHeadFactory.java
index 39886b1d1221..3a153163aefb 100644
--- a/gradoop-common/src/main/java/org/gradoop/common/model/api/entities/GraphHeadFactory.java
+++ b/gradoop-common/src/main/java/org/gradoop/common/model/api/entities/GraphHeadFactory.java
@@ -21,7 +21,7 @@
 /**
  * Initializes {@link GraphHead} objects of a given type.
  *
- * @param <G> EPGM graph head type
+ * @param <G> graph head type
  */
 public interface GraphHeadFactory<G extends GraphHead> extends ElementFactory<G> {
 
diff --git a/gradoop-common/src/main/java/org/gradoop/common/model/api/entities/VertexFactory.java b/gradoop-common/src/main/java/org/gradoop/common/model/api/entities/VertexFactory.java
index beb0532eaedf..a0c68131e990 100644
--- a/gradoop-common/src/main/java/org/gradoop/common/model/api/entities/VertexFactory.java
+++ b/gradoop-common/src/main/java/org/gradoop/common/model/api/entities/VertexFactory.java
@@ -22,7 +22,7 @@
 /**
  * Initializes {@link Vertex} objects of a given type.
  *
- * @param <V> EPGM vertex type
+ * @param <V> vertex type
  */
 public interface VertexFactory<V extends Vertex> extends ElementFactory<V> {
 
diff --git a/gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/EPGMIdentifiableComparator.java b/gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/IdentifiableComparator.java
similarity index 91%
rename from gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/EPGMIdentifiableComparator.java
rename to gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/IdentifiableComparator.java
index a757748e552f..ae15782bdda0 100644
--- a/gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/EPGMIdentifiableComparator.java
+++ b/gradoop-common/src/main/java/org/gradoop/common/model/impl/comparators/IdentifiableComparator.java
@@ -23,7 +23,7 @@
 /**
  * Id based EPGM element comparator.
  */
-public class EPGMIdentifiableComparator implements Comparator<Identifiable>, Serializable {
+public class IdentifiableComparator implements Comparator<Identifiable>, Serializable {
 
   @Override
   public int compare(Identifiable a, Identifiable b) {
diff --git a/gradoop-common/src/test/java/org/gradoop/common/GradoopTestUtils.java b/gradoop-common/src/test/java/org/gradoop/common/GradoopTestUtils.java
index 90213b282f5d..4b53fdf06714 100644
--- a/gradoop-common/src/test/java/org/gradoop/common/GradoopTestUtils.java
+++ b/gradoop-common/src/test/java/org/gradoop/common/GradoopTestUtils.java
@@ -27,7 +27,7 @@
 import org.gradoop.common.model.api.entities.Element;
 import org.gradoop.common.model.api.entities.GraphElement;
 import org.gradoop.common.model.api.entities.Identifiable;
-import org.gradoop.common.model.impl.comparators.EPGMIdentifiableComparator;
+import org.gradoop.common.model.impl.comparators.IdentifiableComparator;
 import org.gradoop.common.model.impl.id.GradoopId;
 import org.gradoop.common.model.impl.pojo.EPGMEdge;
 import org.gradoop.common.model.impl.pojo.EPGMGraphHead;
@@ -101,7 +101,7 @@ public class GradoopTestUtils {
   public static final short               SHORT_VAL_e               = (short) 23;
   public static final Set<PropertyValue>  SET_VAL_f                 = new HashSet<>();
 
-  private static Comparator<Identifiable> ID_COMPARATOR = new EPGMIdentifiableComparator();
+  private static Comparator<Identifiable> ID_COMPARATOR = new IdentifiableComparator();
 
   static {
     MAP_VAL_9.put(PropertyValue.create(KEY_0), PropertyValue.create(NULL_VAL_0));
@@ -232,7 +232,7 @@ public static void validateIdInequality(
    * @param collection1 first collection
    * @param collection2 second collection
    */
-  public static void validateEPGMElementCollections(
+  public static void validateElementCollections(
     Collection<? extends Element> collection1,
     Collection<? extends Element> collection2) {
     assertNotNull("first collection was null", collection1);
@@ -251,7 +251,7 @@ public static void validateEPGMElementCollections(
     Iterator<? extends Element> it2 = list2.iterator();
 
     while (it1.hasNext()) {
-      validateEPGMElements(
+      validateElements(
         it1.next(),
         it2.next());
     }
@@ -266,7 +266,7 @@ public static void validateEPGMElementCollections(
    * @param collection1 first collection
    * @param collection2 second collection
    */
-  public static void validateEPGMGraphElementCollections(
+  public static void validateGraphElementCollections(
     Collection<? extends GraphElement> collection1,
     Collection<? extends GraphElement> collection2) {
     assertNotNull("first collection was null", collection1);
@@ -282,7 +282,7 @@ public static void validateEPGMGraphElementCollections(
     Iterator<? extends GraphElement> it2 = list2.iterator();
 
     while (it1.hasNext()) {
-      validateEPGMGraphElements(it1.next(), it2.next());
+      validateGraphElements(it1.next(), it2.next());
     }
     assertFalse("too many elements in first collection", it1.hasNext());
     assertFalse("too many elements in second collection", it2.hasNext());
@@ -295,7 +295,7 @@ public static void validateEPGMGraphElementCollections(
    * @param element1 first element
    * @param element2 second element
    */
-  public static void validateEPGMElements(
+  public static void validateElements(
     Element element1, Element element2) {
     assertNotNull("first element was null", element1);
     assertNotNull("second element was null", element2);
@@ -336,7 +336,7 @@ public static void validateEPGMElements(
    * @param element1 first element
    * @param element2 second element
    */
-  public static void validateEPGMGraphElements(
+  public static void validateGraphElements(
     GraphElement element1, GraphElement element2) {
 
     assertNotNull("first element was null", element1);
diff --git a/gradoop-data-integration/src/test/java/org/gradoop/dataintegration/transformation/PropagatePropertyToNeighborTest.java b/gradoop-data-integration/src/test/java/org/gradoop/dataintegration/transformation/PropagatePropertyToNeighborTest.java
index ad6eae30be90..7573587be767 100644
--- a/gradoop-data-integration/src/test/java/org/gradoop/dataintegration/transformation/PropagatePropertyToNeighborTest.java
+++ b/gradoop-data-integration/src/test/java/org/gradoop/dataintegration/transformation/PropagatePropertyToNeighborTest.java
@@ -53,7 +53,7 @@ public class PropagatePropertyToNeighborTest extends GradoopFlinkTestBase {
       "(s2)-[e22:edge2]->(t2)" +
       "]" +
       "input2:test [" +
-      "(v:EPGMVertex {t: 1})-->(v)" +
+      "(v:Vertex {t: 1})-->(v)" +
       "]");
 
   /**
@@ -156,7 +156,7 @@ public void testPropagateToCertainVerticesAlongCertainEdges() throws Exception {
   @Test
   public void testPropagateInLoops() throws Exception {
     LogicalGraph input = loader.getLogicalGraphByVariable("input2");
-    UnaryGraphToGraphOperator operator = new PropagatePropertyToNeighbor("EPGMVertex", "t", "t");
+    UnaryGraphToGraphOperator operator = new PropagatePropertyToNeighbor("Vertex", "t", "t");
     LogicalGraph expected = input.transformVertices((v, c) -> {
       v.setProperty("t", Collections.singletonList(PropertyValue.create(1L)));
       return v;
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/btgs/functions/NewBtgGraphHead.java b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/btgs/functions/NewBtgGraphHead.java
index 442ffb9f6025..23602749aad8 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/btgs/functions/NewBtgGraphHead.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/btgs/functions/NewBtgGraphHead.java
@@ -25,7 +25,7 @@
 import org.gradoop.common.model.impl.id.GradoopId;
 
 /**
- * Creates an EPGM graph head representing a business transaction graphs.
+ * Creates an graph head representing a business transaction graphs.
  * @param <G> graph head type
  */
 public class NewBtgGraphHead<G extends GraphHead>
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/DIMSpan.java b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/DIMSpan.java
index a53a68af4885..798499a31b78 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/DIMSpan.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/DIMSpan.java
@@ -58,7 +58,7 @@
 import org.gradoop.flink.model.impl.tuples.WithCount;
 
 /**
- * abstract superclass of different implementations of the gSpan frequent
+ * Abstract superclass of different implementations of the gSpan frequent
  * subgraph mining algorithm as Gradoop operator
  */
 public class DIMSpan {
@@ -90,12 +90,12 @@ public class DIMSpan {
   protected final GSpanLogic gSpan;
 
   /**
-   * EPGMVertex label dictionary for dictionary coding.
+   * Vertex label dictionary for dictionary coding.
    */
   private DataSet<String[]> vertexDictionary;
 
   /**
-   * EPGMEdge label dictionary for dictionary coding.
+   * Edge label dictionary for dictionary coding.
    */
   private DataSet<String[]> edgeDictionary;
 
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/config/DIMSpanConstants.java b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/config/DIMSpanConstants.java
index 21895c2c606a..cd24cebc4af2 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/config/DIMSpanConstants.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/fsm/dimspan/config/DIMSpanConstants.java
@@ -31,12 +31,12 @@ public class DIMSpanConstants {
   public static final String MIN_FREQUENCY = "fmin";
 
   /**
-   * EPGMVertex label dictionary.
+   * Vertex label dictionary.
    */
   public static final String VERTEX_DICTIONARY = "vld";
 
   /**
-   * EPGMEdge label Dictionary
+   * Edge label Dictionary
    */
   public static final String EDGE_DICTIONARY = "eld";
 
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/randomjump/functions/VCIComputeFunction.java b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/randomjump/functions/VCIComputeFunction.java
index fdc3bccc73bf..775fd41009fb 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/randomjump/functions/VCIComputeFunction.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/randomjump/functions/VCIComputeFunction.java
@@ -31,7 +31,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
- * Compute function for {@link KRandomJumpGellyVCI}. EPGMVertex values are of type
+ * Compute function for {@link KRandomJumpGellyVCI}. Vertex values are of type
  * {@link VCIVertexValue}, with fields:
  * <p><ul>
  * <li>f0: {@code Boolean} set to {@code true} if the vertex was visited, to {@code false}
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/DistinctVertexDegrees.java b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/DistinctVertexDegrees.java
index 07c0c77e4b38..636a7bbc93eb 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/DistinctVertexDegrees.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/DistinctVertexDegrees.java
@@ -55,7 +55,7 @@ public class DistinctVertexDegrees extends GradoopGellyAlgorithm<NullValue, Null
   private final boolean includeZeroDegreeVertices;
 
   /**
-   * Constructor for EPGMVertex Degree with in- and out-degree and total of degrees of a graph.
+   * Constructor for vertex degree with in- and out-degree and total of degrees of a graph.
    *
    * @param propertyKey Property key to store the sum of in- and out-degrees in.
    * @param propertyKeyIn Property key to store the in-degree in.
@@ -66,7 +66,7 @@ public DistinctVertexDegrees(String propertyKey, String propertyKeyIn, String pr
   }
 
   /**
-   * Constructor for EPGMVertex Degree with fixed set of whether to output
+   * Constructor for vertex degree with fixed set of whether to output
    * vertices with an in-degree of zero.
    *
    * @param propertyKey Property key to store the sum of in- and out-degrees in.
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/package-info.java b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/package-info.java
index e9dd58727e15..bb75e6525a9f 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/package-info.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/algorithms/gelly/vertexdegrees/package-info.java
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 /**
- * Contains functions related to the Distinct EPGMVertex Degrees algorithm.
+ * Contains functions related to the distinct vertex degrees algorithm.
  */
 package org.gradoop.flink.algorithms.gelly.vertexdegrees;
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphCollectionFactory.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphCollectionFactory.java
index 8825cd0429bb..7c3938443cfe 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphCollectionFactory.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphCollectionFactory.java
@@ -56,8 +56,8 @@ public interface BaseGraphCollectionFactory<
   /**
    * Creates a collection from the given datasets.
    *
-   * @param graphHeads  EPGMGraphHead DataSet
-   * @param vertices    EPGMVertex DataSet
+   * @param graphHeads  GraphHead DataSet
+   * @param vertices    Vertex DataSet
    * @return Graph collection
    */
   GC fromDataSets(DataSet<G> graphHeads, DataSet<V> vertices);
@@ -65,9 +65,9 @@ public interface BaseGraphCollectionFactory<
   /**
    * Creates a collection layout from the given datasets.
    *
-   * @param graphHeads  EPGMGraphHead DataSet
-   * @param vertices    EPGMVertex DataSet
-   * @param edges       EPGMEdge DataSet
+   * @param graphHeads  GraphHead DataSet
+   * @param vertices    Vertex DataSet
+   * @param edges       Edge DataSet
    * @return Graph collection
    */
   GC fromDataSets(DataSet<G> graphHeads, DataSet<V> vertices, DataSet<E> edges);
@@ -88,8 +88,8 @@ GC fromIndexedDataSets(Map<String, DataSet<G>> graphHeads, Map<String, DataSet<V
    * Creates a collection layout from the given collections.
    *
    * @param graphHeads  Graph Head collection
-   * @param vertices    EPGMVertex collection
-   * @param edges       EPGMEdge collection
+   * @param vertices    Vertex collection
+   * @param edges       Edge collection
    * @return Graph collection
    */
   GC fromCollections(Collection<G> graphHeads, Collection<V> vertices, Collection<E> edges);
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphFactory.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphFactory.java
index ff7be0f82e47..2f549de97a81 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphFactory.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/BaseGraphFactory.java
@@ -63,8 +63,8 @@ public interface BaseGraphFactory<
    * The method creates a new graph head element and assigns the vertices and
    * edges to that graph.
    *
-   * @param vertices EPGMVertex DataSet
-   * @param edges    EPGMEdge DataSet
+   * @param vertices Vertex DataSet
+   * @param edges    Edge DataSet
    * @return Logical graph
    */
   LG fromDataSets(DataSet<V> vertices, DataSet<E> edges);
@@ -76,8 +76,8 @@ public interface BaseGraphFactory<
    * to the given graph head.
    *
    * @param graphHead   1-element EPGMGraphHead DataSet
-   * @param vertices    EPGMVertex DataSet
-   * @param edges       EPGMEdge DataSet
+   * @param vertices    Vertex DataSet
+   * @param edges       Edge DataSet
    * @return Logical graph
    */
   LG fromDataSets(DataSet<G> graphHead, DataSet<V> vertices, DataSet<E> edges);
@@ -109,8 +109,8 @@ LG fromIndexedDataSets(Map<String, DataSet<G>> graphHead,
    * Creates a logical graph from the given single graph head, vertex and edge collections.
    *
    * @param graphHead Graph head associated with the logical graph
-   * @param vertices  EPGMVertex collection
-   * @param edges     EPGMEdge collection
+   * @param vertices  Vertex collection
+   * @param edges     Edge collection
    * @return Logical graph
    */
   LG fromCollections(G graphHead, Collection<V> vertices, Collection<E> edges);
@@ -119,8 +119,8 @@ LG fromIndexedDataSets(Map<String, DataSet<G>> graphHead,
    * Creates a logical graph from the given vertex and edge collections. A new graph head is
    * created and all vertices and edges are assigned to that graph.
    *
-   * @param vertices    EPGMVertex collection
-   * @param edges       EPGMEdge collection
+   * @param vertices    Vertex collection
+   * @param edges       Edge collection
    * @return Logical graph
    */
   LG fromCollections(Collection<V> vertices, Collection<E> edges);
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/LogicalGraphOperators.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/LogicalGraphOperators.java
index 9077e3ce6c22..b8d716987c35 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/LogicalGraphOperators.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/epgm/LogicalGraphOperators.java
@@ -485,7 +485,7 @@ GraphCollection groupEdgesByRollUp(
 
   /**
    * Creates a new logical graph by combining the vertex and edge sets of
-   * this graph and the given graph. EPGMVertex and edge equality is based on their
+   * this graph and the given graph. Vertex and edge equality is based on their
    * identifiers.
    *
    * @param otherGraph logical graph to combine this graph with
@@ -496,7 +496,7 @@ GraphCollection groupEdgesByRollUp(
 
   /**
    * Creates a new logical graph containing the overlapping vertex and edge
-   * sets of this graph and the given graph. EPGMVertex and edge equality is
+   * sets of this graph and the given graph. Vertex and edge equality is
    * based on their identifiers.
    *
    * @param otherGraph logical graph to compute overlap with
@@ -507,7 +507,7 @@ GraphCollection groupEdgesByRollUp(
 
   /**
    * Creates a new logical graph containing only vertices and edges that
-   * exist in that graph but not in the other graph. EPGMVertex and edge equality
+   * exist in that graph but not in the other graph. Vertex and edge equality
    * is based on their identifiers.
    *
    * @param otherGraph logical graph to exclude from that graph
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/functions/TransformationFunction.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/functions/TransformationFunction.java
index ddceff6175cf..cf272101f4bb 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/functions/TransformationFunction.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/functions/TransformationFunction.java
@@ -24,7 +24,7 @@
  * A serializable function that is applied on an EPGM element (i.e. graph head,
  * vertex and edge) to transform its data, but not its identity.
  *
- * @param <EL> EPGM attributed / labeled element
+ * @param <EL> attributed / labeled element
  */
 public interface TransformationFunction<EL extends Attributed & Labeled>
   extends Serializable {
@@ -46,7 +46,7 @@ public interface TransformationFunction<EL extends Attributed & Labeled>
   /**
    * Returns the unmodified element.
    *
-   * @param <EL> EPGM attributed / labeled element
+   * @param <EL> attributed / labeled element
    * @return a function that always returns the current element
    */
   static <EL extends Attributed & Labeled> TransformationFunction<EL>
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/layouts/GraphCollectionLayoutFactory.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/layouts/GraphCollectionLayoutFactory.java
index c179d8a02d7d..b8df4b2da0cf 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/layouts/GraphCollectionLayoutFactory.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/layouts/GraphCollectionLayoutFactory.java
@@ -39,8 +39,8 @@ public interface GraphCollectionLayoutFactory<
   /**
    * Creates a collection layout from the given datasets.
    *
-   * @param graphHeads EPGMGraphHead DataSet
-   * @param vertices EPGMVertex DataSet
+   * @param graphHeads GraphHead DataSet
+   * @param vertices Vertex DataSet
    * @return Graph collection layout
    */
   GraphCollectionLayout<G, V, E> fromDataSets(DataSet<G> graphHeads, DataSet<V> vertices);
@@ -48,9 +48,9 @@ public interface GraphCollectionLayoutFactory<
   /**
    * Creates a collection layout from the given datasets.
    *
-   * @param graphHeads EPGMGraphHead DataSet
-   * @param vertices EPGMVertex DataSet
-   * @param edges EPGMEdge DataSet
+   * @param graphHeads GraphHead DataSet
+   * @param vertices Vertex DataSet
+   * @param edges Edge DataSet
    * @return Graph collection layout
    */
   GraphCollectionLayout<G, V, E> fromDataSets(DataSet<G> graphHeads, DataSet<V> vertices,
@@ -71,8 +71,8 @@ GraphCollectionLayout<G, V, E> fromIndexedDataSets(Map<String, DataSet<G>> graph
    * Creates a collection layout from the given collections.
    *
    * @param graphHeads Graph Head collection
-   * @param vertices EPGMVertex collection
-   * @param edges EPGMEdge collection
+   * @param vertices Vertex collection
+   * @param edges Edge collection
    * @return Graph collection layout
    */
   GraphCollectionLayout<G, V, E> fromCollections(Collection<G> graphHeads,
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/layouts/LogicalGraphLayoutFactory.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/layouts/LogicalGraphLayoutFactory.java
index eacc43278680..3752006f1b13 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/api/layouts/LogicalGraphLayoutFactory.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/api/layouts/LogicalGraphLayoutFactory.java
@@ -37,7 +37,7 @@ public interface LogicalGraphLayoutFactory<
   /**
    * Creates a logical graph layout from the given vertex dataset.
    *
-   * @param vertices  EPGMVertex dataset
+   * @param vertices  Vertex dataset
    * @return Logical graph layout
    */
   LogicalGraphLayout<G, V, E> fromDataSets(DataSet<V> vertices);
@@ -48,8 +48,8 @@ public interface LogicalGraphLayoutFactory<
    * The method creates a new graph head element and assigns the vertices and
    * edges to that graph.
    *
-   * @param vertices EPGMVertex DataSet
-   * @param edges    EPGMEdge DataSet
+   * @param vertices Vertex DataSet
+   * @param edges    Edge DataSet
    * @return Logical graph layout
    */
   LogicalGraphLayout<G, V, E> fromDataSets(DataSet<V> vertices, DataSet<E> edges);
@@ -60,9 +60,9 @@ public interface LogicalGraphLayoutFactory<
    * The method assumes that the given vertices and edges are already assigned
    * to the given graph head.
    *
-   * @param graphHead   1-element EPGMGraphHead DataSet
-   * @param vertices    EPGMVertex DataSet
-   * @param edges       EPGMEdge DataSet
+   * @param graphHead   1-element GraphHead DataSet
+   * @param vertices    Vertex DataSet
+   * @param edges       Edge DataSet
    * @return Logical graph layout
    */
   LogicalGraphLayout<G, V, E> fromDataSets(DataSet<G> graphHead, DataSet<V> vertices,
@@ -84,7 +84,7 @@ LogicalGraphLayout<G, V, E> fromIndexedDataSets(Map<String, DataSet<V>> vertices
    * The method assumes that the given vertices and edges are already assigned
    * to the given graph head.
    *
-   * @param graphHeads 1-element Mapping from label to EPGMGraphHead DataSet
+   * @param graphHeads 1-element Mapping from label to GraphHead DataSet
    * @param vertices Mapping from label to vertex dataset
    * @param edges Mapping from label to edge dataset
    * @return Logical graph layout
@@ -99,8 +99,8 @@ LogicalGraphLayout<G, V, E> fromIndexedDataSets(Map<String, DataSet<G>> graphHea
    * to the given graph head.
    *
    * @param graphHead Graph head associated with the logical graph
-   * @param vertices  EPGMVertex collection
-   * @param edges     EPGMEdge collection
+   * @param vertices  Vertex collection
+   * @param edges     Edge collection
    * @return Logical graph layout
    */
   LogicalGraphLayout<G, V, E> fromCollections(G graphHead, Collection<V> vertices,
@@ -110,8 +110,8 @@ LogicalGraphLayout<G, V, E> fromCollections(G graphHead, Collection<V> vertices,
    * Creates a logical graph layout from the given vertex and edge collections. A new graph head is
    * created and all vertices and edges are assigned to that graph.
    *
-   * @param vertices    EPGMVertex collection
-   * @param edges       EPGMEdge collection
+   * @param vertices    Vertex collection
+   * @param edges       Edge collection
    * @return Logical graph layout
    */
   LogicalGraphLayout<G, V, E> fromCollections(Collection<V> vertices, Collection<E> edges);
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/comparators/ElementIdComparator.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/comparators/ElementIdComparator.java
index 743ece342ed2..5d9d643a6c16 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/comparators/ElementIdComparator.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/comparators/ElementIdComparator.java
@@ -21,7 +21,7 @@
 import java.util.Comparator;
 
 /**
- * Id based EPGM element comparator.
+ * Id based element comparator.
  */
 public class ElementIdComparator implements Comparator<Element>, Serializable {
 
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/ByLabel.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/ByLabel.java
index 8e49e1a43864..0728db6c7d97 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/ByLabel.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/ByLabel.java
@@ -21,7 +21,7 @@
 /**
  * Accepts all elements which have the same label as specified.
  *
- * @param <L> EPGM labeled type
+ * @param <L> labeled type
  */
 public class ByLabel<L extends Labeled> implements CombinableFilter<L> {
   /**
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/ByProperty.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/ByProperty.java
index 2c89e97143dc..8907cc294d38 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/ByProperty.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/ByProperty.java
@@ -23,7 +23,7 @@
 /**
  * Accepts all elements which have a property with the specified key or key value combination.
  *
- * @param <E> EPGM element
+ * @param <E> element
  */
 public class ByProperty<E extends Element> implements CombinableFilter<E> {
   /**
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/BySameId.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/BySameId.java
index 437773819fe5..e42b2a9f6ff4 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/BySameId.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/BySameId.java
@@ -23,7 +23,7 @@
 /**
  * Filters elements if their identifier is equal to the given identifier.
  *
- * @param <EL> EPGM element type
+ * @param <EL> element type
  */
 @FunctionAnnotation.ReadFields("id")
 public class BySameId<EL extends EPGMElement> implements CombinableFilter<EL> {
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/Label.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/Label.java
index 245bb5d1fac3..9d65c87d18e1 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/Label.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/Label.java
@@ -21,9 +21,9 @@
 import org.gradoop.common.model.api.entities.Labeled;
 
 /**
- * labeled EPGM element => label
+ * labeled element => label
  *
- * @param <L> EPGM labeled type
+ * @param <L> labeled type
  */
 @FunctionAnnotation.ForwardedFields("label->*")
 public class Label<L extends Labeled>
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/RenameLabel.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/RenameLabel.java
index 5fd150798f02..ee245d836711 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/RenameLabel.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/RenameLabel.java
@@ -16,21 +16,15 @@
 package org.gradoop.flink.model.impl.functions.epgm;
 
 import org.gradoop.common.model.api.entities.Element;
-import org.gradoop.common.model.impl.pojo.EPGMEdge;
-import org.gradoop.common.model.impl.pojo.EPGMGraphHead;
-import org.gradoop.common.model.impl.pojo.EPGMVertex;
 import org.gradoop.flink.model.api.functions.TransformationFunction;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * A serializable function that is applied on an EPGM element (i.e. graph head,
+ * A serializable function that is applied on an element (i.e. graph head,
  * vertex and edge) to rename a label
  *
- * @param <T> the {@link Element} which is target of change, e.g.
- * {@link EPGMVertex},
- * {@link EPGMEdge} or
- * {@link EPGMGraphHead}
+ * @param <T> the {@link Element} which is target of change.
  */
 public class RenameLabel<T extends Element> implements TransformationFunction<T> {
 
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/RenamePropertyKeys.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/RenamePropertyKeys.java
index 79728265d324..20f1611aa9ad 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/RenamePropertyKeys.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/RenamePropertyKeys.java
@@ -16,9 +16,6 @@
 package org.gradoop.flink.model.impl.functions.epgm;
 
 import org.gradoop.common.model.api.entities.Element;
-import org.gradoop.common.model.impl.pojo.EPGMEdge;
-import org.gradoop.common.model.impl.pojo.EPGMGraphHead;
-import org.gradoop.common.model.impl.pojo.EPGMVertex;
 import org.gradoop.flink.model.api.functions.TransformationFunction;
 
 import java.util.Map;
@@ -26,14 +23,11 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * A serializable function that is applied on an EPGM element (i.e. graph head,
+ * A serializable function that is applied on an element (i.e. graph head,
  * vertex and edge) to rename property keys. If the new property key is already in use
  * the value will also be overwritten
  *
- *  @param <T> the {@link Element} which is target of change, e.g.
- *  {@link EPGMVertex},
- *  {@link EPGMEdge} or
- *  {@link EPGMGraphHead}
+ *  @param <T> the {@link Element} which is target of change.
  */
 public class RenamePropertyKeys<T extends Element> implements TransformationFunction<T> {
 
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/SourceId.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/SourceId.java
index e72f9e3a925e..402c55535908 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/SourceId.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/SourceId.java
@@ -24,7 +24,7 @@
 /**
  * Used to select the source vertex id of an edge.
  *
- * @param <E> EPGM edge type
+ * @param <E> edge type
  */
 @FunctionAnnotation.ForwardedFields("sourceId->*")
 public class SourceId<E extends Edge>
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/TargetId.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/TargetId.java
index d1632a01ce20..7c65851c8e2c 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/TargetId.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/epgm/TargetId.java
@@ -24,7 +24,7 @@
 /**
  * Used to select the target vertex id of an edge.
  *
- * @param <E> EPGM edge type
+ * @param <E> edge type
  */
 @FunctionAnnotation.ForwardedFieldsFirst("targetId->*")
 public class TargetId<E extends Edge>
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/graphcontainment/InNoGraph.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/graphcontainment/InNoGraph.java
index 859126935d04..a189c5288951 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/graphcontainment/InNoGraph.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/functions/graphcontainment/InNoGraph.java
@@ -21,7 +21,7 @@
 /**
  * True, if the element has not graph ids.
  *
- * @param <EL> epgm graph element
+ * @param <EL> graph element
  */
 public class InNoGraph<EL extends GraphElement> implements CombinableFilter<EL> {
 
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/combination/Combination.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/combination/Combination.java
index 3cfa16c9da89..4c363db4cfd6 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/combination/Combination.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/combination/Combination.java
@@ -29,7 +29,7 @@ public class Combination implements BinaryGraphToGraphOperator {
 
   /**
    * Creates a new logical graph by union the vertex and edge sets of two
-   * input graphs. EPGMVertex and edge equality is based on their respective
+   * input graphs. Vertex and edge equality is based on their respective
    * identifiers.
    *
    * @param firstGraph  first input graph
@@ -42,11 +42,11 @@ public LogicalGraph execute(LogicalGraph firstGraph,
 
     DataSet<EPGMVertex> newVertexSet = firstGraph.getVertices()
       .union(secondGraph.getVertices())
-      .distinct(new Id<EPGMVertex>());
+      .distinct(new Id<>());
 
     DataSet<EPGMEdge> newEdgeSet = firstGraph.getEdges()
       .union(secondGraph.getEdges())
-      .distinct(new Id<EPGMEdge>());
+      .distinct(new Id<>());
 
     return firstGraph.getConfig().getLogicalGraphFactory().fromDataSets(newVertexSet, newEdgeSet);
   }
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/combination/package-info.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/combination/package-info.java
index 688761c53fde..5a3061363679 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/combination/package-info.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/combination/package-info.java
@@ -15,7 +15,7 @@
  */
 /**
  * A combination operator creates a new logical graph by combining the vertex
- * and edge sets of two input graphs. EPGMVertex and edge equality is based on their
+ * and edge sets of two input graphs. Vertex and edge equality is based on their
  * respective identifiers.
  */
 package org.gradoop.flink.model.impl.operators.combination;
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/cypher/capf/result/functions/AddGradoopIdToRow.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/cypher/capf/result/functions/AddGradoopIdToRow.java
index c4ab72e06074..b12d3bb83d9c 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/cypher/capf/result/functions/AddGradoopIdToRow.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/cypher/capf/result/functions/AddGradoopIdToRow.java
@@ -20,7 +20,7 @@
 import org.gradoop.common.model.impl.id.GradoopId;
 
 /**
- * Extracts the first field of a Row, which is expected to be a EPGMGraphHead.
+ * Extracts the first field of a Row, which is expected to be a GraphHead.
  */
 public class AddGradoopIdToRow implements MapFunction<Row, Row> {
 
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/exclusion/Exclusion.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/exclusion/Exclusion.java
index 9f424e917dbc..c9b547967c8d 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/exclusion/Exclusion.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/exclusion/Exclusion.java
@@ -46,7 +46,7 @@
 /**
  * Computes the exclusion graph from two logical graphs.
  * Reduces the first input graph to contain only vertices and edges that don't exist in
- * the second graph. The graph head of the first graph is retained. EPGMVertex and edge equality
+ * the second graph. The graph head of the first graph is retained. Vertex and edge equality
  * is based on their respective identifiers.
  */
 public class Exclusion implements BinaryGraphToGraphOperator {
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/fusion/functions/LeftElementId.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/fusion/functions/LeftElementId.java
index c65cb2726703..0da21bbeafae 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/fusion/functions/LeftElementId.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/fusion/functions/LeftElementId.java
@@ -23,7 +23,7 @@
 
 /**
  * Left projection with id obtained.
- * @param <K> EPGMElement where the id is extracted
+ * @param <K> Element where the id is extracted
  *
  */
 @FunctionAnnotation.ForwardedFieldsFirst("id -> *")
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/grouping/tuples/EdgeGroupItem.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/grouping/tuples/EdgeGroupItem.java
index 0acc805c648d..1d83a5467adb 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/grouping/tuples/EdgeGroupItem.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/grouping/tuples/EdgeGroupItem.java
@@ -20,7 +20,7 @@
 import org.gradoop.common.model.impl.properties.PropertyValueList;
 
 /**
- * EPGMEdge representation used for grouping edges to super edges.
+ * Edge representation used for grouping edges to super edges.
  *
  * <pre>
  * f0: source vertex id
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/grouping/tuples/VertexGroupItem.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/grouping/tuples/VertexGroupItem.java
index 41fb3f77a1f1..29c6eee052e3 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/grouping/tuples/VertexGroupItem.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/grouping/tuples/VertexGroupItem.java
@@ -20,7 +20,7 @@
 import org.gradoop.common.model.impl.properties.PropertyValueList;
 
 /**
- * EPGMVertex representation used for grouping vertices to super vertices.
+ * Vertex representation used for grouping vertices to super vertices.
  *
  * <pre>
  * f0: vertex id
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/common/query/QueryHandler.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/common/query/QueryHandler.java
index 62737796f5ff..258b88c2b8f7 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/common/query/QueryHandler.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/common/query/QueryHandler.java
@@ -56,11 +56,11 @@ public class QueryHandler {
    */
   private Map<Integer, Set<String>> components;
   /**
-   * Cache: vId --> EPGMVertex with Id == vId
+   * Cache: vId --> Vertex with Id == vId
    */
   private Map<Long, Vertex> idToVertexCache;
   /**
-   * Cache: eId --> EPGMEdge with Id == eId
+   * Cache: eId --> Edge with Id == eId
    */
   private Map<Long, Edge> idToEdgeCache;
   /**
@@ -288,7 +288,7 @@ public Vertex getVertexByVariable(String variable) {
 
 
   /**
-   * Returns the EPGMEdge associated with the given variable or {@code null} if the variable does
+   * Returns the Edge associated with the given variable or {@code null} if the variable does
    * not exist. The variable can be either user-defined or auto-generated.
    *
    * @param variable query edge variable
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/common/tuples/Embedding.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/common/tuples/Embedding.java
index dd2785aaea46..4a01155dd10b 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/common/tuples/Embedding.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/common/tuples/Embedding.java
@@ -18,7 +18,7 @@
 import org.apache.flink.api.java.tuple.Tuple2;
 
 /**
- * Represents an embedding of a query pattern in the search graph. EPGMVertex and
+ * Represents an embedding of a query pattern in the search graph. Vertex and
  * edge mappings are represented by two arrays where the index in the array
  * refers to the index of the query vertex/edge.
  *
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/PatternMatching.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/PatternMatching.java
index 4d2234273466..94d78e338892 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/PatternMatching.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/PatternMatching.java
@@ -39,7 +39,7 @@
 public abstract class PatternMatching implements UnaryGraphToCollectionOperator {
 
   /**
-   * The property key used to stored the variable mappings inside the EPGMGraphHead properties
+   * The property key used to stored the variable mappings inside the GraphHead properties
    */
   public static final transient String VARIABLE_MAPPING_KEY = "__variable_mapping";
 
@@ -61,11 +61,11 @@ public abstract class PatternMatching implements UnaryGraphToCollectionOperator
    */
   private final boolean attachData;
   /**
-   * EPGMVertex mapping used for debug
+   * Vertex mapping used for debug
    */
   private DataSet<Tuple2<GradoopId, PropertyValue>> vertexMapping;
   /**
-   * EPGMEdge mapping used for debug
+   * Edge mapping used for debug
    */
   private DataSet<Tuple2<GradoopId, PropertyValue>> edgeMapping;
 
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/cypher/operators/expand/ExpandEmbeddings.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/cypher/operators/expand/ExpandEmbeddings.java
index f937a3e9cff2..edc984c97083 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/cypher/operators/expand/ExpandEmbeddings.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/cypher/operators/expand/ExpandEmbeddings.java
@@ -122,7 +122,7 @@ public ExpandEmbeddings(DataSet<Embedding> input, DataSet<Embedding> candidateEd
   /**
    * Runs a traversal over the given edgeCandidates withing the given bounds
    *
-   * @return the input appened by 2 entries (IdList(Path), IdEntry(End EPGMVertex)
+   * @return the input appened by 2 entries (IdList(Path), IdEntry(End Vertex)
    */
   @Override
   public DataSet<Embedding> evaluate() {
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/cypher/operators/expand/tuples/EdgeWithTiePoint.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/cypher/operators/expand/tuples/EdgeWithTiePoint.java
index 2fbf6baf65bf..dcdb1f5c3872 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/cypher/operators/expand/tuples/EdgeWithTiePoint.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/matching/single/cypher/operators/expand/tuples/EdgeWithTiePoint.java
@@ -20,7 +20,7 @@
 import org.gradoop.flink.model.impl.operators.matching.single.cypher.pojos.Embedding;
 
 /**
- * Represents an EPGMEdge with an extracted tie point
+ * Represents an Edge with an extracted tie point
  *
  * f0 -> edge join key
  * f1 -> edge id
@@ -35,7 +35,7 @@ public EdgeWithTiePoint() {
   }
 
   /**
-   * Creates a new EPGMEdge with extracted tie point from the given edge
+   * Creates a new Edge with extracted tie point from the given edge
    * @param edge edge embedding
    */
   public EdgeWithTiePoint(Embedding edge) {
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/transformation/functions/TransformEdge.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/transformation/functions/TransformEdge.java
index 78945653d09d..a2054192da8c 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/transformation/functions/TransformEdge.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/transformation/functions/TransformEdge.java
@@ -26,7 +26,7 @@
 /**
  * Transformation map function for edges.
  *
- * @param <E> the type of the EPGM edge
+ * @param <E> the type of the edge
  */
 @FunctionAnnotation.ForwardedFields("id;sourceId;targetId;graphIds")
 public class TransformEdge<E extends Edge> extends TransformBase<E> {
diff --git a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/transformation/functions/TransformGraphHead.java b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/transformation/functions/TransformGraphHead.java
index 9c5cd5a4f530..ce7d6fff4010 100644
--- a/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/transformation/functions/TransformGraphHead.java
+++ b/gradoop-flink/src/main/java/org/gradoop/flink/model/impl/operators/transformation/functions/TransformGraphHead.java
@@ -26,7 +26,7 @@
 /**
  * Transformation map function for graph heads.
  *
- * @param <G> the type of the EPGM graph head
+ * @param <G> the type of the graph head
  */
 @FunctionAnnotation.ForwardedFields("id")
 public class TransformGraphHead<G extends GraphHead> extends TransformBase<G> {
diff --git a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/GradoopFlinkTestUtils.java b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/GradoopFlinkTestUtils.java
index e77a5e1bba1b..65225bb089c4 100644
--- a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/GradoopFlinkTestUtils.java
+++ b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/GradoopFlinkTestUtils.java
@@ -159,9 +159,9 @@ public static void printUndirectedCanonicalAdjacencyMatrix(
   }
 
   public static void assertEquals(GraphTransaction a, GraphTransaction b) {
-    GradoopTestUtils.validateEPGMElements(a.getGraphHead(), b.getGraphHead());
-    GradoopTestUtils.validateEPGMElementCollections(a.getVertices(), b.getVertices());
-    GradoopTestUtils.validateEPGMElementCollections(a.getEdges(), b.getEdges());
+    GradoopTestUtils.validateElements(a.getGraphHead(), b.getGraphHead());
+    GradoopTestUtils.validateElementCollections(a.getVertices(), b.getVertices());
+    GradoopTestUtils.validateElementCollections(a.getEdges(), b.getEdges());
   }
 
   private static void assertEqualEdges(Edge a, Edge b) {
diff --git a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/LogicalGraphTest.java b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/LogicalGraphTest.java
index f0cda1f6a9dc..9031fd865aab 100644
--- a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/LogicalGraphTest.java
+++ b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/LogicalGraphTest.java
@@ -25,8 +25,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
-import static org.gradoop.common.GradoopTestUtils.validateEPGMGraphElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateGraphElementCollections;
 import static org.junit.Assert.assertEquals;
 
 public class LogicalGraphTest extends GradoopFlinkTestBase {
@@ -53,8 +53,8 @@ public void testGetVertices() throws Exception {
 
     List<EPGMVertex> outputVertices = loader.getLogicalGraph(false).getVertices().collect();
 
-    validateEPGMElementCollections(inputVertices, outputVertices);
-    validateEPGMGraphElementCollections(inputVertices, outputVertices);
+    validateElementCollections(inputVertices, outputVertices);
+    validateGraphElementCollections(inputVertices, outputVertices);
   }
 
   @Test
@@ -66,7 +66,7 @@ public void testGetEdges() throws Exception {
 
     List<EPGMEdge> outputEdges = loader.getLogicalGraph(false).getEdges().collect();
 
-    validateEPGMElementCollections(inputEdges, outputEdges);
-    validateEPGMGraphElementCollections(inputEdges, outputEdges);
+    validateElementCollections(inputEdges, outputEdges);
+    validateGraphElementCollections(inputEdges, outputEdges);
   }
 }
diff --git a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/GraphCollectionLayoutFactoryTest.java b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/GraphCollectionLayoutFactoryTest.java
index 2d8707d9e092..f4c3f88892b2 100644
--- a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/GraphCollectionLayoutFactoryTest.java
+++ b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/GraphCollectionLayoutFactoryTest.java
@@ -33,8 +33,8 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
-import static org.gradoop.common.GradoopTestUtils.validateEPGMGraphElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateGraphElementCollections;
 import static org.junit.Assert.assertEquals;
 
 public abstract class GraphCollectionLayoutFactoryTest extends GradoopFlinkTestBase {
@@ -74,11 +74,11 @@ public void testFromDataSets() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElementCollections(graphHeads, loadedGraphHeads);
-    validateEPGMElementCollections(vertices, loadedVertices);
-    validateEPGMElementCollections(edges, loadedEdges);
-    validateEPGMGraphElementCollections(vertices, loadedVertices);
-    validateEPGMGraphElementCollections(edges, loadedEdges);
+    validateElementCollections(graphHeads, loadedGraphHeads);
+    validateElementCollections(vertices, loadedVertices);
+    validateElementCollections(edges, loadedEdges);
+    validateGraphElementCollections(vertices, loadedVertices);
+    validateGraphElementCollections(edges, loadedEdges);
   }
 
   @Test
@@ -113,11 +113,11 @@ public void testFromIndexedDataSets() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElementCollections(loader.getGraphHeads(), loadedGraphHeads);
-    validateEPGMElementCollections(loader.getVertices(), loadedVertices);
-    validateEPGMElementCollections(loader.getEdges(), loadedEdges);
-    validateEPGMGraphElementCollections(loader.getVertices(), loadedVertices);
-    validateEPGMGraphElementCollections(loader.getEdges(), loadedEdges);
+    validateElementCollections(loader.getGraphHeads(), loadedGraphHeads);
+    validateElementCollections(loader.getVertices(), loadedVertices);
+    validateElementCollections(loader.getEdges(), loadedEdges);
+    validateGraphElementCollections(loader.getVertices(), loadedVertices);
+    validateGraphElementCollections(loader.getEdges(), loadedEdges);
   }
 
   @Test
@@ -140,11 +140,11 @@ public void testFromDataSetsWithoutGraphHead() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElementCollections(loader.getGraphHeads(), loadedGraphHeads);
-    validateEPGMElementCollections(loader.getVertices(), loadedVertices);
-    validateEPGMElementCollections(loader.getEdges(), loadedEdges);
-    validateEPGMGraphElementCollections(loader.getVertices(), loadedVertices);
-    validateEPGMGraphElementCollections(loader.getEdges(), loadedEdges);
+    validateElementCollections(loader.getGraphHeads(), loadedGraphHeads);
+    validateElementCollections(loader.getVertices(), loadedVertices);
+    validateElementCollections(loader.getEdges(), loadedEdges);
+    validateGraphElementCollections(loader.getVertices(), loadedVertices);
+    validateGraphElementCollections(loader.getEdges(), loadedEdges);
   }
 
   @Test
@@ -166,11 +166,11 @@ public void testFromCollections() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElementCollections(loader.getGraphHeads(), loadedGraphHeads);
-    validateEPGMElementCollections(loader.getVertices(), loadedVertices);
-    validateEPGMElementCollections(loader.getEdges(), loadedEdges);
-    validateEPGMGraphElementCollections(loader.getVertices(), loadedVertices);
-    validateEPGMGraphElementCollections(loader.getEdges(), loadedEdges);
+    validateElementCollections(loader.getGraphHeads(), loadedGraphHeads);
+    validateElementCollections(loader.getVertices(), loadedVertices);
+    validateElementCollections(loader.getEdges(), loadedEdges);
+    validateGraphElementCollections(loader.getVertices(), loadedVertices);
+    validateGraphElementCollections(loader.getEdges(), loadedEdges);
   }
 
   @Test
@@ -203,11 +203,11 @@ public void testFromGraphTransactions() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElementCollections(loader.getGraphHeadsByVariables("g0", "g1", "g2"), loadedGraphHeads);
-    validateEPGMElementCollections(loader.getVerticesByGraphVariables("g0", "g1", "g2"), loadedVertices);
-    validateEPGMElementCollections(loader.getEdgesByGraphVariables("g0", "g1", "g2"), loadedEdges);
-    validateEPGMGraphElementCollections(loader.getVerticesByGraphVariables("g0", "g1", "g2"), loadedVertices);
-    validateEPGMGraphElementCollections(loader.getEdgesByGraphVariables("g0", "g1", "g2"), loadedEdges);
+    validateElementCollections(loader.getGraphHeadsByVariables("g0", "g1", "g2"), loadedGraphHeads);
+    validateElementCollections(loader.getVerticesByGraphVariables("g0", "g1", "g2"), loadedVertices);
+    validateElementCollections(loader.getEdgesByGraphVariables("g0", "g1", "g2"), loadedEdges);
+    validateGraphElementCollections(loader.getVerticesByGraphVariables("g0", "g1", "g2"), loadedVertices);
+    validateGraphElementCollections(loader.getEdgesByGraphVariables("g0", "g1", "g2"), loadedEdges);
   }
 
   @Test
diff --git a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/LogicalGraphLayoutFactoryTest.java b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/LogicalGraphLayoutFactoryTest.java
index ca45f7040f43..d6ef7d194728 100644
--- a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/LogicalGraphLayoutFactoryTest.java
+++ b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/LogicalGraphLayoutFactoryTest.java
@@ -71,11 +71,11 @@ public void testFromDataSets() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElements(graphHead, loadedGraphHeads.iterator().next());
-    validateEPGMElementCollections(vertices, loadedVertices);
-    validateEPGMElementCollections(edges, loadedEdges);
-    validateEPGMGraphElementCollections(vertices, loadedVertices);
-    validateEPGMGraphElementCollections(edges, loadedEdges);
+    validateElements(graphHead, loadedGraphHeads.iterator().next());
+    validateElementCollections(vertices, loadedVertices);
+    validateElementCollections(edges, loadedEdges);
+    validateGraphElementCollections(vertices, loadedVertices);
+    validateGraphElementCollections(edges, loadedEdges);
   }
 
   @Test
@@ -110,11 +110,11 @@ public void testFromIndexedDataSets() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElements(g0, loadedGraphHeads.iterator().next());
-    validateEPGMElementCollections(loader.getVerticesByGraphVariables("g0"), loadedVertices);
-    validateEPGMElementCollections(loader.getEdgesByGraphVariables("g0"), loadedEdges);
-    validateEPGMGraphElementCollections(loader.getVerticesByGraphVariables("g0"), loadedVertices);
-    validateEPGMGraphElementCollections(loader.getEdgesByGraphVariables("g0"), loadedEdges);
+    validateElements(g0, loadedGraphHeads.iterator().next());
+    validateElementCollections(loader.getVerticesByGraphVariables("g0"), loadedVertices);
+    validateElementCollections(loader.getEdgesByGraphVariables("g0"), loadedEdges);
+    validateGraphElementCollections(loader.getVerticesByGraphVariables("g0"), loadedVertices);
+    validateGraphElementCollections(loader.getEdgesByGraphVariables("g0"), loadedEdges);
   }
 
   @Test
@@ -138,8 +138,8 @@ public void testFromDataSetsWithoutGraphHead() throws Exception {
 
     EPGMGraphHead newGraphHead = loadedGraphHead.iterator().next();
 
-    validateEPGMElementCollections(loadedVertices, loader.getVertices());
-    validateEPGMElementCollections(loadedEdges, loader.getEdges());
+    validateElementCollections(loadedVertices, loader.getVertices());
+    validateElementCollections(loadedEdges, loader.getEdges());
 
     Collection<EPGMGraphElement> epgmElements = new ArrayList<>();
     epgmElements.addAll(loadedVertices);
@@ -174,11 +174,11 @@ public void testFromCollectionsWithGraphHead() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElements(graphHead, loadedGraphHeads.iterator().next());
-    validateEPGMElementCollections(loader.getVerticesByGraphVariables("g0"), loadedVertices);
-    validateEPGMElementCollections(loader.getEdgesByGraphVariables("g0"), loadedEdges);
-    validateEPGMGraphElementCollections(loader.getVerticesByGraphVariables("g0"), loadedVertices);
-    validateEPGMGraphElementCollections(loader.getEdgesByGraphVariables("g0"), loadedEdges);
+    validateElements(graphHead, loadedGraphHeads.iterator().next());
+    validateElementCollections(loader.getVerticesByGraphVariables("g0"), loadedVertices);
+    validateElementCollections(loader.getEdgesByGraphVariables("g0"), loadedEdges);
+    validateGraphElementCollections(loader.getVerticesByGraphVariables("g0"), loadedVertices);
+    validateGraphElementCollections(loader.getEdgesByGraphVariables("g0"), loadedEdges);
   }
 
   /**
diff --git a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/gve/GVELayoutTest.java b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/gve/GVELayoutTest.java
index 46f73cba8eff..ba2221b138e3 100644
--- a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/gve/GVELayoutTest.java
+++ b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/gve/GVELayoutTest.java
@@ -102,43 +102,43 @@ public void getGraphTransactions() throws Exception {
 
   @Test
   public void getGraphHead() throws Exception {
-    GradoopTestUtils.validateEPGMElementCollections(Sets.newHashSet(g0),
+    GradoopTestUtils.validateElementCollections(Sets.newHashSet(g0),
       from(singletonList(g0), asList(v0, v1), singletonList(e0)).getGraphHead().collect());
   }
 
   @Test
   public void getGraphHeads() throws Exception {
-    GradoopTestUtils.validateEPGMElementCollections(Sets.newHashSet(g0, g1),
+    GradoopTestUtils.validateElementCollections(Sets.newHashSet(g0, g1),
       from(asList(g0, g1), asList(v0, v1, v2), asList(e0, e1)).getGraphHeads().collect());
   }
 
   @Test
   public void getGraphHeadsByLabel() throws Exception {
-    GradoopTestUtils.validateEPGMElementCollections(Sets.newHashSet(g0),
+    GradoopTestUtils.validateElementCollections(Sets.newHashSet(g0),
       from(asList(g0, g1), asList(v0, v1, v2), asList(e0, e1)).getGraphHeadsByLabel("A").collect());
   }
 
   @Test
   public void getVertices() throws Exception {
-    GradoopTestUtils.validateEPGMGraphElementCollections(Sets.newHashSet(v0, v1, v2),
+    GradoopTestUtils.validateGraphElementCollections(Sets.newHashSet(v0, v1, v2),
       from(asList(g0, g1), asList(v0, v1, v2), asList(e0, e1)).getVertices().collect());
   }
 
   @Test
   public void getVerticesByLabel() throws Exception {
-    GradoopTestUtils.validateEPGMGraphElementCollections(Sets.newHashSet(v0),
+    GradoopTestUtils.validateGraphElementCollections(Sets.newHashSet(v0),
       from(asList(g0, g1), asList(v0, v1, v2), asList(e0, e1)).getVerticesByLabel("A").collect());
   }
 
   @Test
   public void getEdges() throws Exception {
-    GradoopTestUtils.validateEPGMGraphElementCollections(Sets.newHashSet(e0, e1),
+    GradoopTestUtils.validateGraphElementCollections(Sets.newHashSet(e0, e1),
       from(asList(g0, g1), asList(v0, v1, v2), asList(e0, e1)).getEdges().collect());
   }
 
   @Test
   public void getEdgesByLabel() throws Exception {
-    GradoopTestUtils.validateEPGMGraphElementCollections(Sets.newHashSet(e0),
+    GradoopTestUtils.validateGraphElementCollections(Sets.newHashSet(e0),
       from(asList(g0, g1), asList(v0, v1, v2), asList(e0, e1)).getEdgesByLabel("a").collect());
   }
 }
diff --git a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/transactional/TxCollectionLayoutTest.java b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/transactional/TxCollectionLayoutTest.java
index e39cad10049a..c5356a4a49c0 100644
--- a/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/transactional/TxCollectionLayoutTest.java
+++ b/gradoop-flink/src/test/java/org/gradoop/flink/model/impl/layouts/transactional/TxCollectionLayoutTest.java
@@ -88,7 +88,7 @@ public void getGraphHeads() throws Exception {
     TxCollectionLayout layout = new TxCollectionLayout(
       getExecutionEnvironment().fromElements(tx0, tx1));
 
-    GradoopTestUtils.validateEPGMElementCollections(
+    GradoopTestUtils.validateElementCollections(
       Sets.newHashSet(tx0.getGraphHead(), tx1.getGraphHead()),
       layout.getGraphHeads().collect());
   }
@@ -98,7 +98,7 @@ public void getGraphHeadsByLabel() throws Exception {
     TxCollectionLayout layout = new TxCollectionLayout(
       getExecutionEnvironment().fromElements(tx0, tx1));
 
-    GradoopTestUtils.validateEPGMElementCollections(
+    GradoopTestUtils.validateElementCollections(
       Sets.newHashSet(tx0.getGraphHead()),
       layout.getGraphHeadsByLabel("A").collect());
   }
@@ -111,7 +111,7 @@ public void getVertices() throws Exception {
     Set<EPGMVertex> expected = Sets.newHashSet(tx0.getVertices());
     expected.addAll(tx1.getVertices());
 
-    GradoopTestUtils.validateEPGMGraphElementCollections(expected, layout.getVertices().collect());
+    GradoopTestUtils.validateGraphElementCollections(expected, layout.getVertices().collect());
   }
 
   @Test
@@ -120,7 +120,7 @@ public void getVerticesByLabel() throws Exception {
       getExecutionEnvironment().fromElements(tx0, tx1));
 
 
-    GradoopTestUtils.validateEPGMGraphElementCollections(
+    GradoopTestUtils.validateGraphElementCollections(
       tx0.getVertices().stream().filter(v -> v.getLabel().equals("A")).collect(Collectors.toList()),
       layout.getVerticesByLabel("A").collect());
   }
@@ -133,7 +133,7 @@ public void getEdges() throws Exception {
     Set<EPGMEdge> expected = Sets.newHashSet(tx0.getEdges());
     expected.addAll(tx1.getEdges());
 
-    GradoopTestUtils.validateEPGMGraphElementCollections(expected, layout.getEdges().collect());
+    GradoopTestUtils.validateGraphElementCollections(expected, layout.getEdges().collect());
   }
 
   @Test
@@ -141,7 +141,7 @@ public void getEdgesByLabel() throws Exception {
     TxCollectionLayout layout = new TxCollectionLayout(
       getExecutionEnvironment().fromElements(tx0, tx1));
 
-    GradoopTestUtils.validateEPGMGraphElementCollections(
+    GradoopTestUtils.validateGraphElementCollections(
       tx0.getEdges().stream().filter(e -> e.getLabel().equals("a")).collect(Collectors.toList()),
       layout.getEdgesByLabel("a").collect());
   }
diff --git a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/iterator/tserver/BaseElementIterator.java b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/iterator/tserver/BaseElementIterator.java
index 31cc4c067f85..2a2170cf85a6 100644
--- a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/iterator/tserver/BaseElementIterator.java
+++ b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/iterator/tserver/BaseElementIterator.java
@@ -37,7 +37,7 @@
 /**
  * Accumulo Tablet Server Iterator
  * This Iterator will be created in accumulo tablet server runtime, when executing a partition
- * range query. A Gradoop EPGMElement iterator will decode query options as query filter, transform
+ * range query. A Gradoop element iterator will decode query options as query filter, transform
  * multi-rows into epgm element and check if this element should be return by predicate. Each
  * element that fulfill the predicate will be serialized into one row.
  *
diff --git a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/api/AccumuloElementFilter.java b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/api/AccumuloElementFilter.java
index 2acfee86c1fe..09c8f0be74e9 100644
--- a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/api/AccumuloElementFilter.java
+++ b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/api/AccumuloElementFilter.java
@@ -36,9 +36,9 @@
 import java.util.function.Predicate;
 
 /**
- * Accumulo EPGMElement Filter
+ * Accumulo Element Filter
  *
- * @param <T> epgm element type
+ * @param <T> element type
  * @see GradoopEdgeIterator
  * @see GradoopGraphHeadIterator
  * @see GradoopVertexIterator
@@ -47,7 +47,7 @@ public interface AccumuloElementFilter<T extends Element>
   extends Predicate<T>, ElementFilter<AccumuloElementFilter<T>>, Serializable {
 
   /**
-   * anti-serialize reducer from base64 encoded string
+   * Anti-serialize reducer from base64 encoded string
    * this action will be execute by tserver
    *
    * @param encoded encoded string
@@ -68,7 +68,7 @@ static <T extends Element> AccumuloElementFilter<T> decode(String encoded) {
   }
 
   /**
-   * serialize reducer as base64 encoded string
+   * Serialize reducer as base64 encoded string
    * this action will be execute by client
    *
    * @return encoded string
@@ -85,7 +85,7 @@ default String encode() {
   }
 
   /**
-   * disjunctive operator
+   * Disjunctive operator
    *
    * @param another another reduce filter
    * @return conjunctive logic filter
@@ -96,7 +96,7 @@ default AccumuloElementFilter<T> or(@Nonnull AccumuloElementFilter<T> another) {
   }
 
   /**
-   * conjunctive operator
+   * Conjunctive operator
    *
    * @param another another reduce filter
    * @return conjunctive logic filter
@@ -107,7 +107,7 @@ default AccumuloElementFilter<T> and(@Nonnull AccumuloElementFilter<T> another)
   }
 
   /**
-   * negative operator
+   * Negative operator
    * @return negative logic for current filter
    */
   @Nonnull
diff --git a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloLabelIn.java b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloLabelIn.java
index 0f8d39bc92a9..0ab7c255fb4a 100644
--- a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloLabelIn.java
+++ b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloLabelIn.java
@@ -22,7 +22,7 @@
 /**
  * Accumulo label equality predicate implement
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class AccumuloLabelIn<T extends Element>
   extends LabelIn<AccumuloElementFilter<T>>
diff --git a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloLabelReg.java b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloLabelReg.java
index fd94b2a8cc79..b46df13bd127 100644
--- a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloLabelReg.java
+++ b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloLabelReg.java
@@ -24,7 +24,7 @@
 /**
  * Accumulo label regex predicate implement
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class AccumuloLabelReg<T extends Element>
   extends LabelReg<AccumuloElementFilter<T>>
diff --git a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropEquals.java b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropEquals.java
index da4414373732..6e085ca69cf9 100644
--- a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropEquals.java
+++ b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropEquals.java
@@ -24,7 +24,7 @@
 /**
  * Accumulo property equality implement
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class AccumuloPropEquals<T extends Element>
   extends PropEquals<AccumuloElementFilter<T>>
diff --git a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropLargerThan.java b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropLargerThan.java
index 330d02fbde05..f7827eda1553 100644
--- a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropLargerThan.java
+++ b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropLargerThan.java
@@ -23,7 +23,7 @@
 /**
  * Accumulo property value compare predicate implement
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class AccumuloPropLargerThan<T extends Element>
   extends PropLargerThan<AccumuloElementFilter<T>>
diff --git a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropReg.java b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropReg.java
index 8e507aecb1e1..e8be8f285eb2 100644
--- a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropReg.java
+++ b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/filter/impl/AccumuloPropReg.java
@@ -26,7 +26,7 @@
 /**
  * Accumulo property regex predicate implement
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class AccumuloPropReg<T extends Element>
   extends PropReg<AccumuloElementFilter<T>>
diff --git a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/query/AccumuloQueryHolder.java b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/query/AccumuloQueryHolder.java
index 420671da0604..61ac720c2f65 100644
--- a/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/query/AccumuloQueryHolder.java
+++ b/gradoop-store/gradoop-accumulo/src/main/java/org/gradoop/storage/impl/accumulo/predicate/query/AccumuloQueryHolder.java
@@ -32,26 +32,26 @@
 import java.util.stream.Collectors;
 
 /**
- * accumulo predicate filter definition, this is a internal model, should not be used outside
+ * Accumulo predicate filter definition, this is a internal model, should not be used outside
  *
- * @param <T> epgm element type
+ * @param <T> element type
  */
 public class AccumuloQueryHolder<T extends Element> implements Serializable {
 
   /**
-   * query ranges in accumulo table, should be serializable
+   * Query ranges in accumulo table, should be serializable
    */
   private final byte[] queryRanges;
 
   /**
-   * reduce filter for epgm element
+   * Reduce filter for element
    */
   private final AccumuloElementFilter<T> reduceFilter;
 
   /**
-   * accumulo predicate instance, low level api for store implement
+   * Accumulo predicate instance, low level api for store implement
    *
-   * @param logicalRanges accumulo logical ranges for ele ment table,
+   * @param logicalRanges accumulo logical ranges for element table,
    * @param reduceFilter query reduce filter
    *                     only those in predicate should be return from tserver.
    *                     if null, return all in range
@@ -67,10 +67,10 @@ private AccumuloQueryHolder(
   }
 
   /**
-   * create a predicate within a certain id ranges
+   * Create a predicate within a certain id ranges
    *
    * @param query element query
-   * @param <T>   epgm element type
+   * @param <T>   element type
    * @return accumulo predicate
    */
   public static <T extends Element> AccumuloQueryHolder<T> create(
@@ -88,11 +88,11 @@ public static <T extends Element> AccumuloQueryHolder<T> create(
   }
 
   /**
-   * create a predicate within a certain accumulo id ranges
+   * Create a predicate within a certain accumulo id ranges
    *
    * @param idRanges      gradoop row-id ranges for query element
    * @param reduceFilter  reducer filter logic
-   * @param <T>           epgm element type
+   * @param <T>           element type
    * @return accumulo predicate
    */
   public static <T extends Element> AccumuloQueryHolder<T> create(
@@ -106,7 +106,7 @@ public static <T extends Element> AccumuloQueryHolder<T> create(
   }
 
   /**
-   * get query ranges by anti-encrypt wrapper
+   * Qet query ranges by anti-encrypt wrapper
    *
    * @return seek range
    */
@@ -135,17 +135,17 @@ public String toString() {
   }
 
   /**
-   * range wrapper definition, just for request transport
+   * Range wrapper definition, just for request transport
    */
   private static class RangeWrapper {
 
     /**
-     * query ranges, may be null
+     * Query ranges, may be null
      */
     private List<Range> ranges;
 
     /**
-     * encrypt as byte array
+     * Encrypt as byte array
      *
      * @return byte array result
      */
@@ -158,7 +158,7 @@ private byte[] encrypt() {
     }
 
     /**
-     * decrypted from byte array
+     * Decrypted from byte array
      *
      * @param data encrypted data
      * @return range wrapper instance
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/basic/StoreTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/basic/StoreTest.java
index 54aef9b73630..d6cc629e69ca 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/basic/StoreTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/basic/StoreTest.java
@@ -80,10 +80,10 @@
 import static org.gradoop.common.GradoopTestUtils.STRING_VAL_6;
 import static org.gradoop.common.GradoopTestUtils.SUPPORTED_PROPERTIES;
 import static org.gradoop.common.GradoopTestUtils.TIME_VAL_c;
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElements;
-import static org.gradoop.common.GradoopTestUtils.validateEPGMGraphElementCollections;
-import static org.gradoop.common.GradoopTestUtils.validateEPGMGraphElements;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElements;
+import static org.gradoop.common.GradoopTestUtils.validateGraphElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateGraphElements;
 import static org.junit.Assert.*;
 
 /**
@@ -251,17 +251,17 @@ public void iteratorTest() throws IOException, AccumuloSecurityException,
     graphStore.flush();
 
     // graph heads
-    validateEPGMElementCollections(graphHeads,
+    validateElementCollections(graphHeads,
       graphStore.getGraphSpace().readRemainsAndClose());
     // vertices
-    validateEPGMElementCollections(vertices,
+    validateElementCollections(vertices,
       graphStore.getVertexSpace().readRemainsAndClose());
-    validateEPGMGraphElementCollections(vertices,
+    validateGraphElementCollections(vertices,
       graphStore.getVertexSpace().readRemainsAndClose());
     // edges
-    validateEPGMElementCollections(edges,
+    validateElementCollections(edges,
       graphStore.getEdgeSpace().readRemainsAndClose());
-    validateEPGMGraphElementCollections(edges,
+    validateGraphElementCollections(edges,
       graphStore.getEdgeSpace().readRemainsAndClose());
 
     graphStore.close();
@@ -404,7 +404,7 @@ private void validateGraphHead(
   ) throws IOException {
     GraphHead loadedGraphHead = graphStore.readGraph(originalGraphHead.getId());
 
-    validateEPGMElements(originalGraphHead, loadedGraphHead);
+    validateElements(originalGraphHead, loadedGraphHead);
   }
 
   private void validateVertex(
@@ -413,8 +413,8 @@ private void validateVertex(
   ) throws IOException {
     Vertex loadedVertex = graphStore.readVertex(originalVertex.getId());
 
-    validateEPGMElements(originalVertex, loadedVertex);
-    validateEPGMGraphElements(originalVertex, loadedVertex);
+    validateElements(originalVertex, loadedVertex);
+    validateGraphElements(originalVertex, loadedVertex);
   }
 
   private void validateEdge(
@@ -422,8 +422,8 @@ private void validateEdge(
     EPGMEdge originalEdge
   ) throws IOException {
     Edge loadedEdge = graphStore.readEdge(originalEdge.getId());
-    validateEPGMElements(originalEdge, loadedEdge);
-    validateEPGMGraphElements(originalEdge, loadedEdge);
+    validateElements(originalEdge, loadedEdge);
+    validateGraphElements(originalEdge, loadedEdge);
     assert loadedEdge != null;
     assertEquals("source vertex mismatch",
       originalEdge.getSourceId(), loadedEdge.getSourceId());
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/IOBasicTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/IOBasicTest.java
index 5dc3cf1e2a8d..2e03266384f5 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/IOBasicTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/IOBasicTest.java
@@ -34,8 +34,8 @@
 import java.io.InputStream;
 import java.util.Collection;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
-import static org.gradoop.common.GradoopTestUtils.validateEPGMGraphElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateGraphElementCollections;
 
 /**
  * accumulo data read write test
@@ -80,11 +80,11 @@ public void read() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElementCollections(graphHeads, loadedGraphHeads);
-    validateEPGMElementCollections(vertices, loadedVertices);
-    validateEPGMGraphElementCollections(vertices, loadedVertices);
-    validateEPGMElementCollections(edges, loadedEdges);
-    validateEPGMGraphElementCollections(edges, loadedEdges);
+    validateElementCollections(graphHeads, loadedGraphHeads);
+    validateElementCollections(vertices, loadedVertices);
+    validateGraphElementCollections(vertices, loadedVertices);
+    validateElementCollections(edges, loadedEdges);
+    validateGraphElementCollections(edges, loadedEdges);
 
     accumuloStore.close();
   }
@@ -111,15 +111,15 @@ public void write() throws Exception {
     getExecutionEnvironment().execute();
     accumuloStore.flush();
 
-    validateEPGMElementCollections(loader.getGraphHeads(),
+    validateElementCollections(loader.getGraphHeads(),
       accumuloStore.getGraphSpace().readRemainsAndClose());
-    validateEPGMElementCollections(loader.getVertices(),
+    validateElementCollections(loader.getVertices(),
       accumuloStore.getVertexSpace().readRemainsAndClose());
-    validateEPGMGraphElementCollections(loader.getVertices(),
+    validateGraphElementCollections(loader.getVertices(),
       accumuloStore.getVertexSpace().readRemainsAndClose());
-    validateEPGMElementCollections(loader.getEdges(),
+    validateElementCollections(loader.getEdges(),
       accumuloStore.getEdgeSpace().readRemainsAndClose());
-    validateEPGMGraphElementCollections(loader.getEdges(),
+    validateGraphElementCollections(loader.getEdges(),
       accumuloStore.getEdgeSpace().readRemainsAndClose());
 
     accumuloStore.close();
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOEdgePredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOEdgePredicateTest.java
index b7f2a31438ba..7920f420f6c8 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOEdgePredicateTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOEdgePredicateTest.java
@@ -61,7 +61,7 @@ public void queryEdgeByProperty() throws Throwable {
         .getEdges()
         .collect();
 
-      GradoopTestUtils.validateEPGMElementCollections(storeEdges, query);
+      GradoopTestUtils.validateElementCollections(storeEdges, query);
     });
   }
 
@@ -85,7 +85,7 @@ public void findEdgeByLabelRegex() throws Throwable {
         .getEdges()
         .collect();
 
-      GradoopTestUtils.validateEPGMGraphElementCollections(storeEdges, query);
+      GradoopTestUtils.validateGraphElementCollections(storeEdges, query);
     });
   }
 
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOElementIdRangeTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOElementIdRangeTest.java
index 03270944a8d2..b6f9146c6cc3 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOElementIdRangeTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOElementIdRangeTest.java
@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class IOElementIdRangeTest extends AccumuloStoreTestBase {
@@ -70,7 +70,7 @@ public void vertexIdSetQueryTest() throws Throwable {
         .getVertices()
         .collect();
 
-      validateEPGMElementCollections(inputVertices, queryResult);
+      validateElementCollections(inputVertices, queryResult);
     });
   }
 
@@ -103,7 +103,7 @@ public void edgeIdSetQueryTest() throws Throwable {
         .getEdges()
         .collect();
 
-      validateEPGMElementCollections(inputEdges, queryResult);
+      validateElementCollections(inputEdges, queryResult);
     });
   }
 
@@ -136,7 +136,7 @@ public void graphIdSetQueryTest() throws Throwable {
         .getGraphHeads()
         .collect();
 
-      validateEPGMElementCollections(inputGraphs, queryResult);
+      validateElementCollections(inputGraphs, queryResult);
     });
   }
 
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOGraphPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOGraphPredicateTest.java
index 3cbe2f09265e..45ebdeabba34 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOGraphPredicateTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOGraphPredicateTest.java
@@ -62,7 +62,7 @@ public void queryGraphByProperty() throws Throwable {
         .getGraphHeads()
         .collect();
 
-      GradoopTestUtils.validateEPGMElementCollections(storeGraphs, query);
+      GradoopTestUtils.validateElementCollections(storeGraphs, query);
     });
   }
 
@@ -93,7 +93,7 @@ public void queryByMulti() throws Throwable {
         .getGraphHeads()
         .collect();
 
-      GradoopTestUtils.validateEPGMElementCollections(storeGraphs, query);
+      GradoopTestUtils.validateElementCollections(storeGraphs, query);
     });
   }
 
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOVertexPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOVertexPredicateTest.java
index 98be4d0eb09d..d6bd0ff2744e 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOVertexPredicateTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOVertexPredicateTest.java
@@ -29,7 +29,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class IOVertexPredicateTest extends AccumuloStoreTestBase {
@@ -76,7 +76,7 @@ public void writeAndQueryVertexByName() throws Throwable {
         .getVertices()
         .collect();
 
-      validateEPGMElementCollections(inputVertices, queryResult);
+      validateElementCollections(inputVertices, queryResult);
     });
   }
 
@@ -109,7 +109,7 @@ public void findPersonByAgeBiggerThan35() throws Throwable {
         .getVertices()
         .collect();
 
-      validateEPGMElementCollections(inputVertices, queryResult);
+      validateElementCollections(inputVertices, queryResult);
     });
   }
 
@@ -142,7 +142,7 @@ public void findPersonByAgeSmallerThan35() throws Throwable {
         .getVertices()
         .collect();
 
-      validateEPGMElementCollections(inputVertices, queryResult);
+      validateElementCollections(inputVertices, queryResult);
     });
   }
 
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreBasicPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreBasicPredicateTest.java
index 144d5879f0fa..0c3f7f6f2e72 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreBasicPredicateTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreBasicPredicateTest.java
@@ -35,7 +35,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
 
 /**
  * Accumulo graph store predicate test
@@ -80,7 +80,7 @@ public void findPersonByName() throws Throwable {
             ))
         .readRemainsAndClose();
 
-      validateEPGMElementCollections(inputVertices, queryResult);
+      validateElementCollections(inputVertices, queryResult);
     });
   }
 
@@ -107,7 +107,7 @@ public void findPersonByAge() throws Throwable {
             .fromAll()
             .where(AccumuloFilters.propLargerThan("age", 35, true)))
         .readRemainsAndClose();
-      validateEPGMElementCollections(inputVertices, queryResult);
+      validateElementCollections(inputVertices, queryResult);
     });
   }
 
@@ -142,7 +142,7 @@ public void findGraphByIdsAndProperty() throws Throwable {
       List<EPGMGraphHead> query = store
         .getGraphSpace(queryFormula)
         .readRemainsAndClose();
-      GradoopTestUtils.validateEPGMElementCollections(inputGraph, query);
+      GradoopTestUtils.validateElementCollections(inputGraph, query);
     });
   }
 
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreIdsPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreIdsPredicateTest.java
index e45f70ecb8a1..be29fedc5b3b 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreIdsPredicateTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreIdsPredicateTest.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class StoreIdsPredicateTest extends AccumuloStoreTestBase {
@@ -60,7 +60,7 @@ public void vertexIdSetQueryTest() throws Throwable {
             .noFilter())
         .readRemainsAndClose();
 
-      validateEPGMElementCollections(inputVertices, queryResult);
+      validateElementCollections(inputVertices, queryResult);
     });
   }
 
@@ -85,7 +85,7 @@ public void edgeIdSetQueryTest() throws Throwable {
             .noFilter())
         .readRemainsAndClose();
 
-      validateEPGMElementCollections(inputEdges, queryResult);
+      validateElementCollections(inputEdges, queryResult);
     });
   }
 
@@ -104,7 +104,7 @@ public void graphIdSetQueryTest() throws Throwable {
             .noFilter())
         .readRemainsAndClose();
 
-      validateEPGMElementCollections(inputGraphs, queryResult);
+      validateElementCollections(inputGraphs, queryResult);
     });
   }
 
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreLabelPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreLabelPredicateTest.java
index 23f6afee03ad..91d2e294f09d 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreLabelPredicateTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreLabelPredicateTest.java
@@ -30,7 +30,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class StoreLabelPredicateTest extends AccumuloStoreTestBase {
@@ -64,7 +64,7 @@ public void vertexLabelEquals() throws Throwable {
             .where(AccumuloFilters.labelIn("Person", "Tag")))
         .readRemainsAndClose();
 
-      validateEPGMElementCollections(inputVertex, queryResult);
+      validateElementCollections(inputVertex, queryResult);
     });
   }
 
@@ -89,7 +89,7 @@ public void edgeLabelEquals() throws Throwable {
             .fromAll()
             .where(AccumuloFilters.labelIn("hasInterest", "hasMember")))
         .readRemainsAndClose();
-      validateEPGMElementCollections(inputEdges, queryResult);
+      validateElementCollections(inputEdges, queryResult);
     });
   }
 
@@ -115,7 +115,7 @@ public void vertexLabelRegex() throws Throwable {
             .where(AccumuloFilters.labelReg(queryFormula)))
         .readRemainsAndClose();
 
-      validateEPGMElementCollections(inputVertex, queryResult);
+      validateElementCollections(inputVertex, queryResult);
     });
   }
 
@@ -142,7 +142,7 @@ public void edgeLabelRegex() throws Throwable {
             .where(AccumuloFilters.labelReg(queryFormula)))
         .readRemainsAndClose();
 
-      validateEPGMElementCollections(inputVertex, queryResult);
+      validateElementCollections(inputVertex, queryResult);
     });
   }
 
@@ -164,7 +164,7 @@ public void graphLabelEquals() throws Throwable {
             .where(AccumuloFilters.labelIn("Community", "Person")))
         .readRemainsAndClose();
 
-      validateEPGMElementCollections(inputGraph, queryResult);
+      validateElementCollections(inputGraph, queryResult);
     });
   }
 
@@ -187,7 +187,7 @@ public void graphLabelRegex() throws Throwable {
             .where(AccumuloFilters.labelReg(queryFormula)))
         .readRemainsAndClose();
 
-      validateEPGMElementCollections(inputGraph, queryResult);
+      validateElementCollections(inputGraph, queryResult);
     });
   }
 
diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StorePropPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StorePropPredicateTest.java
index c6feb93ea3c3..5879c040d814 100644
--- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StorePropPredicateTest.java
+++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StorePropPredicateTest.java
@@ -68,7 +68,7 @@ public void vertexPropEquals() throws Throwable {
             .where(AccumuloFilters.propEquals("gender", "f")))
         .readRemainsAndClose();
 
-      GradoopTestUtils.validateEPGMElementCollections(inputVertices, query);
+      GradoopTestUtils.validateElementCollections(inputVertices, query);
     });
   }
 
@@ -97,7 +97,7 @@ public void edgePropEquals() throws Throwable {
             .where(AccumuloFilters.propEquals("since", 2014)))
         .readRemainsAndClose();
 
-      GradoopTestUtils.validateEPGMElementCollections(inputVertices, query);
+      GradoopTestUtils.validateElementCollections(inputVertices, query);
     });
   }
 
@@ -129,7 +129,7 @@ public void propRegex() throws Throwable {
             .where(AccumuloFilters.propReg("city", queryFormula)))
         .readRemainsAndClose();
 
-      GradoopTestUtils.validateEPGMElementCollections(inputVertices, query);
+      GradoopTestUtils.validateElementCollections(inputVertices, query);
     });
   }
 
@@ -160,7 +160,7 @@ public void propLargerThan() throws Throwable {
               .propLargerThan("since", 2014, true)))
         .readRemainsAndClose();
 
-      GradoopTestUtils.validateEPGMElementCollections(inputVertices, query);
+      GradoopTestUtils.validateElementCollections(inputVertices, query);
     });
   }
 
@@ -186,7 +186,7 @@ public void propSmallerThan() throws Throwable {
               .propLargerThan("vertexCount", 4, true)))
         .readRemainsAndClose();
 
-      GradoopTestUtils.validateEPGMElementCollections(inputVertices, query);
+      GradoopTestUtils.validateElementCollections(inputVertices, query);
     });
   }
 
diff --git a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/io/inputformats/BaseTableInputFormat.java b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/io/inputformats/BaseTableInputFormat.java
index 548f279b7be7..b290113c89ec 100644
--- a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/io/inputformats/BaseTableInputFormat.java
+++ b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/io/inputformats/BaseTableInputFormat.java
@@ -29,7 +29,7 @@
 /**
  * Base class for common functionality of HBase input formats
  *
- * @param <E> type of EPGM element
+ * @param <E> type of element
  */
 abstract class BaseTableInputFormat<E extends Element> extends TableInputFormat<Tuple1<E>> {
 
diff --git a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/api/HBaseElementFilter.java b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/api/HBaseElementFilter.java
index f2fa080766f6..6aeed9f75f8d 100644
--- a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/api/HBaseElementFilter.java
+++ b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/api/HBaseElementFilter.java
@@ -26,9 +26,9 @@
 import java.io.Serializable;
 
 /**
- * HBase EPGMElement Filter interface to chain predicates
+ * HBase Element Filter interface to chain predicates
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public interface HBaseElementFilter<T extends Element>
   extends ElementFilter<HBaseElementFilter<T>>, Serializable {
diff --git a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelIn.java b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelIn.java
index 15d73f8eb520..b6b81eff7c3e 100644
--- a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelIn.java
+++ b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelIn.java
@@ -26,7 +26,7 @@
 /**
  * HBase label equality predicate implementation
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class HBaseLabelIn<T extends Element> extends LabelIn<HBaseElementFilter<T>>
   implements HBaseElementFilter<T> {
diff --git a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelReg.java b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelReg.java
index b623f66eddd9..541a81a80a44 100644
--- a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelReg.java
+++ b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelReg.java
@@ -27,7 +27,7 @@
 /**
  * HBase label regex predicate implementation
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class HBaseLabelReg<T extends Element> extends LabelReg<HBaseElementFilter<T>>
   implements HBaseElementFilter<T> {
diff --git a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropEquals.java b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropEquals.java
index a0118f33d712..4e56b118d496 100644
--- a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropEquals.java
+++ b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropEquals.java
@@ -26,7 +26,7 @@
 /**
  * HBase property equality implementation
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class HBasePropEquals<T extends Element> extends PropEquals<HBaseElementFilter<T>>
   implements HBaseElementFilter<T> {
diff --git a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropLargerThan.java b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropLargerThan.java
index 677056dc4483..ffe2c7e7bece 100644
--- a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropLargerThan.java
+++ b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropLargerThan.java
@@ -26,7 +26,7 @@
 /**
  * HBase property value compare predicate implement
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class HBasePropLargerThan<T extends Element>
   extends PropLargerThan<HBaseElementFilter<T>> implements HBaseElementFilter<T> {
diff --git a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropReg.java b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropReg.java
index 505455f03f52..f7c7610a15bb 100644
--- a/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropReg.java
+++ b/gradoop-store/gradoop-hbase/src/main/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropReg.java
@@ -27,7 +27,7 @@
 /**
  * HBase property regex filter implementation
  *
- * @param <T> EPGM element type
+ * @param <T> element type
  */
 public class HBasePropReg<T extends Element> extends PropReg<HBaseElementFilter<T>>
   implements HBaseElementFilter<T> {
diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseDefaultGraphStoreTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseDefaultGraphStoreTest.java
index 211726cff78c..aef42cae7289 100644
--- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseDefaultGraphStoreTest.java
+++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseDefaultGraphStoreTest.java
@@ -40,7 +40,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -100,7 +100,7 @@ public void testGetGraphSpaceWithIdPredicate() throws IOException {
         .noFilter())
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(graphHeads, queryResult);
+    validateElementCollections(graphHeads, queryResult);
   }
 
   /**
@@ -119,7 +119,7 @@ public void testGetGraphSpaceWithoutIdPredicate() throws IOException {
         .noFilter())
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(graphHeads, queryResult);
+    validateElementCollections(graphHeads, queryResult);
   }
 
   /**
@@ -145,7 +145,7 @@ public void testGetVertexSpaceWithIdPredicate() throws IOException {
         .noFilter())
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(vertices, queryResult);
+    validateElementCollections(vertices, queryResult);
   }
 
   /**
@@ -164,7 +164,7 @@ public void testGetVertexSpaceWithoutIdPredicate() throws IOException {
         .noFilter())
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(vertices, queryResult);
+    validateElementCollections(vertices, queryResult);
   }
 
   /**
@@ -189,7 +189,7 @@ public void testGetEdgeSpaceWithIdPredicate() throws IOException {
         .noFilter())
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(edges, queryResult);
+    validateElementCollections(edges, queryResult);
   }
 
   /**
@@ -208,7 +208,7 @@ public void testGetEdgeSpaceWithoutIdPredicate() throws IOException {
         .noFilter())
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(edges, queryResult);
+    validateElementCollections(edges, queryResult);
   }
 
   /**
@@ -255,9 +255,9 @@ public void testGetElementSpaceWithLabelInPredicate() throws IOException {
         .where(HBaseFilters.<EPGMVertex>labelIn(LABEL_TAG, LABEL_FORUM).negate()))
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(graphHeads, graphHeadResult);
-    validateEPGMElementCollections(vertices, vertexResult);
-    validateEPGMElementCollections(edges, edgeResult);
+    validateElementCollections(graphHeads, graphHeadResult);
+    validateElementCollections(vertices, vertexResult);
+    validateElementCollections(edges, edgeResult);
   }
 
   /**
@@ -303,9 +303,9 @@ public void testGetElementSpaceWithLabelRegPredicate() throws IOException {
         .where(HBaseFilters.labelReg(PATTERN_VERTEX)))
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(graphHeads, graphHeadResult);
-    validateEPGMElementCollections(vertices, vertexResult);
-    validateEPGMElementCollections(edges, edgeResult);
+    validateElementCollections(graphHeads, graphHeadResult);
+    validateElementCollections(vertices, vertexResult);
+    validateElementCollections(edges, edgeResult);
   }
 
   /**
@@ -359,9 +359,9 @@ public void testGetElementSpaceWithPropEqualsPredicate() throws IOException {
         .where(HBaseFilters.propEquals(PROP_CITY, propertyValueCity)))
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(graphHeads, graphHeadResult);
-    validateEPGMElementCollections(vertices, vertexResult);
-    validateEPGMElementCollections(edges, edgeResult);
+    validateElementCollections(graphHeads, graphHeadResult);
+    validateElementCollections(vertices, vertexResult);
+    validateElementCollections(edges, edgeResult);
   }
 
   /**
@@ -419,9 +419,9 @@ public void testGetElementSpaceWithPropLargerThanPredicate() throws IOException
         .where(HBaseFilters.propLargerThan(PROP_AGE, propertyValueAge, false)))
       .readRemainsAndClose();
 
-    validateEPGMElementCollections(graphHeads, graphHeadResult);
-    validateEPGMElementCollections(vertices, vertexResult);
-    validateEPGMElementCollections(edges, edgeResult);
+    validateElementCollections(graphHeads, graphHeadResult);
+    validateElementCollections(vertices, vertexResult);
+    validateElementCollections(edges, edgeResult);
   }
 
   /**
@@ -478,9 +478,9 @@ public void testGetElementSpaceWithPropRegPredicate() throws IOException {
     assertEquals(2, edgeResult.size());
     assertEquals(2, vertexResult.size());
 
-    validateEPGMElementCollections(graphHeads, graphHeadResult);
-    validateEPGMElementCollections(vertices, vertexResult);
-    validateEPGMElementCollections(edges, edgeResult);
+    validateElementCollections(graphHeads, graphHeadResult);
+    validateElementCollections(vertices, vertexResult);
+    validateElementCollections(edges, edgeResult);
   }
 
   /**
@@ -543,8 +543,8 @@ public void testGetElementSpaceWithChainedPredicates() throws IOException {
     assertEquals(21, edgeResult.size());
     assertEquals(3, vertexResult.size());
 
-    validateEPGMElementCollections(graphHeads, graphHeadResult);
-    validateEPGMElementCollections(vertices, vertexResult);
-    validateEPGMElementCollections(edges, edgeResult);
+    validateElementCollections(graphHeads, graphHeadResult);
+    validateElementCollections(vertices, vertexResult);
+    validateElementCollections(edges, edgeResult);
   }
 }
diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseEPGMStoreTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseEPGMStoreTest.java
index 24c867e3673a..abb7041ecab9 100644
--- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseEPGMStoreTest.java
+++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseEPGMStoreTest.java
@@ -172,25 +172,25 @@ public void iteratorTest() throws IOException {
     graphStore.flush();
 
     // graph heads
-    validateEPGMElementCollections(
+    validateElementCollections(
       graphHeads,
       graphStore.getGraphSpace().readRemainsAndClose()
     );
     // vertices
-    validateEPGMElementCollections(
+    validateElementCollections(
       vertices,
       graphStore.getVertexSpace().readRemainsAndClose()
     );
-    validateEPGMGraphElementCollections(
+    validateGraphElementCollections(
       vertices,
       graphStore.getVertexSpace().readRemainsAndClose()
     );
     // edges
-    validateEPGMElementCollections(
+    validateElementCollections(
       edges,
       graphStore.getEdgeSpace().readRemainsAndClose()
     );
-    validateEPGMGraphElementCollections(
+    validateGraphElementCollections(
       edges,
       graphStore.getEdgeSpace().readRemainsAndClose()
     );
@@ -381,23 +381,23 @@ private void validateGraphHead(HBaseEPGMStore graphStore, EPGMGraphHead original
 
     GraphHead loadedGraphHead = graphStore.readGraph(originalGraphHead.getId());
 
-    validateEPGMElements(originalGraphHead, loadedGraphHead);
+    validateElements(originalGraphHead, loadedGraphHead);
   }
 
   private void validateVertex(HBaseEPGMStore graphStore, EPGMVertex originalVertex) throws IOException {
 
     Vertex loadedVertex = graphStore.readVertex(originalVertex.getId());
 
-    validateEPGMElements(originalVertex, loadedVertex);
-    validateEPGMGraphElements(originalVertex, loadedVertex);
+    validateElements(originalVertex, loadedVertex);
+    validateGraphElements(originalVertex, loadedVertex);
   }
 
   private void validateEdge(HBaseEPGMStore graphStore, EPGMEdge originalEdge) throws IOException {
 
     Edge loadedEdge = graphStore.readEdge(originalEdge.getId());
 
-    validateEPGMElements(originalEdge, loadedEdge);
-    validateEPGMGraphElements(originalEdge, loadedEdge);
+    validateElements(originalEdge, loadedEdge);
+    validateGraphElements(originalEdge, loadedEdge);
 
     assert loadedEdge != null;
     assertEquals("source vertex mismatch", originalEdge.getSourceId(), loadedEdge.getSourceId());
diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/io/HBaseDataSinkSourceTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/io/HBaseDataSinkSourceTest.java
index 1dd0c2861f51..2ff29d3f84e5 100644
--- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/io/HBaseDataSinkSourceTest.java
+++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/io/HBaseDataSinkSourceTest.java
@@ -54,8 +54,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.gradoop.common.GradoopTestUtils.validateEPGMElementCollections;
-import static org.gradoop.common.GradoopTestUtils.validateEPGMGraphElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateElementCollections;
+import static org.gradoop.common.GradoopTestUtils.validateGraphElementCollections;
 import static org.gradoop.storage.impl.hbase.GradoopHBaseTestBase.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -192,11 +192,11 @@ public void testReadFromSource() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElementCollections(getSocialGraphHeads(), loadedGraphHeads);
-    validateEPGMElementCollections(getSocialVertices(), loadedVertices);
-    validateEPGMGraphElementCollections(getSocialVertices(), loadedVertices);
-    validateEPGMElementCollections(getSocialEdges(), loadedEdges);
-    validateEPGMGraphElementCollections(getSocialEdges(), loadedEdges);
+    validateElementCollections(getSocialGraphHeads(), loadedGraphHeads);
+    validateElementCollections(getSocialVertices(), loadedVertices);
+    validateGraphElementCollections(getSocialVertices(), loadedVertices);
+    validateElementCollections(getSocialEdges(), loadedEdges);
+    validateGraphElementCollections(getSocialEdges(), loadedEdges);
   }
 
   /**
@@ -232,11 +232,11 @@ public void testReadFromSourceWithEmptyPredicates() throws Exception {
 
     getExecutionEnvironment().execute();
 
-    validateEPGMElementCollections(getSocialGraphHeads(), loadedGraphHeads);
-    validateEPGMElementCollections(getSocialVertices(), loadedVertices);
-    validateEPGMGraphElementCollections(getSocialVertices(), loadedVertices);
-    validateEPGMElementCollections(getSocialEdges(), loadedEdges);
-    validateEPGMGraphElementCollections(getSocialEdges(), loadedEdges);
+    validateElementCollections(getSocialGraphHeads(), loadedGraphHeads);
+    validateElementCollections(getSocialVertices(), loadedVertices);
+    validateGraphElementCollections(getSocialVertices(), loadedVertices);
+    validateElementCollections(getSocialEdges(), loadedEdges);
+    validateGraphElementCollections(getSocialEdges(), loadedEdges);
 
   }
 
@@ -267,11 +267,11 @@ public void testReadWithGraphIdPredicate() throws Throwable {
     Collection<EPGMVertex> loadedVertices = graphCollection.getVertices().collect();
     Collection<EPGMEdge> loadedEdges = graphCollection.getEdges().collect();
 
-    validateEPGMElementCollections(testGraphs, loadedGraphHeads);
-    validateEPGMElementCollections(getSocialVertices(), loadedVertices);
-    validateEPGMGraphElementCollections(getSocialVertices(), loadedVertices);
-    validateEPGMElementCollections(getSocialEdges(), loadedEdges);
-    validateEPGMGraphElementCollections(getSocialEdges(), loadedEdges);
+    validateElementCollections(testGraphs, loadedGraphHeads);
+    validateElementCollections(getSocialVertices(), loadedVertices);
+    validateGraphElementCollections(getSocialVertices(), loadedVertices);
+    validateElementCollections(getSocialEdges(), loadedEdges);
+    validateGraphElementCollections(getSocialEdges(), loadedEdges);
   }
 
   /**
@@ -302,11 +302,11 @@ public void testReadWithVertexIdPredicate() throws Throwable {
     Collection<EPGMVertex> loadedVertices = graphCollection.getVertices().collect();
     Collection<EPGMEdge> loadedEdges = graphCollection.getEdges().collect();
 
-    validateEPGMElementCollections(getSocialGraphHeads(), loadedGraphHeads);
-    validateEPGMElementCollections(testVertices, loadedVertices);
-    validateEPGMGraphElementCollections(testVertices, loadedVertices);
-    validateEPGMElementCollections(getSocialEdges(), loadedEdges);
-    validateEPGMGraphElementCollections(getSocialEdges(), loadedEdges);
+    validateElementCollections(getSocialGraphHeads(), loadedGraphHeads);
+    validateElementCollections(testVertices, loadedVertices);
+    validateGraphElementCollections(testVertices, loadedVertices);
+    validateElementCollections(getSocialEdges(), loadedEdges);
+    validateGraphElementCollections(getSocialEdges(), loadedEdges);
   }
 
   /**
@@ -337,11 +337,11 @@ public void testReadWithEdgeIdPredicate() throws Throwable {
     Collection<EPGMVertex> loadedVertices = graphCollection.getVertices().collect();
     Collection<EPGMEdge> loadedEdges = graphCollection.getEdges().collect();
 
-    validateEPGMElementCollections(getSocialGraphHeads(), loadedGraphHeads);
-    validateEPGMElementCollections(getSocialVertices(), loadedVertices);
-    validateEPGMGraphElementCollections(getSocialVertices(), loadedVertices);
-    validateEPGMElementCollections(testEdges, loadedEdges);
-    validateEPGMGraphElementCollections(testEdges, loadedEdges);
+    validateElementCollections(getSocialGraphHeads(), loadedGraphHeads);
+    validateElementCollections(getSocialVertices(), loadedVertices);
+    validateGraphElementCollections(getSocialVertices(), loadedVertices);
+    validateElementCollections(testEdges, loadedEdges);
+    validateGraphElementCollections(testEdges, loadedEdges);
   }
 
   /**
@@ -395,11 +395,11 @@ public void testReadWithLabelInPredicate() throws Exception {
     Collection<EPGMVertex> loadedVertices = graphCollection.getVertices().collect();
     Collection<EPGMEdge> loadedEdges = graphCollection.getEdges().collect();
 
-    validateEPGMElementCollections(graphHeads, loadedGraphHeads);
-    validateEPGMElementCollections(vertices, loadedVertices);
-    validateEPGMGraphElementCollections(vertices, loadedVertices);
-    validateEPGMElementCollections(edges, loadedEdges);
-    validateEPGMGraphElementCollections(edges, loadedEdges);
+    validateElementCollections(graphHeads, loadedGraphHeads);
+    validateElementCollections(vertices, loadedVertices);
+    validateGraphElementCollections(vertices, loadedVertices);
+    validateElementCollections(edges, loadedEdges);
+    validateGraphElementCollections(edges, loadedEdges);
   }
 
   /**
@@ -449,11 +449,11 @@ public void testReadWithLabelRegPredicate() throws Exception {
     Collection<EPGMVertex> loadedVertices = graphCollection.getVertices().collect();
     Collection<EPGMEdge> loadedEdges = graphCollection.getEdges().collect();
 
-    validateEPGMElementCollections(graphHeads, loadedGraphHeads);
-    validateEPGMElementCollections(vertices, loadedVertices);
-    validateEPGMGraphElementCollections(vertices, loadedVertices);
-    validateEPGMElementCollections(edges, loadedEdges);
-    validateEPGMGraphElementCollections(edges, loadedEdges);
+    validateElementCollections(graphHeads, loadedGraphHeads);
+    validateElementCollections(vertices, loadedVertices);
+    validateGraphElementCollections(vertices, loadedVertices);
+    validateElementCollections(edges, loadedEdges);
+    validateGraphElementCollections(edges, loadedEdges);
   }
 
   /**
@@ -511,11 +511,11 @@ public void testReadWithPropEqualsPredicate() throws Exception {
     Collection<EPGMVertex> loadedVertices = graphCollection.getVertices().collect();
     Collection<EPGMEdge> loadedEdges = graphCollection.getEdges().collect();
 
-    validateEPGMElementCollections(graphHeads, loadedGraphHeads);
-    validateEPGMElementCollections(vertices, loadedVertices);
-    validateEPGMGraphElementCollections(vertices, loadedVertices);
-    validateEPGMElementCollections(edges, loadedEdges);
-    validateEPGMGraphElementCollections(edges, loadedEdges);
+    validateElementCollections(graphHeads, loadedGraphHeads);
+    validateElementCollections(vertices, loadedVertices);
+    validateGraphElementCollections(vertices, loadedVertices);
+    validateElementCollections(edges, loadedEdges);
+    validateGraphElementCollections(edges, loadedEdges);
   }
 
   /**
@@ -579,11 +579,11 @@ public void testReadWithPropLargerThanPredicate() throws Exception {
     Collection<EPGMVertex> loadedVertices = graphCollection.getVertices().collect();
     Collection<EPGMEdge> loadedEdges = graphCollection.getEdges().collect();
 
-    validateEPGMElementCollections(graphHeads, loadedGraphHeads);
-    validateEPGMElementCollections(vertices, loadedVertices);
-    validateEPGMGraphElementCollections(vertices, loadedVertices);
-    validateEPGMElementCollections(edges, loadedEdges);
-    validateEPGMGraphElementCollections(edges, loadedEdges);
+    validateElementCollections(graphHeads, loadedGraphHeads);
+    validateElementCollections(vertices, loadedVertices);
+    validateGraphElementCollections(vertices, loadedVertices);
+    validateElementCollections(edges, loadedEdges);
+    validateGraphElementCollections(edges, loadedEdges);
   }
 
   /**
@@ -647,11 +647,11 @@ public void testReadWithPropRegPredicate() throws Exception {
     assertEquals(2, loadedEdges.size());
     assertEquals(2, loadedVertices.size());
 
-    validateEPGMElementCollections(graphHeads, loadedGraphHeads);
-    validateEPGMElementCollections(vertices, loadedVertices);
-    validateEPGMGraphElementCollections(vertices, loadedVertices);
-    validateEPGMElementCollections(edges, loadedEdges);
-    validateEPGMGraphElementCollections(edges, loadedEdges);
+    validateElementCollections(graphHeads, loadedGraphHeads);
+    validateElementCollections(vertices, loadedVertices);
+    validateGraphElementCollections(vertices, loadedVertices);
+    validateElementCollections(edges, loadedEdges);
+    validateGraphElementCollections(edges, loadedEdges);
   }
 
   /**
@@ -722,11 +722,11 @@ public void testReadWithChainedPredicates() throws Exception {
     assertEquals(21, loadedEdges.size());
     assertEquals(3, loadedVertices.size());
 
-    validateEPGMElementCollections(graphHeads, loadedGraphHeads);
-    validateEPGMElementCollections(vertices, loadedVertices);
-    validateEPGMGraphElementCollections(vertices, loadedVertices);
-    validateEPGMElementCollections(edges, loadedEdges);
-    validateEPGMGraphElementCollections(edges, loadedEdges);
+    validateElementCollections(graphHeads, loadedGraphHeads);
+    validateElementCollections(vertices, loadedVertices);
+    validateGraphElementCollections(vertices, loadedVertices);
+    validateElementCollections(edges, loadedEdges);
+    validateGraphElementCollections(edges, loadedEdges);
   }
 
   /**
@@ -775,25 +775,25 @@ public void testWriteToSink() throws Exception {
     // read social network from HBase
 
     // graph heads
-    validateEPGMElementCollections(
+    validateElementCollections(
       loader.getGraphHeads(),
       newStore.getGraphSpace().readRemainsAndClose()
     );
     // vertices
-    validateEPGMElementCollections(
+    validateElementCollections(
       loader.getVertices(),
       newStore.getVertexSpace().readRemainsAndClose()
     );
-    validateEPGMGraphElementCollections(
+    validateGraphElementCollections(
       loader.getVertices(),
       newStore.getVertexSpace().readRemainsAndClose()
     );
     // edges
-    validateEPGMElementCollections(
+    validateElementCollections(
       loader.getEdges(),
       newStore.getEdgeSpace().readRemainsAndClose()
     );
-    validateEPGMGraphElementCollections(
+    validateGraphElementCollections(
       loader.getEdges(),
       newStore.getEdgeSpace().readRemainsAndClose()
     );
diff --git a/gradoop-store/gradoop-store-api/src/main/java/org/gradoop/storage/common/predicate/filter/api/ElementFilter.java b/gradoop-store/gradoop-store-api/src/main/java/org/gradoop/storage/common/predicate/filter/api/ElementFilter.java
index 43cb55ea21f8..69fe5931ff95 100644
--- a/gradoop-store/gradoop-store-api/src/main/java/org/gradoop/storage/common/predicate/filter/api/ElementFilter.java
+++ b/gradoop-store/gradoop-store-api/src/main/java/org/gradoop/storage/common/predicate/filter/api/ElementFilter.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 
 /**
- * EPGMElement Filter Formula
+ * Element Filter Formula
  * A element filter predicate will be
  *  - created by client,
  *  - transform to query options and send to region servers
diff --git a/gradoop-store/gradoop-store-api/src/main/java/org/gradoop/storage/common/predicate/query/ElementQuery.java b/gradoop-store/gradoop-store-api/src/main/java/org/gradoop/storage/common/predicate/query/ElementQuery.java
index 8f7d92f4cc01..64220cadcbf8 100644
--- a/gradoop-store/gradoop-store-api/src/main/java/org/gradoop/storage/common/predicate/query/ElementQuery.java
+++ b/gradoop-store/gradoop-store-api/src/main/java/org/gradoop/storage/common/predicate/query/ElementQuery.java
@@ -26,7 +26,7 @@
 import java.util.stream.Collectors;
 
 /**
- * EPGMElement Query Formula
+ * Element Query Formula
  *
  * A element query contains
  *  - id range set (which define the query id range of result element)