diff --git a/org.eclipse.jdt.core.manipulation/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.manipulation/META-INF/MANIFEST.MF
index 28b748354b2..9bf99e75912 100644
--- a/org.eclipse.jdt.core.manipulation/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.manipulation/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.core.manipulation
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.core.manipulation; singleton:=true
-Bundle-Version: 1.20.0.qualifier
+Bundle-Version: 1.21.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.jdt.internal.core.manipulation.JavaManipulationPlugin
 Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.core.manipulation/plugin.xml b/org.eclipse.jdt.core.manipulation/plugin.xml
index 91b63467369..048b9f8425b 100644
--- a/org.eclipse.jdt.core.manipulation/plugin.xml
+++ b/org.eclipse.jdt.core.manipulation/plugin.xml
@@ -31,6 +31,123 @@
       <contribution
             class="org.eclipse.jdt.internal.core.refactoring.descriptors.RenameResourceRefactoringContribution"
             id="org.eclipse.jdt.ui.rename.resource"/>
-   </extension>            
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameCompilationUnitRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.compilationunit"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameEnumConstRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.enum.constant"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameFieldRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.field"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameModuleRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.module"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameJavaProjectRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.java.project"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameLocalVariableRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.local.variable"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameMethodRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.method"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenamePackageRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.package"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameSourceFolderRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.source.folder"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameTypeParameterRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.type.parameter"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameTypeRefactoringContribution"
+            id="org.eclipse.jdt.ui.rename.type"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ChangeMethodSignatureRefactoringContribution"
+            id="org.eclipse.jdt.ui.change.method.signature"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.MoveMethodRefactoringContribution"
+            id="org.eclipse.jdt.ui.move.method"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.MoveStaticMembersRefactoringContribution"
+            id="org.eclipse.jdt.ui.move.static"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractInterfaceRefactoringContribution"
+            id="org.eclipse.jdt.ui.extract.interface"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.UseSupertypeRefactoringContribution"
+            id="org.eclipse.jdt.ui.use.supertype"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.PullUpRefactoringContribution"
+            id="org.eclipse.jdt.ui.pull.up"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.PushDownRefactoringContribution"
+            id="org.eclipse.jdt.ui.push.down"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ConvertAnonymousRefactoringContribution"
+            id="org.eclipse.jdt.ui.convert.anonymous"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.MoveMemberTypeRefactoringContribution"
+            id="org.eclipse.jdt.ui.move.inner"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.InlineMethodRefactoringContribution"
+            id="org.eclipse.jdt.ui.inline.method"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.InlineTempRefactoringContribution"
+            id="org.eclipse.jdt.ui.inline.temp"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.InlineConstantRefactoringContribution"
+            id="org.eclipse.jdt.ui.inline.constant"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractMethodRefactoringContribution"
+            id="org.eclipse.jdt.ui.extract.method"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractTempRefactoringContribution"
+            id="org.eclipse.jdt.ui.extract.temp"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractConstantRefactoringContribution"
+            id="org.eclipse.jdt.ui.extract.constant"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractClassContribution"
+            id="org.eclipse.jdt.ui.extract.class"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.IntroduceParameterRefactoringContribution"
+            id="org.eclipse.jdt.ui.introduce.parameter"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.IntroduceParameterObjectContribution"
+            id="org.eclipse.jdt.ui.introduce.parameter.object"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.IntroduceFactoryRefactoringContribution"
+            id="org.eclipse.jdt.ui.introduce.factory"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.IntroduceIndirectionRefactoringContribution"
+            id="org.eclipse.jdt.ui.introduce.indirection"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.PromoteTempToFieldRefactoringContribution"
+            id="org.eclipse.jdt.ui.promote.temp"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.SelfEncapsulateRefactoringContribution"
+            id="org.eclipse.jdt.ui.self.encapsulate"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.InferTypeArgumentsRefactoringContribution"
+            id="org.eclipse.jdt.ui.infer.typearguments"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ChangeTypeRefactoringContribution"
+            id="org.eclipse.jdt.ui.change.type"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractSupertypeRefactoringContribution"
+            id="org.eclipse.jdt.ui.extract.superclass"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.DeleteRefactoringContribution"
+            id="org.eclipse.jdt.ui.delete"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.MoveRefactoringContribution"
+            id="org.eclipse.jdt.ui.move"/>
+      <contribution
+            class="org.eclipse.jdt.internal.corext.refactoring.scripting.CopyRefactoringContribution"
+            id="org.eclipse.jdt.ui.copy"/>
+   </extension>
 
 </plugin>
