--- a/artifacts/src/main/java/org/dive4elements/river/collections/FLYSArtifactCollection.java	Sun Apr 28 15:09:31 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/collections/FLYSArtifactCollection.java	Sun Apr 28 15:14:30 2013 +0200
@@ -38,7 +38,7 @@
 import org.dive4elements.artifacts.CallMeta;
 import org.dive4elements.artifacts.common.utils.XMLUtils;
 import org.dive4elements.river.artifacts.FLYSArtifact;
-import org.dive4elements.river.artifacts.context.FLYSContext;
+import org.dive4elements.river.artifacts.context.RiverContext;
 import org.dive4elements.river.exports.OutGenerator;
 import org.dive4elements.river.exports.OutputHelper;
 import org.dive4elements.river.utils.RiverUtils;
@@ -306,7 +306,7 @@
         CollectionAttribute attr,
         String              out
     ) {
-        OutGenerator outGen = FLYSContext.getOutGenerator(cc, out, null);
+        OutGenerator outGen = RiverContext.getOutGenerator(cc, out, null);
 
         if (outGen == null) {
             return null;
@@ -367,10 +367,10 @@
              && type.length() > 0
              && type.indexOf("chartinfo") > 0)
         {
-            generator = FLYSContext.getOutGenerator(context, type, subtype);
+            generator = RiverContext.getOutGenerator(context, type, subtype);
         }
         else {
-            generator = FLYSContext.getOutGenerator(context, name, subtype);
+            generator = RiverContext.getOutGenerator(context, name, subtype);
         }
 
         if (generator == null) {
@@ -476,9 +476,9 @@
         AttributeParser  aParser,
         String[]         uuids)
     {
-        FLYSContext flysContext = RiverUtils.getFlysContext(context);
+        RiverContext flysContext = RiverUtils.getFlysContext(context);
         StateEngine engine = (StateEngine) flysContext.get(
-            FLYSContext.STATE_ENGINE_KEY);
+            RiverContext.STATE_ENGINE_KEY);
 
         if (engine == null) {
             log.error("buildOutAttributes: engine == null");