diff --git a/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF b/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF
index a53634e3b88..c4b147fc5af 100644
--- a/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.urischeme/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.urischeme;singleton:=true
-Bundle-Version: 1.3.500.qualifier
+Bundle-Version: 1.3.600.qualifier
 Automatic-Module-Name: org.eclipse.urischeme
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.8.0,4.0.0)",
diff --git a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/AutoRegisterSchemeHandlersJob.java b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/AutoRegisterSchemeHandlersJob.java
index 079b20bcbbc..515f7ffdcf3 100644
--- a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/AutoRegisterSchemeHandlersJob.java
+++ b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/AutoRegisterSchemeHandlersJob.java
@@ -38,9 +38,9 @@ public class AutoRegisterSchemeHandlersJob extends Job {
 	private static final String PROCESSED_SCHEMES_PREFERENCE = "processedSchemes"; //$NON-NLS-1$
 	private static final String SCHEME_LIST_PREFERENCE_SEPARATOR = ","; //$NON-NLS-1$
 	private static boolean alreadyTriggered = false;
-	private IEclipsePreferences testPreferenceNode;
-	private IUriSchemeExtensionReader testExtensionReader;
-	private IOperatingSystemRegistration testOsRegistration;
+	private final IEclipsePreferences testPreferenceNode;
+	private final IUriSchemeExtensionReader testExtensionReader;
+	private final IOperatingSystemRegistration testOsRegistration;
 
 	public AutoRegisterSchemeHandlersJob() {
 		// all defaults for lazy init NOT on UI thread
diff --git a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/UriSchemeExtensionReader.java b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/UriSchemeExtensionReader.java
index ae5d9cd9a16..d8706bee2aa 100644
--- a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/UriSchemeExtensionReader.java
+++ b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/UriSchemeExtensionReader.java
@@ -98,8 +98,8 @@ private IUriSchemeHandler createExecutableSchemeHandler(IConfigurationElement el
 
 	private static class Scheme implements IScheme {
 
-		private String uriScheme;
-		private String uriSchemeDescription;
+		private final String uriScheme;
+		private final String uriSchemeDescription;
 
 		public Scheme(String uriScheme, String uriSchemeDescription) {
 			this.uriScheme = uriScheme;
diff --git a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/UriSchemeProcessor.java b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/UriSchemeProcessor.java
index 2b8acbb40e3..5c46d6d9c26 100644
--- a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/UriSchemeProcessor.java
+++ b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/UriSchemeProcessor.java
@@ -28,7 +28,7 @@
  */
 public class UriSchemeProcessor implements IUriSchemeProcessor {
 
-	private Map<String, IUriSchemeHandler> createdHandlers = new HashMap<>();
+	private final Map<String, IUriSchemeHandler> createdHandlers = new HashMap<>();
 	IUriSchemeExtensionReader reader = IUriSchemeExtensionReader.newInstance();
 
 	/**
diff --git a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/DesktopFileWriter.java b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/DesktopFileWriter.java
index 3a36ca648f4..0f6613342a0 100644
--- a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/DesktopFileWriter.java
+++ b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/DesktopFileWriter.java
@@ -36,7 +36,7 @@ public class DesktopFileWriter {
 	private static final String KEY_MIME_TYPE = "MimeType"; //$NON-NLS-1$
 	private static final String KEY_EXEC = "Exec"; //$NON-NLS-1$
 	private static final String EXEC_URI_PLACEHOLDER = " %u"; //$NON-NLS-1$
-	private Map<String, String> properties;
+	private final Map<String, String> properties;
 
 	/**
 	 * Creates an instance of the DekstopFileWriter. Throws an
diff --git a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/PlistFileWriter.java b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/PlistFileWriter.java
index 9a7b4e35eb6..44137f489af 100644
--- a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/PlistFileWriter.java
+++ b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/PlistFileWriter.java
@@ -171,7 +171,7 @@ public void removeScheme(String scheme) {
 	public interface IOSupplier<T> {
 		T get() throws IOException;
 	}
-	
+
 	/**
 	 * Writes the content (xml) of the .plist file to the supplied {@link Writer}
 	 *
diff --git a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/RegistrationLinux.java b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/RegistrationLinux.java
index 3396a58c680..6e93b8485af 100644
--- a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/RegistrationLinux.java
+++ b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/RegistrationLinux.java
@@ -35,9 +35,9 @@ public class RegistrationLinux implements IOperatingSystemRegistration {
 
 	private static final String X_SCHEME_HANDLER_PREFIX = "x-scheme-handler/"; //$NON-NLS-1$
 
-	private IFileProvider fileProvider;
-	private IProcessExecutor processExecutor;
-	private String productName;
+	private final IFileProvider fileProvider;
+	private final IProcessExecutor processExecutor;
+	private final String productName;
 
 	public RegistrationLinux() {
 		this(new FileProvider(), new ProcessExecutor(), getProductName());
diff --git a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/RegistrationMacOsX.java b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/RegistrationMacOsX.java
index 2d31b2cb23f..58513b9a3b0 100644
--- a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/RegistrationMacOsX.java
+++ b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/RegistrationMacOsX.java
@@ -32,8 +32,8 @@ public class RegistrationMacOsX implements IOperatingSystemRegistration {
 	private static final String TRAILING_HEX_VALUE_WITH_BRACKETS = "\\s\\(0x\\w*\\)"; //$NON-NLS-1$
 	private static final String PATH_WITH_CAPTURING_GROUP = "path:\\s*(.*)"; //$NON-NLS-1$
 
-	private IFileProvider fileProvider;
-	private IProcessExecutor processExecutor;
+	private final IFileProvider fileProvider;
+	private final IProcessExecutor processExecutor;
 
 	private String[] lsRegisterOutput = null;
 
diff --git a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/SchemeInformation.java b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/SchemeInformation.java
index b05195bd24c..13d5d1c826b 100644
--- a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/SchemeInformation.java
+++ b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/internal/registration/SchemeInformation.java
@@ -19,8 +19,8 @@
  */
 public class SchemeInformation implements ISchemeInformation {
 
-	private String name;
-	private String description;
+	private final String name;
+	private final String description;
 	private boolean handled;
 	private String handlerInstanceLocation;