diff --git a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetFunctionInterceptorImpl.java b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetFunctionInterceptorImpl.java
index 1e1a41ab5e..6d0e6ebc48 100644
--- a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetFunctionInterceptorImpl.java
+++ b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetFunctionInterceptorImpl.java
@@ -15,21 +15,15 @@
  */
 package agent.frida.model.methods;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
-import agent.frida.manager.FridaExport;
-import agent.frida.manager.FridaImport;
-import agent.frida.manager.FridaSymbol;
+import agent.frida.manager.*;
 import agent.frida.model.iface1.FridaModelTargetMethod;
 import agent.frida.model.iface2.FridaModelTargetObject;
 import agent.frida.model.impl.FridaModelTargetObjectImpl;
 import ghidra.dbg.target.TargetMethod;
-import ghidra.dbg.target.schema.TargetAttributeType;
-import ghidra.dbg.target.schema.TargetElementType;
-import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
+import ghidra.dbg.target.schema.*;
 
 @TargetObjectSchemaInfo(
 	name = "FunctionIntercept",
@@ -58,9 +52,9 @@ public class FridaModelTargetFunctionInterceptorImpl extends FridaModelTargetObj
 		HashMap<String, ParameterDescription<?>> map =
 			new HashMap<String, ParameterDescription<?>>();
 		ParameterDescription<String> onEnter = ParameterDescription.create(String.class, "OnEnter",
-			false, "", "onEnter file", "JS file with onEnter implemenation");
+			false, "", "onEnter file", "JS file with onEnter implementation");
 		ParameterDescription<String> onLeave = ParameterDescription.create(String.class, "OnLeave",
-			false, "", "onLeave file", "JS file with onLeave implemenation");
+			false, "", "onLeave file", "JS file with onLeave implementation");
 		ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
 			false, "intercept", "name", "name for future unload");
 		ParameterDescription<String> script = ParameterDescription.create(String.class, "Script",
diff --git a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetMemoryWatchImpl.java b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetMemoryWatchImpl.java
index f7a6ae5c6f..ef14d7239c 100644
--- a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetMemoryWatchImpl.java
+++ b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetMemoryWatchImpl.java
@@ -15,18 +15,14 @@
  */
 package agent.frida.model.methods;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 import agent.frida.model.iface1.FridaModelTargetMethod;
 import agent.frida.model.iface2.FridaModelTargetMemoryContainer;
 import agent.frida.model.impl.FridaModelTargetObjectImpl;
 import ghidra.dbg.target.TargetMethod;
-import ghidra.dbg.target.schema.TargetAttributeType;
-import ghidra.dbg.target.schema.TargetElementType;
-import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
+import ghidra.dbg.target.schema.*;
 
 @TargetObjectSchemaInfo(
 	name = "MemoryWatch",
@@ -59,7 +55,7 @@ public class FridaModelTargetMemoryWatchImpl extends FridaModelTargetObjectImpl
 		ParameterDescription<Long> size = ParameterDescription.create(Long.class, "Size", true,
 			1L, "Size", "size to scan");
 		ParameterDescription<String> onAccess = ParameterDescription.create(String.class, "OnAccess",
-			true, "", "onAccess file", "JS file with onAccess implemenation");
+			true, "", "onAccess file", "JS file with onAccess implementation");
 		ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
 			false, "watch", "name", "name for future unload");
 		ParameterDescription<String> script = ParameterDescription.create(String.class, "Script",
diff --git a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetModuleInterceptorImpl.java b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetModuleInterceptorImpl.java
index 7739457611..d0c0247ab5 100644
--- a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetModuleInterceptorImpl.java
+++ b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetModuleInterceptorImpl.java
@@ -15,18 +15,14 @@
  */
 package agent.frida.model.methods;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 import agent.frida.model.iface1.FridaModelTargetMethod;
 import agent.frida.model.iface2.FridaModelTargetObject;
 import agent.frida.model.impl.FridaModelTargetObjectImpl;
 import ghidra.dbg.target.TargetMethod;
-import ghidra.dbg.target.schema.TargetAttributeType;
-import ghidra.dbg.target.schema.TargetElementType;
-import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
+import ghidra.dbg.target.schema.*;
 
 @TargetObjectSchemaInfo(
 	name = "ModuleIntercept",
@@ -57,9 +53,9 @@ public class FridaModelTargetModuleInterceptorImpl extends FridaModelTargetObjec
 		ParameterDescription<String> address = ParameterDescription.create(String.class, "Address",
 			true, "", "Address", "function address");
 		ParameterDescription<String> onEnter = ParameterDescription.create(String.class, "OnEnter",
-			true, "", "onEnter file", "JS file with onEnter implemenation");
+			true, "", "onEnter file", "JS file with onEnter implementation");
 		ParameterDescription<String> onLeave = ParameterDescription.create(String.class, "OnLeave",
-			true, "", "onLeave file", "JS file with onLeave implemenation");
+			true, "", "onLeave file", "JS file with onLeave implementation");
 		ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
 			false, "intercept", "name", "name for future unload");
 		ParameterDescription<String> script = ParameterDescription.create(String.class, "Script",
diff --git a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetThreadStalkImpl.java b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetThreadStalkImpl.java
index 8e5b397e93..a642a159f4 100644
--- a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetThreadStalkImpl.java
+++ b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/model/methods/FridaModelTargetThreadStalkImpl.java
@@ -15,9 +15,7 @@
  */
 package agent.frida.model.methods;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 import agent.frida.manager.FridaThread;
@@ -26,9 +24,7 @@ import agent.frida.model.iface2.FridaModelTargetThreadContainer;
 import agent.frida.model.impl.FridaModelTargetObjectImpl;
 import agent.frida.model.impl.FridaModelTargetThreadImpl;
 import ghidra.dbg.target.TargetMethod;
-import ghidra.dbg.target.schema.TargetAttributeType;
-import ghidra.dbg.target.schema.TargetElementType;
-import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
+import ghidra.dbg.target.schema.*;
 
 @TargetObjectSchemaInfo(
 	name = "ThreadStalk",
@@ -92,7 +88,7 @@ public class FridaModelTargetThreadStalkImpl extends FridaModelTargetObjectImpl
 		ParameterDescription<Boolean> e_compile = ParameterDescription.create(Boolean.class, "EventCompile",
 			true, false, "event=compile", "block compiled");
 		ParameterDescription<String> onReceive = ParameterDescription.create(String.class, "OnReceive",
-			false, "", "onRecv file", "JS file with onReceive implemenation");
+			false, "", "onRecv file", "JS file with onReceive implementation");
 		ParameterDescription<String> onCallSummary = ParameterDescription.create(String.class, "OnCallSummary",
 			false, "", "onCall file", "JS file with onCallSummary implementation");
 		ParameterDescription<String> name = ParameterDescription.create(String.class, "Name",
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/xml/XMLErrorHandler.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/xml/XMLErrorHandler.java
index 26aede0fa7..7012373ff7 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/xml/XMLErrorHandler.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/xml/XMLErrorHandler.java
@@ -18,7 +18,7 @@ package ghidra.app.util.xml;
 import org.xml.sax.*;
 
 /**
- * An implemenation of the basic interface for SAX error handlers.
+ * An implementation of the basic interface for SAX error handlers.
  * Per the documentation, this class is required to prevent the SAX
  * parser from squelching all parse exceptions.
  *
diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle
index d10557457d..e8564e0a22 100644
--- a/gradle/javaProject.gradle
+++ b/gradle/javaProject.gradle
@@ -133,7 +133,7 @@ configurations {
 	pcodeTestImplementation.extendsFrom implementation
 	testArtifacts.extendsFrom testRuntimeOnly
 	integrationTestArtifacts.extendsFrom integrationTestRuntimeOnly
-	screenShotsImplementation.extendsFrom integrationTestImplemenation
+	screenShotsImplementation.extendsFrom integrationTestImplementation
 }
 
 task testJar(type: Jar) {