--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DefaultState.java	Sun Apr 28 15:14:30 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/DefaultState.java	Sun Apr 28 15:23:01 2013 +0200
@@ -34,7 +34,7 @@
 import org.dive4elements.artifactdatabase.state.AbstractState;
 import org.dive4elements.artifactdatabase.state.Facet;
 
-import org.dive4elements.river.artifacts.FLYSArtifact;
+import org.dive4elements.river.artifacts.D4EArtifact;
 
 import org.dive4elements.river.artifacts.resources.Resources;
 
@@ -59,7 +59,7 @@
     }
 
 
-    protected StateData getData(FLYSArtifact artifact,  String name) {
+    protected StateData getData(D4EArtifact artifact,  String name) {
         return artifact.getData(name);
     }
 
@@ -96,7 +96,7 @@
             return ui;
         }
 
-        FLYSArtifact flys = (FLYSArtifact)artifact;
+        D4EArtifact flys = (D4EArtifact)artifact;
 
         for (String name: theData.keySet()) {
             appendStaticData(flys, context, creator, ui, name);
@@ -107,7 +107,7 @@
 
 
     protected void appendStaticData(
-        FLYSArtifact   flys,
+        D4EArtifact   flys,
         CallContext    context,
         ElementCreator cr,
         Element        ui,
@@ -147,7 +147,7 @@
      * @return an Element.
      */
     protected Element createStaticData(
-        FLYSArtifact   flys,
+        D4EArtifact   flys,
         ElementCreator creator,
         CallContext    cc,
         String         name,
@@ -268,7 +268,7 @@
             return ui;
         }
 
-        FLYSArtifact flys = (FLYSArtifact)artifact;
+        D4EArtifact flys = (D4EArtifact)artifact;
 
         for (String name: theData.keySet()) {
             StateData data = getData(flys, name);
@@ -403,14 +403,14 @@
     /**
      * This method transform a given value into a StateData object.
      *
-     * @param flys The FLYSArtifact.
+     * @param flys The D4EArtifact.
      * @param name The name of the data object.
      * @param val The value of the data object.
      *
      * @return a StateData object with <i>name</i> and <i>val</i>ue.
      */
     public StateData transform(
-        FLYSArtifact flys,
+        D4EArtifact flys,
         CallContext  cc,
         StateData    stateData,
         String       name,
@@ -450,7 +450,7 @@
 
 
     public Object computeAdvance(
-        FLYSArtifact artifact,
+        D4EArtifact artifact,
         String       hash,
         CallContext  context,
         List<Facet>  facets,
@@ -461,7 +461,7 @@
 
 
     public Object computeFeed(
-        FLYSArtifact artifact,
+        D4EArtifact artifact,
         String       hash,
         CallContext  context,
         List<Facet>  facets,
@@ -472,7 +472,7 @@
 
 
     public Object computeInit(
-        FLYSArtifact artifact,
+        D4EArtifact artifact,
         String       hash,
         Object       context,
         CallMeta     meta,