diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/FeedDictionary.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/FeedDictionary.java
similarity index 98%
rename from tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/FeedDictionary.java
rename to tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/FeedDictionary.java
index 3d93d2e..26293ef 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/FeedDictionary.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/FeedDictionary.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.opennlp.tf.guillaumegenthial;
+package org.apache.opennlp.namefinder;
 
 import org.tensorflow.Tensor;
 
diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/IndexTagger.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/IndexTagger.java
similarity index 96%
rename from tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/IndexTagger.java
rename to tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/IndexTagger.java
index db6344f..2bed2f4 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/IndexTagger.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/IndexTagger.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.opennlp.tf.guillaumegenthial;
+package org.apache.opennlp.namefinder;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/PredictionConfiguration.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/PredictionConfiguration.java
similarity index 96%
rename from tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/PredictionConfiguration.java
rename to tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/PredictionConfiguration.java
index 7f04d11..883f710 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/PredictionConfiguration.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/PredictionConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.opennlp.tf.guillaumegenthial;
+package org.apache.opennlp.namefinder;
 
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/SequenceTagging.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/SequenceTagging.java
similarity index 98%
rename from tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/SequenceTagging.java
rename to tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/SequenceTagging.java
index 7519e84..3713555 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/SequenceTagging.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/SequenceTagging.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.opennlp.tf.guillaumegenthial;
+package org.apache.opennlp.namefinder;
 
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/TokenIds.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/TokenIds.java
similarity index 95%
rename from tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/TokenIds.java
rename to tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/TokenIds.java
index bbf181f..621ab3e 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/TokenIds.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/TokenIds.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.opennlp.tf.guillaumegenthial;
+package org.apache.opennlp.namefinder;
 
 public final class TokenIds {
 
diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/Viterbi.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/Viterbi.java
similarity index 98%
rename from tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/Viterbi.java
rename to tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/Viterbi.java
index 50c0d3d..35b49d8 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/Viterbi.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/Viterbi.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.opennlp.tf.guillaumegenthial;
+package org.apache.opennlp.namefinder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/WordIndexer.java b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/WordIndexer.java
similarity index 98%
rename from tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/WordIndexer.java
rename to tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/WordIndexer.java
index 6a21d05..3954092 100644
--- a/tf-ner-poc/src/main/java/org/apache/opennlp/tf/guillaumegenthial/WordIndexer.java
+++ b/tf-ner-poc/src/main/java/org/apache/opennlp/namefinder/WordIndexer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.opennlp.tf.guillaumegenthial;
+package org.apache.opennlp.namefinder;
 
 import opennlp.tools.util.StringUtil;
 
diff --git a/tf-ner-poc/src/test/java/com/apache/opennlp/tf/guillaumegenthial/FeedDictionaryTest.java b/tf-ner-poc/src/test/java/org/apache/opennlp/namefinder/FeedDictionaryTest.java
similarity index 88%
rename from tf-ner-poc/src/test/java/com/apache/opennlp/tf/guillaumegenthial/FeedDictionaryTest.java
rename to tf-ner-poc/src/test/java/org/apache/opennlp/namefinder/FeedDictionaryTest.java
index a2c26a8..a41bdb5 100644
--- a/tf-ner-poc/src/test/java/com/apache/opennlp/tf/guillaumegenthial/FeedDictionaryTest.java
+++ b/tf-ner-poc/src/test/java/org/apache/opennlp/namefinder/FeedDictionaryTest.java
@@ -1,7 +1,5 @@
-package com.apache.opennlp.tf.guillaumegenthial;
+package org.apache.opennlp.namefinder;
 
-import org.apache.opennlp.tf.guillaumegenthial.TokenIds;
-import org.apache.opennlp.tf.guillaumegenthial.WordIndexer;
 import org.junit.Assume;
 import org.junit.BeforeClass;
 
diff --git a/tf-ner-poc/src/test/java/com/apache/opennlp/tf/PredictTest.java b/tf-ner-poc/src/test/java/org/apache/opennlp/namefinder/PredictTest.java
similarity index 80%
rename from tf-ner-poc/src/test/java/com/apache/opennlp/tf/PredictTest.java
rename to tf-ner-poc/src/test/java/org/apache/opennlp/namefinder/PredictTest.java
index 8de57c9..c5da6ba 100644
--- a/tf-ner-poc/src/test/java/com/apache/opennlp/tf/PredictTest.java
+++ b/tf-ner-poc/src/test/java/org/apache/opennlp/namefinder/PredictTest.java
@@ -1,10 +1,9 @@
-package com.apache.opennlp.tf;
-
-import org.apache.opennlp.tf.guillaumegenthial.PredictionConfiguration;
-import org.apache.opennlp.tf.guillaumegenthial.SequenceTagging;
+package org.apache.opennlp.namefinder;
 
 import java.io.IOException;
 
+import opennlp.tools.util.Span;
+
 public class PredictTest {
 
   public static void main(String[] args) throws IOException {
@@ -22,7 +21,7 @@
     SequenceTagging tagger = new SequenceTagging(config);
 
     String[] tokens = "Stormy Cars ' friend says she also plans to sue Michael Cohen .".split("\\s+");
-    String[] pred = tagger.predict(tokens);
+    Span[] pred = tagger.find(tokens);
 
     for (int i=0; i<tokens.length; i++) {
       System.out.print(tokens[i] + "/" + pred[i] + " ");
diff --git a/tf-ner-poc/src/test/java/com/apache/opennlp/tf/guillaumegenthial/WordIndexerTest.java b/tf-ner-poc/src/test/java/org/apache/opennlp/namefinder/WordIndexerTest.java
similarity index 96%
rename from tf-ner-poc/src/test/java/com/apache/opennlp/tf/guillaumegenthial/WordIndexerTest.java
rename to tf-ner-poc/src/test/java/org/apache/opennlp/namefinder/WordIndexerTest.java
index b5812fd..0169f20 100644
--- a/tf-ner-poc/src/test/java/com/apache/opennlp/tf/guillaumegenthial/WordIndexerTest.java
+++ b/tf-ner-poc/src/test/java/org/apache/opennlp/namefinder/WordIndexerTest.java
@@ -1,11 +1,4 @@
-package com.apache.opennlp.tf.guillaumegenthial;
-
-import org.apache.opennlp.tf.guillaumegenthial.TokenIds;
-import org.apache.opennlp.tf.guillaumegenthial.WordIndexer;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
+package org.apache.opennlp.namefinder;
 
 import java.io.InputStream;
 import java.util.Arrays;
@@ -13,6 +6,11 @@
 import java.util.stream.Collectors;
 import java.util.zip.GZIPInputStream;
 
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 public class WordIndexerTest {
 
   private static WordIndexer indexer;