diff --git a/community/upgade/LICENSES.txt b/community/lucene-index-upgrade/LICENSES.txt
similarity index 100%
rename from community/upgade/LICENSES.txt
rename to community/lucene-index-upgrade/LICENSES.txt
diff --git a/community/upgade/NOTICE.txt b/community/lucene-index-upgrade/NOTICE.txt
similarity index 100%
rename from community/upgade/NOTICE.txt
rename to community/lucene-index-upgrade/NOTICE.txt
diff --git a/community/upgade/pom.xml b/community/lucene-index-upgrade/pom.xml
similarity index 100%
rename from community/upgade/pom.xml
rename to community/lucene-index-upgrade/pom.xml
diff --git a/community/upgade/src/main/assembly/assembly.xml b/community/lucene-index-upgrade/src/main/assembly/assembly.xml
similarity index 100%
rename from community/upgade/src/main/assembly/assembly.xml
rename to community/lucene-index-upgrade/src/main/assembly/assembly.xml
diff --git a/community/upgade/src/main/java/org/neo4j/upgrade/loader/EmbeddedJarLoader.java b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/EmbeddedJarLoader.java
similarity index 100%
rename from community/upgade/src/main/java/org/neo4j/upgrade/loader/EmbeddedJarLoader.java
rename to community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/EmbeddedJarLoader.java
diff --git a/community/upgade/src/main/java/org/neo4j/upgrade/loader/EmbeddedJarNotFoundException.java b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/EmbeddedJarNotFoundException.java
similarity index 100%
rename from community/upgade/src/main/java/org/neo4j/upgrade/loader/EmbeddedJarNotFoundException.java
rename to community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/EmbeddedJarNotFoundException.java
diff --git a/community/upgade/src/main/java/org/neo4j/upgrade/loader/JarLoaderSupplier.java b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/JarLoaderSupplier.java
similarity index 100%
rename from community/upgade/src/main/java/org/neo4j/upgrade/loader/JarLoaderSupplier.java
rename to community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/loader/JarLoaderSupplier.java
diff --git a/community/upgade/src/main/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapper.java b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapper.java
similarity index 87%
rename from community/upgade/src/main/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapper.java
rename to community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapper.java
index c3545085cfe7f..b496edce646fc 100644
--- a/community/upgade/src/main/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapper.java
+++ b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapper.java
@@ -51,18 +51,18 @@ public IndexUpgraderWrapper( Supplier<EmbeddedJarLoader> jarLoaderSupplier )
 
     public void upgradeIndex( Path indexPath ) throws Throwable
     {
+        // since lucene use ServiceLocator to load services, context class loader need to be replaced as well
         ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
         try
         {
             if ( mainMethod == null )
             {
                 luceneLoader = jarLoaderSupplier.get();
-                Thread.currentThread().setContextClassLoader( luceneLoader.getJarsClassLoader() );
-                Class<?> upgrader = luceneLoader.loadEmbeddedClass( LUCENE_INDEX_UPGRADER_CLASS_NAME );
+                Class upgrader = luceneLoader.loadEmbeddedClass( LUCENE_INDEX_UPGRADER_CLASS_NAME );
                 MethodHandles.Lookup lookup = MethodHandles.lookup();
-                mainMethod = lookup.findStatic( upgrader, "main",
-                        MethodType.methodType( void.class, String[].class ) );
+                mainMethod = lookup.findStatic( upgrader, "main", MethodType.methodType( void.class, String[].class ) );
             }
+            Thread.currentThread().setContextClassLoader( luceneLoader.getJarsClassLoader() );
             mainMethod.invokeExact( new String[]{indexPath.toString()} );
         }
         finally
diff --git a/community/upgade/src/main/java/org/neo4j/upgrade/lucene/LegacyIndexMigrationException.java b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LegacyIndexMigrationException.java
similarity index 100%
rename from community/upgade/src/main/java/org/neo4j/upgrade/lucene/LegacyIndexMigrationException.java
rename to community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LegacyIndexMigrationException.java
diff --git a/community/upgade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java b/community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java
similarity index 100%
rename from community/upgade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java
rename to community/lucene-index-upgrade/src/main/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgrader.java
diff --git a/community/upgade/src/test/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapperTest.java b/community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapperTest.java
similarity index 100%
rename from community/upgade/src/test/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapperTest.java
rename to community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/IndexUpgraderWrapperTest.java
diff --git a/community/upgade/src/test/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgraderTest.java b/community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgraderTest.java
similarity index 100%
rename from community/upgade/src/test/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgraderTest.java
rename to community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/LuceneLegacyIndexUpgraderTest.java
diff --git a/community/upgade/src/test/java/org/neo4j/upgrade/lucene/UpgraterStub.java b/community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/UpgraterStub.java
similarity index 100%
rename from community/upgade/src/test/java/org/neo4j/upgrade/lucene/UpgraterStub.java
rename to community/lucene-index-upgrade/src/test/java/org/neo4j/upgrade/lucene/UpgraterStub.java
diff --git a/community/upgade/src/test/resources/indexFolder/index1/segments.gen b/community/lucene-index-upgrade/src/test/resources/indexFolder/index1/segments.gen
similarity index 100%
rename from community/upgade/src/test/resources/indexFolder/index1/segments.gen
rename to community/lucene-index-upgrade/src/test/resources/indexFolder/index1/segments.gen
diff --git a/community/upgade/src/test/resources/indexFolder/index1/segments_1 b/community/lucene-index-upgrade/src/test/resources/indexFolder/index1/segments_1
similarity index 100%
rename from community/upgade/src/test/resources/indexFolder/index1/segments_1
rename to community/lucene-index-upgrade/src/test/resources/indexFolder/index1/segments_1
diff --git a/community/upgade/src/test/resources/indexFolder/index2/segments.gen b/community/lucene-index-upgrade/src/test/resources/indexFolder/index2/segments.gen
similarity index 100%
rename from community/upgade/src/test/resources/indexFolder/index2/segments.gen
rename to community/lucene-index-upgrade/src/test/resources/indexFolder/index2/segments.gen
diff --git a/community/upgade/src/test/resources/indexFolder/index2/segments_1 b/community/lucene-index-upgrade/src/test/resources/indexFolder/index2/segments_1
similarity index 100%
rename from community/upgade/src/test/resources/indexFolder/index2/segments_1
rename to community/lucene-index-upgrade/src/test/resources/indexFolder/index2/segments_1
diff --git a/community/upgade/src/test/resources/indexPretender.txt b/community/lucene-index-upgrade/src/test/resources/indexPretender.txt
similarity index 100%
rename from community/upgade/src/test/resources/indexPretender.txt
rename to community/lucene-index-upgrade/src/test/resources/indexPretender.txt
diff --git a/community/upgade/src/test/resources/notIndexFolder/indexPretender.txt b/community/lucene-index-upgrade/src/test/resources/notIndexFolder/indexPretender.txt
similarity index 100%
rename from community/upgade/src/test/resources/notIndexFolder/indexPretender.txt
rename to community/lucene-index-upgrade/src/test/resources/notIndexFolder/indexPretender.txt
diff --git a/community/pom.xml b/community/pom.xml
index e661196f355ea..e596961b0821f 100644
--- a/community/pom.xml
+++ b/community/pom.xml
@@ -44,6 +44,7 @@
     <module>udc</module>
     <module>monitor-logging</module>
     <module>lucene-index</module>
+    <module>lucene-index-upgrade</module>
     <module>graph-algo</module>
     <module>graph-matching</module>
     <module>neo4j</module>
@@ -61,7 +62,6 @@
     <module>consistency-check</module>
     <module>neo4j-harness</module>
     <module>licensecheck-config</module>
-    <module>upgade</module>
   </modules>
 
   <licenses>
diff --git a/manual/cypher/graphgist/LICENSES.txt b/manual/cypher/graphgist/LICENSES.txt
index 9ca765b5b1555..2cd605a7eb863 100644
--- a/manual/cypher/graphgist/LICENSES.txt
+++ b/manual/cypher/graphgist/LICENSES.txt
@@ -8,7 +8,10 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Data Mapper for Jackson
   Jackson
+  Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
+  Lucene QueryParsers
   opencsv
   parboiled-core
   parboiled-scala
diff --git a/manual/cypher/graphgist/NOTICE.txt b/manual/cypher/graphgist/NOTICE.txt
index a31e065bf28c3..366133661a149 100644
--- a/manual/cypher/graphgist/NOTICE.txt
+++ b/manual/cypher/graphgist/NOTICE.txt
@@ -31,7 +31,10 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Data Mapper for Jackson
   Jackson
+  Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
+  Lucene QueryParsers
   opencsv
   parboiled-core
   parboiled-scala
diff --git a/manual/neo4j-harness-enterprise-test/LICENSES.txt b/manual/neo4j-harness-enterprise-test/LICENSES.txt
index 649e5d90b9ada..7ab7be8627f5d 100644
--- a/manual/neo4j-harness-enterprise-test/LICENSES.txt
+++ b/manual/neo4j-harness-enterprise-test/LICENSES.txt
@@ -9,6 +9,8 @@ Apache Software License, Version 2.0
   Commons Digester
   Commons Lang
   Commons Logging
+  Lucene Core
+  Lucene Memory
 ------------------------------------------------------------------------------
 
                                  Apache License
diff --git a/manual/neo4j-harness-enterprise-test/NOTICE.txt b/manual/neo4j-harness-enterprise-test/NOTICE.txt
index c38c65cfd7f71..fd34f9fd24fee 100644
--- a/manual/neo4j-harness-enterprise-test/NOTICE.txt
+++ b/manual/neo4j-harness-enterprise-test/NOTICE.txt
@@ -31,6 +31,8 @@ Apache Software License, Version 2.0
   Commons Digester
   Commons Lang
   Commons Logging
+  Lucene Core
+  Lucene Memory
 
 Common Development and Distribution License Version 1.1
   jsr311-api
diff --git a/manual/neo4j-harness-test/LICENSES.txt b/manual/neo4j-harness-test/LICENSES.txt
index 649e5d90b9ada..7ab7be8627f5d 100644
--- a/manual/neo4j-harness-test/LICENSES.txt
+++ b/manual/neo4j-harness-test/LICENSES.txt
@@ -9,6 +9,8 @@ Apache Software License, Version 2.0
   Commons Digester
   Commons Lang
   Commons Logging
+  Lucene Core
+  Lucene Memory
 ------------------------------------------------------------------------------
 
                                  Apache License
diff --git a/manual/neo4j-harness-test/NOTICE.txt b/manual/neo4j-harness-test/NOTICE.txt
index 7c742b911e7d7..ea06a3ec3ec55 100644
--- a/manual/neo4j-harness-test/NOTICE.txt
+++ b/manual/neo4j-harness-test/NOTICE.txt
@@ -32,6 +32,8 @@ Apache Software License, Version 2.0
   Commons Digester
   Commons Lang
   Commons Logging
+  Lucene Core
+  Lucene Memory
 
 Common Development and Distribution License Version 1.1
   jsr311-api