--- a/artifacts/src/main/java/org/dive4elements/river/collections/AttributeWriter.java	Fri Sep 05 12:54:58 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/collections/AttributeWriter.java	Fri Sep 05 12:58:17 2014 +0200
@@ -57,7 +57,7 @@
     protected CollectionAttribute attribute;
 
 
-    private static Logger logger = Logger.getLogger(AttributeWriter.class);
+    private static Logger log = Logger.getLogger(AttributeWriter.class);
 
 
     /**
@@ -102,7 +102,7 @@
      */
     protected CollectionAttribute write() {
 
-        boolean debug = logger.isDebugEnabled();
+        boolean debug = log.isDebugEnabled();
 
         for (Map.Entry<String, Output> entry: newAttr.entrySet()) {
             String outName = entry.getKey();
@@ -115,9 +115,9 @@
             attribute.clearFacets(outName);
 
             if (debug) {
-                logger.debug("Merge Output: " + outName);
-                logger.debug("   old Facets: " + oldFacets.size());
-                logger.debug("   new Facets: " + newFacets.size());
+                log.debug("Merge Output: " + outName);
+                log.debug("   old Facets: " + oldFacets.size());
+                log.debug("   new Facets: " + newFacets.size());
             }
 
             writeOutput(a.getName(), newFacets, oldFacets);
@@ -142,10 +142,10 @@
     ) {
         List<String> compatFacets = this.compatibilities.get(outputName);
 
-        if (logger.isDebugEnabled() && compatFacets != null) {
-            logger.debug("Compabitle Facets:");
+        if (log.isDebugEnabled() && compatFacets != null) {
+            log.debug("Compabitle Facets:");
             for (String compatible: compatFacets) {
-                logger.debug(   "- " + compatible);
+                log.debug(   "- " + compatible);
             }
         }
 
@@ -153,7 +153,7 @@
             writeFacets(outputName, newOutFacets, oldOutFacets, compatFacets);
         }
         catch (ArtifactDatabaseException ade) {
-            logger.error(ade, ade);
+            log.error(ade, ade);
         }
     }
 
@@ -172,7 +172,7 @@
     throws ArtifactDatabaseException
     {
         if (compatibleFacets == null) {
-            logger.warn("No compatible facets, not generating out " + outputName + ".");
+            log.warn("No compatible facets, not generating out " + outputName + ".");
             return false;
         }
 
@@ -183,33 +183,33 @@
         List<ManagedFacet> currentFacets      = new ArrayList<ManagedFacet>();
         List<ManagedFacet> genuinelyNewFacets = new ArrayList<ManagedFacet>();
 
-        boolean debug = logger.isDebugEnabled();
+        boolean debug = log.isDebugEnabled();
         if (debug) {
-           logger.debug("Compatible facets are " + compatibleFacets);
+           log.debug("Compatible facets are " + compatibleFacets);
         }
 
         for (Facet fac: newFacets) {
             ManagedFacet facet = (ManagedFacet) fac;
 
             if (debug) {
-                logger.debug("Try to add Facet: " + facet.getName());
+                log.debug("Try to add Facet: " + facet.getName());
             }
 
             String bondage = facet.getBoundToOut();
             if (bondage != null && bondage.equals(outputName)) {
-                logger.debug("Adding bound facet regardless of compatibility: " +
+                log.debug("Adding bound facet regardless of compatibility: " +
                     facet.getName());
             } else if (!compatibleFacets.contains(facet.getName())) {
-                logger.debug("Have incompatible facet, skip: " + facet.getName());
+                log.debug("Have incompatible facet, skip: " + facet.getName());
                 continue;
             } else if (facet.getBoundToOut() != null &&
                     !facet.getBoundToOut().equals(outputName)) {
-                logger.debug("Skip facet " + facet.getName() +
+                log.debug("Skip facet " + facet.getName() +
                         " because it is bound to: " + facet.getBoundToOut());
                 continue;
             } else {
-                logger.debug("Facet is bound to: " + facet.getBoundToOut());
-                logger.debug("Have compatible facet: " + facet.getName());
+                log.debug("Facet is bound to: " + facet.getBoundToOut());
+                log.debug("Have compatible facet: " + facet.getName());
             }
 
             ManagedFacet picked = pickFacet(facet, oldFacets);
@@ -219,7 +219,7 @@
                     genuinelyNewFacets.add(picked);
                 }
                 else {
-                    logger.debug("Skip clone facet that shall be present in two outs");
+                    log.debug("Skip clone facet that shall be present in two outs");
                 }
             }
             else {
@@ -251,7 +251,7 @@
                     if (newMF.getPosition() == oldMF.getPosition()) {
                         conflicts = true;
                         if (debug) {
-                            logger.debug(
+                            log.debug(
                                 "Positional conflict while merging " +
                                 "facets, pushing newest facet 1 up (" +
                                 newMF.getPosition() + ")");
@@ -327,7 +327,7 @@
     protected ManagedFacet pickFacet(ManagedFacet facet, List<Facet> oldFacets)
     {
         if (oldFacets == null) {
-            logger.debug("No old facets to compare a new to found.");
+            log.debug("No old facets to compare a new to found.");
             return facet;
         }