2 files changed, 7 insertions, 12 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index 0c4709e4a2c..e6231f11ae5 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -17,7 +17,7 @@ import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.test.MockMetric;
 import com.yahoo.language.Linguistics;
-import com.yahoo.language.process.Encoder;
+import com.yahoo.language.process.Embedder;
 import com.yahoo.language.simple.SimpleLinguistics;
 
 import java.io.File;
@@ -141,7 +141,7 @@ public class HandlersConfigurerTestWrapper {
             protected void configure() {
                 // Needed by e.g. SearchHandler
                 bind(Linguistics.class).to(SimpleLinguistics.class).in(Scopes.SINGLETON);
-                bind(Encoder.class).to(Encoder.FailingEncoder.class).in(Scopes.SINGLETON);
+                bind(Embedder.class).to(Embedder.FailingEmbedder.class).in(Scopes.SINGLETON);
                 bind(ContainerThreadPool.class).to(SimpleContainerThreadpool.class);
                 bind(Metric.class).to(MockMetric.class);
             }
diff --git a/container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java
index f8550d04d1c..ef371106b7d 100644
--- a/container-core/src/main/java/com/yahoo/language/provider/DefaultEncoderProvider.java
+++ b/container-core/src/main/java/com/yahoo/language/provider/DefaultEmbedderProvider.java
@@ -3,27 +3,22 @@ package com.yahoo.language.provider;
 
 import com.google.inject.Inject;
 import com.yahoo.container.di.componentgraph.Provider;
-import com.yahoo.language.Language;
-import com.yahoo.language.process.Encoder;
-import com.yahoo.tensor.Tensor;
-import com.yahoo.tensor.TensorType;
-
-import java.util.List;
+import com.yahoo.language.process.Embedder;
 
 /**
- * Provides the default encoder implementation if no encoder component has been explicitly configured
+ * Provides the default embedder implementation if no embedder component has been explicitly configured
  * (dependency injection will fallback to providers if no components of the requested type is found).
  *
  * @author bratseth
  */
 @SuppressWarnings("unused") // Injected
-public class DefaultEncoderProvider implements Provider<Encoder> {
+public class DefaultEmbedderProvider implements Provider<Embedder> {
 
     @Inject
-    public DefaultEncoderProvider() { }
+    public DefaultEmbedderProvider() { }
 
     @Override
-    public Encoder get() { return Encoder.throwsOnUse; }
+    public Embedder get() { return Embedder.throwsOnUse; }
 
     @Override
     public void deconstruct() {}