diff --git a/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java b/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java
index 4f29abc82b5..bdd95e19a16 100644
--- a/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java
+++ b/src/main/java/org/elasticsearch/search/suggest/SuggestUtils.java
@@ -220,7 +220,7 @@ public final class SuggestUtils {
                 suggestion.maxInspections(parser.intValue());
             } else if ("max_term_freq".equals(fieldName) || "maxTermFreq".equals(fieldName)) {
                 suggestion.maxTermFreq(parser.floatValue());
-            } else if ("prefix_length".equals(fieldName) || "prefixLength".equals(fieldName)) {
+            } else if ("prefix_len".equals(fieldName) || "prefixLen".equals(fieldName)) {
                 suggestion.prefixLength(parser.intValue());
             } else if ("min_word_len".equals(fieldName) || "minWordLen".equals(fieldName)) {
                 suggestion.minQueryLength(parser.intValue());
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
index 2e97bfc9c64..843d37f172e 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
@@ -556,7 +556,7 @@ public final class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSugge
                 builder.field("max_term_freq", maxTermFreq);
             }
             if (prefixLength != null) {
-                builder.field("prefix_length", prefixLength);
+                builder.field("prefix_len", prefixLength);
             }
             if (minWordLength != null) {
                 builder.field("min_word_len", minWordLength);
diff --git a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java b/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java
index 9de0b68d4db..5bc27ca6ab8 100644
--- a/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java
+++ b/src/main/java/org/elasticsearch/search/suggest/term/TermSuggestionBuilder.java
@@ -211,7 +211,7 @@ public class TermSuggestionBuilder extends SuggestionBuilder<TermSuggestionBuild
             builder.field("max_term_freq", maxTermFreq);
         }
         if (prefixLength != null) {
-            builder.field("prefix_length", prefixLength);
+            builder.field("prefix_len", prefixLength);
         }
         if (minWordLength != null) {
             builder.field("min_word_len", minWordLength);
diff --git a/src/test/java/org/elasticsearch/test/integration/search/suggest/SuggestSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/suggest/SuggestSearchTests.java
index b65d4bb569c..da33d6f8a1b 100644
--- a/src/test/java/org/elasticsearch/test/integration/search/suggest/SuggestSearchTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/search/suggest/SuggestSearchTests.java
@@ -280,7 +280,7 @@ public class SuggestSearchTests extends AbstractNodesTests {
         client.admin().indices().prepareRefresh().execute().actionGet();
 
         Suggest suggest = searchSuggest(client, termSuggestion("size1")
-                        .size(1).text("prefix_abcd").maxTermFreq(10).minDocFreq(0)
+                        .size(1).text("prefix_abcd").maxTermFreq(10).prefixLength(1).minDocFreq(0)
                         .field("field1").suggestMode("always"),
                 termSuggestion("field2")
                         .field("field2").text("prefix_eeeh prefix_efgh")
@@ -428,6 +428,68 @@ public class SuggestSearchTests extends AbstractNodesTests {
         assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().get(0).getOptions().size(), equalTo(0));
     }
     
+    @Test
+    public void testPrefixLength() throws ElasticSearchException, IOException {
+        Builder builder = ImmutableSettings.builder();
+        builder.put("index.number_of_shards", 1).put("index.number_of_replicas", 0);
+        builder.put("index.analysis.analyzer.reverse.tokenizer", "standard");
+        builder.putArray("index.analysis.analyzer.reverse.filter", "lowercase", "reverse");
+        builder.put("index.analysis.analyzer.body.tokenizer", "standard");
+        builder.putArray("index.analysis.analyzer.body.filter", "lowercase");
+        builder.put("index.analysis.analyzer.bigram.tokenizer", "standard");
+        builder.putArray("index.analysis.analyzer.bigram.filter", "my_shingle", "lowercase");
+        builder.put("index.analysis.filter.my_shingle.type", "shingle");
+        builder.put("index.analysis.filter.my_shingle.output_unigrams", false);
+        builder.put("index.analysis.filter.my_shingle.min_shingle_size", 2);
+        builder.put("index.analysis.filter.my_shingle.max_shingle_size", 2);
+        
+        XContentBuilder mapping = XContentFactory.jsonBuilder().startObject().startObject("type1")
+        .startObject("_all").field("store", "yes").field("termVector", "with_positions_offsets").endObject()
+        .startObject("properties")
+        .startObject("body").field("type", "string").field("analyzer", "body").endObject()
+        .startObject("body_reverse").field("type", "string").field("analyzer", "reverse").endObject()
+        .startObject("bigram").field("type", "string").field("analyzer", "bigram").endObject()
+        .endObject()
+        .endObject().endObject();
+        client.admin().indices().prepareDelete().execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(builder.build()).addMapping("type1", mapping).execute().actionGet();
+        client.admin().cluster().prepareHealth("test").setWaitForGreenStatus().execute().actionGet();
+        client.prepareIndex("test", "type1")
+                .setSource(XContentFactory.jsonBuilder().startObject().field("body", "hello world").endObject()).execute().actionGet();
+        client.prepareIndex("test", "type1")
+        .setSource(XContentFactory.jsonBuilder().startObject().field("body", "hello world").endObject()).execute().actionGet();
+        client.prepareIndex("test", "type1")
+        .setSource(XContentFactory.jsonBuilder().startObject().field("body", "hello words").endObject()).execute().actionGet();
+        client.admin().indices().prepareRefresh().execute().actionGet();
+        Suggest searchSuggest = searchSuggest(
+                client,
+                "hello word",
+                phraseSuggestion("simple_phrase").field("body")
+                        .addCandidateGenerator(PhraseSuggestionBuilder.candidateGenerator("body").prefixLength(4).minWordLength(1).suggestMode("always"))
+                        .size(1).confidence(1.0f));
+        assertThat(searchSuggest, notNullValue());
+        assertThat(searchSuggest.size(), equalTo(1));
+        assertThat(searchSuggest.getSuggestion("simple_phrase").getName(), equalTo("simple_phrase"));
+        assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().size(), equalTo(1));
+        assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().get(0).getText().string(), equalTo("hello word"));
+        assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().get(0).getOptions().get(0).getText().string(), equalTo("hello words"));
+        
+        
+        searchSuggest = searchSuggest(
+                client,
+                "hello word",
+                phraseSuggestion("simple_phrase").field("body")
+                        .addCandidateGenerator(PhraseSuggestionBuilder.candidateGenerator("body").prefixLength(2).minWordLength(1).suggestMode("always"))
+                        .size(1).confidence(1.0f));
+        assertThat(searchSuggest, notNullValue());
+        assertThat(searchSuggest.size(), equalTo(1));
+        assertThat(searchSuggest.getSuggestion("simple_phrase").getName(), equalTo("simple_phrase"));
+        assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().size(), equalTo(1));
+        assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().get(0).getText().string(), equalTo("hello word"));
+        assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().get(0).getOptions().get(0).getText().string(), equalTo("hello world"));
+        
+    }
+    
     
     @Test
     public void testMarvelHerosPhraseSuggest() throws ElasticSearchException, IOException {