diff --git a/enterprise/fulltext-helper/LICENSE.txt b/enterprise/fulltext-addon/LICENSE.txt
similarity index 100%
rename from enterprise/fulltext-helper/LICENSE.txt
rename to enterprise/fulltext-addon/LICENSE.txt
diff --git a/enterprise/fulltext-helper/LICENSES.txt b/enterprise/fulltext-addon/LICENSES.txt
similarity index 100%
rename from enterprise/fulltext-helper/LICENSES.txt
rename to enterprise/fulltext-addon/LICENSES.txt
diff --git a/enterprise/fulltext-helper/NOTICE.txt b/enterprise/fulltext-addon/NOTICE.txt
similarity index 100%
rename from enterprise/fulltext-helper/NOTICE.txt
rename to enterprise/fulltext-addon/NOTICE.txt
diff --git a/enterprise/fulltext-helper/pom.xml b/enterprise/fulltext-addon/pom.xml
similarity index 100%
rename from enterprise/fulltext-helper/pom.xml
rename to enterprise/fulltext-addon/pom.xml
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomFieldEncoding.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomFieldEncoding.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomFieldEncoding.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomFieldEncoding.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomIndexReader.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomIndexReader.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomIndexReader.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomIndexReader.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDescriptor.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDescriptor.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDescriptor.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDescriptor.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomDocumentStructure.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDocumentStructure.java
similarity index 93%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomDocumentStructure.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDocumentStructure.java
index f3b613944658e..54987a7eef67c 100644
--- a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomDocumentStructure.java
+++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDocumentStructure.java
@@ -32,15 +32,16 @@
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;
 
+import static org.apache.lucene.document.Field.Store.NO;
 import static org.apache.lucene.document.Field.Store.YES;
 
-class BloomDocumentStructure
+class FulltextHelperDocumentStructure
 {
     static final String ID_KEY = "id";
 
     private static final ThreadLocal<DocWithId> perThreadDocument = ThreadLocal.withInitial( DocWithId::new );
 
-    private BloomDocumentStructure()
+    private FulltextHelperDocumentStructure()
     {
     }
 
@@ -58,11 +59,6 @@ public static Document documentRepresentingProperties( long id, Map<String,Objec
         return document.document;
     }
 
-    public static long getNodeId( Document from )
-    {
-        return Long.parseLong( from.get( ID_KEY ) );
-    }
-
     static Field encodeValueField( String propertyKey, Value value )
     {
         return BloomFieldEncoding.encodeField( propertyKey, value );
@@ -77,7 +73,7 @@ private static class DocWithId
 
         private DocWithId()
         {
-            idField = new StringField( ID_KEY, "", YES );
+            idField = new StringField( ID_KEY, "", NO );
             idValueField = new NumericDocValuesField( ID_KEY, 0L );
             document = new Document();
             document.add( idField );
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperFactory.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperFactory.java
similarity index 97%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperFactory.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperFactory.java
index d2a8f5dc81f42..6b48210a59dda 100644
--- a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperFactory.java
+++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperFactory.java
@@ -38,12 +38,12 @@
 
 public class FulltextHelperFactory
 {
-    private FileSystemAbstraction fileSystem;
+    private final FileSystemAbstraction fileSystem;
     private final String[] properties;
     private final WritableIndexPartitionFactory partitionFactory;
     private final Factory<IndexWriterConfig> population;
     private final File storeDir;
-    private Analyzer analyzer;
+    private final Analyzer analyzer;
 
     public LuceneFulltextHelper createFulltextHelper( String identifier, FULLTEXT_HELPER_TYPE type )
     {
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperProvider.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperProvider.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperProvider.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperProvider.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelplerTransactionEventUpdater.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelplerTransactionEventUpdater.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelplerTransactionEventUpdater.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelplerTransactionEventUpdater.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelper.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelper.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelper.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelper.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedBloomIndexReader.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedBloomIndexReader.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedBloomIndexReader.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedBloomIndexReader.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedInsightBloomWriter.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedInsightBloomWriter.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedInsightBloomWriter.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedInsightBloomWriter.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleBloomIndexReader.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleBloomIndexReader.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleBloomIndexReader.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleBloomIndexReader.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/WritableDatabaseBloomIndex.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/WritableDatabaseBloomIndex.java
similarity index 100%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/WritableDatabaseBloomIndex.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/WritableDatabaseBloomIndex.java
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtension.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtension.java
similarity index 97%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtension.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtension.java
index 1654ff2bd35d4..87f0d6eb2998b 100644
--- a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtension.java
+++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtension.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.api.impl.fulltext.bloom.integration;
+package org.neo4j.kernel.api.impl.fulltext.integrations.bloom;
 
 import java.io.File;
 import java.io.IOException;
@@ -56,9 +56,9 @@ public void init() throws IOException, ProcedureException
         FulltextHelperProvider provider = FulltextHelperProvider.instance( db );
         fulltextHelperFactory = new FulltextHelperFactory( fileSystemAbstraction, storeDir, config );
         LuceneFulltextHelper nodes = fulltextHelperFactory.createFulltextHelper( "bloomNodes", FulltextHelperFactory.FULLTEXT_HELPER_TYPE.NODES );
-        provider.register( nodes );
         LuceneFulltextHelper relationships =
                 fulltextHelperFactory.createFulltextHelper( "bloomRelationships", FulltextHelperFactory.FULLTEXT_HELPER_TYPE.RELATIONSHIPS );
+        provider.register( nodes );
         provider.register( relationships );
 
         procedures.register( new BloomProcedure( "Nodes", nodes ) );
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtensionFactory.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtensionFactory.java
similarity index 96%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtensionFactory.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtensionFactory.java
index ab8f8bac51e1e..2b6a5ff0b486d 100644
--- a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtensionFactory.java
+++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtensionFactory.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.api.impl.fulltext.bloom.integration;
+package org.neo4j.kernel.api.impl.fulltext.integrations.bloom;
 
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.io.fs.FileSystemAbstraction;
diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomProcedure.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedure.java
similarity index 98%
rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomProcedure.java
rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedure.java
index 105d105c76fe5..6168cd495e9e7 100644
--- a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomProcedure.java
+++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedure.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.api.impl.fulltext.bloom.integration;
+package org.neo4j.kernel.api.impl.fulltext.integrations.bloom;
 
 import java.util.Arrays;
 
diff --git a/enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelperUpdaterTest.java b/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelperUpdaterTest.java
similarity index 100%
rename from enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelperUpdaterTest.java
rename to enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelperUpdaterTest.java
diff --git a/enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomIT.java b/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomIT.java
similarity index 98%
rename from enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomIT.java
rename to enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomIT.java
index 14ddeacf045e3..de288c93eb1cd 100644
--- a/enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomIT.java
+++ b/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomIT.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel.api.impl.fulltext.bloom.integration;
+package org.neo4j.kernel.api.impl.fulltext.integrations.bloom;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/enterprise/pom.xml b/enterprise/pom.xml
index 7c697bed7e830..a133b3a8d4727 100644
--- a/enterprise/pom.xml
+++ b/enterprise/pom.xml
@@ -46,7 +46,7 @@
     <module>deferred-locks</module>
     <module>ha</module>
     <module>procedure-compiler-enterprise-tests</module>
-    <module>fulltext-helper</module>
+    <module>fulltext-addon</module>
   </modules>
 
   <profiles>