diff --git a/dd-trace/src/main/resources/dd-trace-decorators.yaml b/dd-java-agent/src/main/resources/dd-trace-decorators.yaml
similarity index 100%
rename from dd-trace/src/main/resources/dd-trace-decorators.yaml
rename to dd-java-agent/src/main/resources/dd-trace-decorators.yaml
diff --git a/dd-trace/src/main/resources/dd-trace.yaml b/dd-java-agent/src/main/resources/dd-trace.yaml
similarity index 100%
rename from dd-trace/src/main/resources/dd-trace.yaml
rename to dd-java-agent/src/main/resources/dd-trace.yaml
diff --git a/dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java b/dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java
index dbae60a962..970a64b616 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java
@@ -4,10 +4,9 @@ import com.datadoghq.trace.integration.AbstractDecorator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.Maps;
 import io.opentracing.tag.Tags;
-import lombok.extern.slf4j.Slf4j;
-
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * SpanContext represents Span state that must propagate to descendant Spans and across process
@@ -201,9 +200,9 @@ public class DDSpanContext implements io.opentracing.SpanContext {
           decorator.afterSetTag(this, tag, value);
         } catch (final Throwable ex) {
           log.warn(
-            "Could not decorate the span decorator={}: {}",
-            decorator.getClass().getSimpleName(),
-            ex.getMessage());
+              "Could not decorate the span decorator={}: {}",
+              decorator.getClass().getSimpleName(),
+              ex.getMessage());
         }
       }
     }
diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBStatementAsResourceName.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/DBStatementAsResourceName.java
index eed52628a9..d1998292d4 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBStatementAsResourceName.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/integration/DBStatementAsResourceName.java
@@ -12,7 +12,6 @@ public class DBStatementAsResourceName extends AbstractDecorator {
     this.setSetTag(DDTags.RESOURCE_NAME);
   }
 
-
   @Override
   public boolean afterSetTag(final DDSpanContext context, final String tag, final Object value) {
     //Assign service name
diff --git a/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy b/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy
index 5e39b5d4d8..021e3e6916 100644
--- a/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy
+++ b/dd-trace/src/test/groovy/com/datadoghq/trace/integration/SpanDecoratorTest.groovy
@@ -66,7 +66,7 @@ class SpanDecoratorTest extends Specification {
 
     then:
     span.getOperationName() == type + ".query"
-    span.context().getSpanType() == "db"
+    span.context().getSpanType() == "sql"
 
     where:
     type = "foo"