--- a/artifacts/src/main/java/org/dive4elements/river/exports/OutputHelper.java	Sun Apr 28 15:14:30 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/OutputHelper.java	Sun Apr 28 15:23:01 2013 +0200
@@ -34,7 +34,7 @@
 import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
 import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
 import org.dive4elements.artifacts.common.utils.XMLUtils;
-import org.dive4elements.river.artifacts.FLYSArtifact;
+import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.context.RiverContext;
 import org.dive4elements.river.artifacts.model.ManagedDomFacet;
 import org.dive4elements.river.artifacts.model.ManagedFacet;
@@ -70,7 +70,7 @@
         boolean debug = log.isDebugEnabled();
 
         if (debug) {
-            log.debug("FLYSArtifactCollection.doOut: " + outName);
+            log.debug("D4EArtifactCollection.doOut: " + outName);
         }
 
         ThemeList themeList = new ThemeList(attributes);
@@ -158,7 +158,7 @@
 
         if (debug) {
             log.debug(
-                "FLYSArtifactCollection.getFacetThemeFromAttribute(facet="
+                "D4EArtifactCollection.getFacetThemeFromAttribute(facet="
                 + facet + ", index=" + index + ")");
         }
 
@@ -239,7 +239,7 @@
         Theme       t,
         CallContext context)
     {
-        log.debug("FLYSArtifactCollection.addThemeToAttribute: " + uuid);
+        log.debug("D4EArtifactCollection.addThemeToAttribute: " + uuid);
 
         if (t == null) {
             log.warn("Theme is empty - cancel adding it to attribute!");
@@ -338,7 +338,7 @@
                 }
                 String uuid        = theme.getArtifact();
                 Artifact artifact  = getArtifact(uuid, context);
-                FLYSArtifact flys  = (FLYSArtifact) artifact;
+                D4EArtifact flys  = (D4EArtifact) artifact;
 
                 ArtifactAndFacet artifactAndFacet = new ArtifactAndFacet(
                     artifact,
@@ -371,7 +371,7 @@
     protected Artifact getArtifact(String uuid, CallContext context)
     throws    ArtifactDatabaseException
     {
-        log.debug("FLYSArtifactCollection.getArtifact");
+        log.debug("D4EArtifactCollection.getArtifact");
 
         Backend backend               = Backend.getInstance();
         PersistentArtifact persistent = backend.getArtifact(uuid);
@@ -400,7 +400,7 @@
         boolean debug = log.isDebugEnabled();
 
         if (debug) {
-            log.debug("FLYSArtifactCollection.initItemAttribute");
+            log.debug("D4EArtifactCollection.initItemAttribute");
         }
 
         Theme t = getThemeForFacet(uuid, facet, pattern, index, outName, context);
@@ -438,7 +438,7 @@
         String outName,
         CallContext context)
     {
-        log.info("FLYSArtifactCollection.getThemeForFacet: " + facet);
+        log.info("D4EArtifactCollection.getThemeForFacet: " + facet);
 
         RiverContext flysContext = context instanceof RiverContext
             ? (RiverContext) context
@@ -447,7 +447,7 @@
         // Push artifact in flysContext.
         ArtifactDatabase db = context.getDatabase();
         try {
-            FLYSArtifact artifact = (FLYSArtifact) db.getRawArtifact(uuid);
+            D4EArtifact artifact = (D4EArtifact) db.getRawArtifact(uuid);
             log.debug("Got raw artifact");
             flysContext.put(RiverContext.ARTIFACT_KEY, artifact);
         }