3 files changed, 7 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 2b2fec2b8d9..98207f1d22b 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -140,7 +140,7 @@ public final class ContainerCluster
     public static final String BINDINGS_OVERVIEW_HANDLER_CLASS = BindingsOverviewHandler.class.getName();
     public static final String STATE_HANDLER_CLASS = "com.yahoo.container.jdisc.state.StateHandler";
     public static final String STATISTICS_HANDLER_CLASS = "com.yahoo.container.config.StatisticsRequestHandler";
-    public static final String SIMPLE_LINGUISTICS_PROVIDER = "com.yahoo.language.provider.SimpleLinguisticsProvider";
+    public static final String SIMPLE_LINGUISTICS_PROVIDER = "com.yahoo.language.provider.DefaultLinguisticsProvider";
     public static final String CMS = "-XX:+UseConcMarkSweepGC -XX:MaxTenuringThreshold=15 -XX:NewRatio=1";
     public static final String G1GC = "-XX:+UseG1GC -XX:MaxTenuringThreshold=15";
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index e0194ca4cdf..27c05e08886 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -228,7 +228,7 @@ public class ContainerClusterTest {
         MockRoot root = createRoot(false);
         ContainerCluster cluster = createClusterControllerCluster(root);
         addClusterController(root.deployLogger(), cluster, "host-c1");
-        assertFalse(contains("com.yahoo.language.provider.SimpleLinguisticsProvider", cluster.getAllComponents()));
+        assertFalse(contains("com.yahoo.language.provider.DefaultLinguisticsProvider", cluster.getAllComponents()));
     }
 
     @Test
@@ -236,7 +236,7 @@ public class ContainerClusterTest {
         MockRoot root = createRoot(false);
         ContainerCluster cluster = createContainerCluster(root, false);
         addClusterController(root.deployLogger(), cluster, "host-c1");
-        assertTrue(contains("com.yahoo.language.provider.SimpleLinguisticsProvider", cluster.getAllComponents()));
+        assertTrue(contains("com.yahoo.language.provider.DefaultLinguisticsProvider", cluster.getAllComponents()));
     }
 
     private static boolean contains(String componentId, Collection<Component<?, ?>> componentList) {
diff --git a/container-core/src/main/java/com/yahoo/language/provider/SimpleLinguisticsProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java
index 5d4b7087e0e..20d58a36aff 100644
--- a/container-core/src/main/java/com/yahoo/language/provider/SimpleLinguisticsProvider.java
+++ b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java
@@ -2,25 +2,24 @@
 package com.yahoo.language.provider;
 
 import com.google.inject.Inject;
+import com.yahoo.language.opennlp.OpenNlpLinguistics;
 import com.yahoo.language.simple.SimpleLinguistics;
 import com.yahoo.container.di.componentgraph.Provider;
 import com.yahoo.language.Linguistics;
 
 /**
- * Provides simple linguistics if no linguistics component has been explicitly configured
+ * Provides the default linguistics implementation if no linguistics component has been explicitly configured
  * (dependency injection will fallback to providers if no components of the requested type is found).
  *
  * @author bratseth
  */
-public class SimpleLinguisticsProvider implements Provider<Linguistics> {
+public class DefaultLinguisticsProvider implements Provider<Linguistics> {
 
     private final Linguistics linguistics;
 
     @SuppressWarnings("deprecation")
     @Inject
-    public SimpleLinguisticsProvider() {
-        linguistics = new SimpleLinguistics();
-    }
+    public DefaultLinguisticsProvider() { linguistics = new OpenNlpLinguistics(); }
 
     @Override
     public Linguistics get() { return linguistics; }