--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java	Sun Apr 28 15:14:30 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java	Sun Apr 28 15:23:01 2013 +0200
@@ -10,7 +10,7 @@
 
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.FLYSArtifact;
+import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.access.FixAnalysisAccess;
 import org.dive4elements.river.artifacts.model.DateRange;
 import org.dive4elements.river.artifacts.model.FacetTypes;
@@ -79,7 +79,7 @@
     }
 
 
-    private FLYSArtifact artifact = null;
+    private D4EArtifact artifact = null;
 
 
     @Override
@@ -162,11 +162,11 @@
         logger.debug("FixDeltaWtGenerator.doOut: " + name);
         logger.debug("Theme description is: " + artifactFacet.getFacetDescription());
 
-        this.artifact = (FLYSArtifact)artifactFacet.getArtifact();
+        this.artifact = (D4EArtifact)artifactFacet.getArtifact();
 
         if (name.contains(FIX_SECTOR_AVERAGE_DWT)) {
             doSectorAverageOut(
-                    (FLYSArtifact) artifactFacet.getArtifact(),
+                    (D4EArtifact) artifactFacet.getArtifact(),
                     artifactFacet.getData(context),
                     artifactFacet.getFacetDescription(),
                     theme,
@@ -174,7 +174,7 @@
         }
         else if (name.equals(FIX_REFERENCE_EVENTS_DWT)) {
             doReferenceEventsOut(
-                    (FLYSArtifact) artifactFacet.getArtifact(),
+                    (D4EArtifact) artifactFacet.getArtifact(),
                     artifactFacet.getData(context),
                     artifactFacet.getFacetDescription(),
                     theme,
@@ -182,7 +182,7 @@
         }
         else if (name.equals(FIX_ANALYSIS_EVENTS_DWT)) {
             doAnalysisEventsOut(
-                    (FLYSArtifact) artifactFacet.getArtifact(),
+                    (D4EArtifact) artifactFacet.getArtifact(),
                     artifactFacet.getData(context),
                     artifactFacet.getFacetDescription(),
                     theme,
@@ -190,7 +190,7 @@
         }
         else if (name.equals(FIX_DEVIATION_DWT)) {
             doDeviationOut(
-                    (FLYSArtifact) artifactFacet.getArtifact(),
+                    (D4EArtifact) artifactFacet.getArtifact(),
                     artifactFacet.getData(context),
                     artifactFacet.getFacetDescription(),
                     theme,
@@ -198,7 +198,7 @@
         }
         else if (name.equals(FIX_ANALYSIS_PERIODS_DWT)) {
             doAnalysisPeriodsOut(
-                    (FLYSArtifact) artifactFacet.getArtifact(),
+                    (D4EArtifact) artifactFacet.getArtifact(),
                     artifactFacet.getData(context),
                     artifactFacet.getFacetDescription(),
                     theme,
@@ -206,7 +206,7 @@
         }
         else if (name.equals(FIX_REFERENCE_PERIOD_DWT)) {
             doReferencePeriodsOut(
-                    (FLYSArtifact) artifactFacet.getArtifact(),
+                    (D4EArtifact) artifactFacet.getArtifact(),
                     artifactFacet.getData(context),
                     artifactFacet.getFacetDescription(),
                     theme,
@@ -225,7 +225,7 @@
 
 
     protected void doReferencePeriodsOut(
-            FLYSArtifact artifact,
+            D4EArtifact artifact,
             Object       data,
             String       desc,
             Document     theme,
@@ -249,7 +249,7 @@
 
 
     protected void doSectorAverageOut(
-            FLYSArtifact artifact,
+            D4EArtifact artifact,
             Object       data,
             String       desc,
             Document     theme,
@@ -294,7 +294,7 @@
 
 
     protected void doAnalysisEventsOut(
-            FLYSArtifact artifact,
+            D4EArtifact artifact,
             Object       data,
             String       desc,
             Document     theme,
@@ -389,7 +389,7 @@
 
 
     protected void doReferenceEventsOut(
-            FLYSArtifact artifact,
+            D4EArtifact artifact,
             Object       data,
             String       desc,
             Document     theme,
@@ -403,7 +403,7 @@
 
 
     protected void doDeviationOut(
-            FLYSArtifact artifact,
+            D4EArtifact artifact,
             Object       data,
             String       desc,
             Document     theme,
@@ -425,7 +425,7 @@
 
 
     protected void doAnalysisPeriodsOut(
-            FLYSArtifact artifact,
+            D4EArtifact artifact,
             Object       data,
             String       desc,
             Document     theme,