diff --git a/instrumentation/cassandra-3.0/.toDelete b/instrumentation/cassandra-3.0/.toDelete
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java b/instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java
index 2d296f474f..5cac643b0a 100644
--- a/instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java
+++ b/instrumentation/cassandra-3.0/src/main/java/io/opentelemetry/auto/instrumentation/datastax/cassandra/TracingSession.java
@@ -260,7 +260,7 @@ public class TracingSession implements Session {
   }
 
   private Span startSpan(final String query) {
-    final Span span = TRACER.spanBuilder("cassandra.query").setSpanKind(CLIENT).startSpan();
+    final Span span = TRACER.spanBuilder(query).setSpanKind(CLIENT).startSpan();
     DECORATE.afterStart(span);
     DECORATE.onConnection(span, session);
     DECORATE.onStatement(span, query);
diff --git a/instrumentation/cassandra-3.0/src/test/groovy/CassandraClientTest.groovy b/instrumentation/cassandra-3.0/src/test/groovy/CassandraClientTest.groovy
index 5e5e68c64e..0d9ded0e9b 100644
--- a/instrumentation/cassandra-3.0/src/test/groovy/CassandraClientTest.groovy
+++ b/instrumentation/cassandra-3.0/src/test/groovy/CassandraClientTest.groovy
@@ -125,7 +125,7 @@ class CassandraClientTest extends AgentTestRunner {
 
   def cassandraSpan(TraceAssert trace, int index, String statement, String keyspace, boolean renameService, Object parentSpan = null, Throwable exception = null) {
     trace.span(index) {
-      operationName "cassandra.query"
+      operationName statement
       spanKind CLIENT
       if (parentSpan == null) {
         parent()