diff --git a/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java b/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java
index c5e2518dd57..27b4f9247d8 100644
--- a/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/SpanMultiTermQueryParser.java
@@ -34,7 +34,7 @@ import org.elasticsearch.common.xcontent.XContentParser.Token;
  */
 public class SpanMultiTermQueryParser implements QueryParser {
 
-	public static final String NAME = "span_multi_term";
+	public static final String NAME = "span_multi";
 	public static final String MATCH_NAME = "match";
 
 	@Inject
diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-range.json b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-range.json
index f074190a3f6..4679170c858 100644
--- a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-range.json
+++ b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-range.json
@@ -1,5 +1,5 @@
 {
-	"span_multi_term":{
+	"span_multi":{
 		"match":{
 			"fuzzy":{
         		"age":{
@@ -10,4 +10,4 @@
     		}
     	}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-term.json b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-term.json
index 9511f2212c9..edb58e35ec1 100644
--- a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-term.json
+++ b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-fuzzy-term.json
@@ -1,5 +1,5 @@
 {
-	"span_multi_term":{
+	"span_multi":{
 		"match":{
 			"fuzzy" : {
 				"user" : {
@@ -9,4 +9,4 @@
 	    	}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-prefix.json b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-prefix.json
index dd802cc4687..62918d6ad71 100644
--- a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-prefix.json
+++ b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-prefix.json
@@ -1,7 +1,7 @@
 {
-	"span_multi_term":{
+	"span_multi":{
 		"match":{
 			"prefix" : { "user" :  { "value" : "ki", "boost" : 1.08 } }
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-numeric.json b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-numeric.json
index b3350736654..d9db8a445cc 100644
--- a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-numeric.json
+++ b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-numeric.json
@@ -1,5 +1,5 @@
 {
-	"span_multi_term":{
+	"span_multi":{
 		"match":{
 			"range" : {
      		   "age" : { 
diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-term.json b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-term.json
index b3350736654..d9db8a445cc 100644
--- a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-term.json
+++ b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-range-term.json
@@ -1,5 +1,5 @@
 {
-	"span_multi_term":{
+	"span_multi":{
 		"match":{
 			"range" : {
      		   "age" : { 
diff --git a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-wildcard.json b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-wildcard.json
index a251a0f30b2..a2eaeb72095 100644
--- a/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-wildcard.json
+++ b/src/test/java/org/elasticsearch/test/unit/index/query/span-multi-term-wildcard.json
@@ -1,7 +1,7 @@
 {
-	"span_multi_term":{
+	"span_multi":{
 		"match":{
 			"wildcard" : { "user" : {"value": "ki*y" , "boost" : 1.08}}
 		}
 	}
-}
\ No newline at end of file
+}