--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator.java	Sun Apr 28 14:40:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator.java	Sun Apr 28 15:04:44 2013 +0200
@@ -24,7 +24,7 @@
 import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation;
 import org.dive4elements.river.jfree.DoubleBounds;
 import org.dive4elements.river.jfree.EnhancedLineAndShapeRenderer;
-import org.dive4elements.river.jfree.FLYSAnnotation;
+import org.dive4elements.river.jfree.RiverAnnotation;
 import org.dive4elements.river.jfree.StableXYDifferenceRenderer;
 import org.dive4elements.river.jfree.StickyAxisAnnotation;
 import org.dive4elements.river.jfree.Style;
@@ -80,7 +80,7 @@
  * The base class for chart creation. It should provide some basic things that
  * equal in all chart types.
  *
- * Annotations are added as FLYSAnnotations and come in mutliple basic forms:
+ * Annotations are added as RiverAnnotations and come in mutliple basic forms:
  * TextAnnotations are labels somewhere in data space, StickyAnnotations are
  * labels of a slice or line in one data dimension (i.e. visualized as label
  * on a single axis).
@@ -135,7 +135,7 @@
     protected SortedMap<Integer, AxisDataset> datasets;
 
     /** List of annotations to insert in plot. */
-    protected List<FLYSAnnotation> annotations = new ArrayList<FLYSAnnotation>();
+    protected List<RiverAnnotation> annotations = new ArrayList<RiverAnnotation>();
 
     /**
      * A mini interface that allows to walk over the YAXIS enums defined in
@@ -183,7 +183,7 @@
     /**
      * Adds annotations to list. The given annotation will be visible.
      */
-    public void addAnnotations(FLYSAnnotation annotation) {
+    public void addAnnotations(RiverAnnotation annotation) {
         annotations.add(annotation);
     }
 
@@ -449,7 +449,7 @@
             plot.getRangeAxis().getRange());
 
         // Walk over all Annotation sets.
-        for (FLYSAnnotation fa: annotations) {
+        for (RiverAnnotation fa: annotations) {
 
             // Access text styling, if any.
             Document theme = fa.getTheme();
@@ -620,7 +620,7 @@
      * @param visible The visibility of the annotations.
      */
     protected void doAnnotations(
-        FLYSAnnotation annotations,
+        RiverAnnotation annotations,
         ArtifactAndFacet aandf,
         Document theme,
         boolean visible