diff --git a/query/search_defaults.js b/query/search_defaults.js
index 3c26f4dc..b0f8b119 100644
--- a/query/search_defaults.js
+++ b/query/search_defaults.js
@@ -20,7 +20,7 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'boundary:rect:type': 'indexed',
   'boundary:rect:_cache': true,
 
-  'ngram:analyzer': 'peliasQueryPartialToken',
+  'ngram:analyzer': 'peliasIndexOneEdgeGram',
   'ngram:field': 'name.default',
   'ngram:boost': 1,
 
diff --git a/test/unit/fixture/search_boundary_country.js b/test/unit/fixture/search_boundary_country.js
index b84dd0e9..71965df4 100644
--- a/test/unit/fixture/search_boundary_country.js
+++ b/test/unit/fixture/search_boundary_country.js
@@ -18,7 +18,7 @@ module.exports = {
                 'name.default': {
                   'query': 'test',
                   'boost': 1,
-                  'analyzer': 'peliasQueryPartialToken'
+                  'analyzer': 'peliasIndexOneEdgeGram'
                 }
               }
             }
diff --git a/test/unit/fixture/search_full_address.js b/test/unit/fixture/search_full_address.js
index 570e5eca..172d439f 100644
--- a/test/unit/fixture/search_full_address.js
+++ b/test/unit/fixture/search_full_address.js
@@ -9,7 +9,7 @@ module.exports = {
             'match': {
               'name.default': {
                 'query': '123 main st',
-                'analyzer': 'peliasQueryPartialToken',
+                'analyzer': 'peliasIndexOneEdgeGram',
                 'boost': 1
               }
             }
diff --git a/test/unit/fixture/search_linguistic_bbox.js b/test/unit/fixture/search_linguistic_bbox.js
index e9368bd5..6afe7be6 100644
--- a/test/unit/fixture/search_linguistic_bbox.js
+++ b/test/unit/fixture/search_linguistic_bbox.js
@@ -9,7 +9,7 @@ module.exports = {
               'name.default': {
                 'query': 'test',
                 'boost': 1,
-                'analyzer': 'peliasQueryPartialToken'
+                'analyzer': 'peliasIndexOneEdgeGram'
               }
             }
           }],
diff --git a/test/unit/fixture/search_linguistic_focus.js b/test/unit/fixture/search_linguistic_focus.js
index c495243a..da3e8fb3 100644
--- a/test/unit/fixture/search_linguistic_focus.js
+++ b/test/unit/fixture/search_linguistic_focus.js
@@ -9,7 +9,7 @@ module.exports = {
               'name.default': {
                 'query': 'test',
                 'boost': 1,
-                'analyzer': 'peliasQueryPartialToken'
+                'analyzer': 'peliasIndexOneEdgeGram'
               }
             }
           }],
diff --git a/test/unit/fixture/search_linguistic_focus_bbox.js b/test/unit/fixture/search_linguistic_focus_bbox.js
index 365b37d8..d5042c0f 100644
--- a/test/unit/fixture/search_linguistic_focus_bbox.js
+++ b/test/unit/fixture/search_linguistic_focus_bbox.js
@@ -9,7 +9,7 @@ module.exports = {
               'name.default': {
                 'query': 'test',
                 'boost': 1,
-                'analyzer': 'peliasQueryPartialToken'
+                'analyzer': 'peliasIndexOneEdgeGram'
               }
             }
           }],
diff --git a/test/unit/fixture/search_linguistic_focus_null_island.js b/test/unit/fixture/search_linguistic_focus_null_island.js
index a9e49a06..b99febea 100644
--- a/test/unit/fixture/search_linguistic_focus_null_island.js
+++ b/test/unit/fixture/search_linguistic_focus_null_island.js
@@ -9,7 +9,7 @@ module.exports = {
               'name.default': {
                 'query': 'test',
                 'boost': 1,
-                'analyzer': 'peliasQueryPartialToken'
+                'analyzer': 'peliasIndexOneEdgeGram'
               }
             }
           }],
diff --git a/test/unit/fixture/search_linguistic_only.js b/test/unit/fixture/search_linguistic_only.js
index bf1056f9..a564a4c1 100644
--- a/test/unit/fixture/search_linguistic_only.js
+++ b/test/unit/fixture/search_linguistic_only.js
@@ -9,7 +9,7 @@ module.exports = {
               'name.default': {
                 'query': 'test',
                 'boost': 1,
-                'analyzer': 'peliasQueryPartialToken'
+                'analyzer': 'peliasIndexOneEdgeGram'
               }
             }
           }],
diff --git a/test/unit/fixture/search_linguistic_viewport.js b/test/unit/fixture/search_linguistic_viewport.js
index bcd39af2..b85d8322 100644
--- a/test/unit/fixture/search_linguistic_viewport.js
+++ b/test/unit/fixture/search_linguistic_viewport.js
@@ -7,7 +7,7 @@ module.exports = {
             {
               'match': {
                 'name.default': {
-                  'analyzer': 'peliasQueryPartialToken',
+                  'analyzer': 'peliasIndexOneEdgeGram',
                   'boost': 1,
                   'query': 'test'
                 }
diff --git a/test/unit/fixture/search_linguistic_viewport_min_diagonal.js b/test/unit/fixture/search_linguistic_viewport_min_diagonal.js
index 2d1d3e2d..e6b50ac6 100644
--- a/test/unit/fixture/search_linguistic_viewport_min_diagonal.js
+++ b/test/unit/fixture/search_linguistic_viewport_min_diagonal.js
@@ -7,7 +7,7 @@ module.exports = {
             {
               'match': {
                 'name.default': {
-                  'analyzer': 'peliasQueryPartialToken',
+                  'analyzer': 'peliasIndexOneEdgeGram',
                   'boost': 1,
                   'query': 'test'
                 }
diff --git a/test/unit/fixture/search_partial_address.js b/test/unit/fixture/search_partial_address.js
index aa45ca68..6810de54 100644
--- a/test/unit/fixture/search_partial_address.js
+++ b/test/unit/fixture/search_partial_address.js
@@ -10,7 +10,7 @@ module.exports = {
             'match': {
               'name.default': {
                 'query': 'soho grand',
-                'analyzer': 'peliasQueryPartialToken',
+                'analyzer': 'peliasIndexOneEdgeGram',
                 'boost': 1
               }
             }
diff --git a/test/unit/fixture/search_regions_address.js b/test/unit/fixture/search_regions_address.js
index 82127051..bf3f3dce 100644
--- a/test/unit/fixture/search_regions_address.js
+++ b/test/unit/fixture/search_regions_address.js
@@ -10,7 +10,7 @@ module.exports = {
             'match': {
               'name.default': {
                 'query': '1 water st',
-                'analyzer': 'peliasQueryPartialToken',
+                'analyzer': 'peliasIndexOneEdgeGram',
                 'boost': 1
               }
             }
diff --git a/test/unit/fixture/search_with_source_filtering.js b/test/unit/fixture/search_with_source_filtering.js
index 4aedeb04..18ee13a3 100644
--- a/test/unit/fixture/search_with_source_filtering.js
+++ b/test/unit/fixture/search_with_source_filtering.js
@@ -9,7 +9,7 @@ module.exports = {
               'name.default': {
                 'query': 'test',
                 'boost': 1,
-                'analyzer': 'peliasQueryPartialToken'
+                'analyzer': 'peliasIndexOneEdgeGram'
               }
             }
           }],