diff --git a/org.eclipse.jdt.core.manipulation/pom.xml b/org.eclipse.jdt.core.manipulation/pom.xml
index 7f9f91a703a..fd6de9b548e 100644
--- a/org.eclipse.jdt.core.manipulation/pom.xml
+++ b/org.eclipse.jdt.core.manipulation/pom.xml
@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.core.manipulation</artifactId>
-  <version>1.20.0-SNAPSHOT</version>
+  <version>1.21.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.jdt.ui/plugin.xml b/org.eclipse.jdt.ui/plugin.xml
index 1920e079585..a7d1c0dd402 100644
--- a/org.eclipse.jdt.ui/plugin.xml
+++ b/org.eclipse.jdt.ui/plugin.xml
@@ -5877,128 +5877,6 @@
       </changePreviewViewer>
    </extension>
 
-   <extension
-         point="org.eclipse.ltk.core.refactoring.refactoringContributions">
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameCompilationUnitRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.compilationunit"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameEnumConstRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.enum.constant"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameFieldRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.field"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameModuleRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.module"/>      
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameJavaProjectRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.java.project"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameLocalVariableRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.local.variable"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameMethodRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.method"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenamePackageRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.package"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameSourceFolderRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.source.folder"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameTypeParameterRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.type.parameter"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.RenameTypeRefactoringContribution"
-            id="org.eclipse.jdt.ui.rename.type"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ChangeMethodSignatureRefactoringContribution"
-            id="org.eclipse.jdt.ui.change.method.signature"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.MoveMethodRefactoringContribution"
-            id="org.eclipse.jdt.ui.move.method"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.MoveStaticMembersRefactoringContribution"
-            id="org.eclipse.jdt.ui.move.static"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractInterfaceRefactoringContribution"
-            id="org.eclipse.jdt.ui.extract.interface"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.UseSupertypeRefactoringContribution"
-            id="org.eclipse.jdt.ui.use.supertype"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.PullUpRefactoringContribution"
-            id="org.eclipse.jdt.ui.pull.up"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.PushDownRefactoringContribution"
-            id="org.eclipse.jdt.ui.push.down"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ConvertAnonymousRefactoringContribution"
-            id="org.eclipse.jdt.ui.convert.anonymous"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.MoveMemberTypeRefactoringContribution"
-            id="org.eclipse.jdt.ui.move.inner"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.InlineMethodRefactoringContribution"
-            id="org.eclipse.jdt.ui.inline.method"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.InlineTempRefactoringContribution"
-            id="org.eclipse.jdt.ui.inline.temp"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.InlineConstantRefactoringContribution"
-            id="org.eclipse.jdt.ui.inline.constant"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractMethodRefactoringContribution"
-            id="org.eclipse.jdt.ui.extract.method"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractTempRefactoringContribution"
-            id="org.eclipse.jdt.ui.extract.temp"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractConstantRefactoringContribution"
-            id="org.eclipse.jdt.ui.extract.constant"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractClassContribution"
-            id="org.eclipse.jdt.ui.extract.class">
-      </contribution>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.IntroduceParameterRefactoringContribution"
-            id="org.eclipse.jdt.ui.introduce.parameter"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.IntroduceParameterObjectContribution"
-            id="org.eclipse.jdt.ui.introduce.parameter.object"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.IntroduceFactoryRefactoringContribution"
-            id="org.eclipse.jdt.ui.introduce.factory"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.IntroduceIndirectionRefactoringContribution"
-            id="org.eclipse.jdt.ui.introduce.indirection"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.PromoteTempToFieldRefactoringContribution"
-            id="org.eclipse.jdt.ui.promote.temp"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.SelfEncapsulateRefactoringContribution"
-            id="org.eclipse.jdt.ui.self.encapsulate"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.InferTypeArgumentsRefactoringContribution"
-            id="org.eclipse.jdt.ui.infer.typearguments"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ChangeTypeRefactoringContribution"
-            id="org.eclipse.jdt.ui.change.type"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.ExtractSupertypeRefactoringContribution"
-            id="org.eclipse.jdt.ui.extract.superclass"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.DeleteRefactoringContribution"
-            id="org.eclipse.jdt.ui.delete"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.MoveRefactoringContribution"
-            id="org.eclipse.jdt.ui.move"/>
-      <contribution
-            class="org.eclipse.jdt.internal.corext.refactoring.scripting.CopyRefactoringContribution"
-            id="org.eclipse.jdt.ui.copy"/>
-   </extension>
-
    <extension
          point="org.eclipse.ltk.core.refactoring.renameParticipants">
       <renameParticipant