diff --git a/ui/src/main/java/edu/wpi/grip/ui/codegeneration/TemplateMethods.java b/ui/src/main/java/edu/wpi/grip/ui/codegeneration/TemplateMethods.java
index cdfbe25b99..614e31e9e3 100644
--- a/ui/src/main/java/edu/wpi/grip/ui/codegeneration/TemplateMethods.java
+++ b/ui/src/main/java/edu/wpi/grip/ui/codegeneration/TemplateMethods.java
@@ -106,7 +106,7 @@ public static String parseSocketName(Socket socket) {
    */
   public static String parseSocketType(Socket socket) {
     StringBuilder type = new StringBuilder();
-    type.append(socket.getSocketHint().getType().getSimpleName());
+    type.append(socket.getSocketHint().getType().getSimpleName().replace("MatWrapper", "Mat"));
     if (BorderTypesEnum.class.equals(socket.getSocketHint().getType())
         || CmpTypesEnum.class.equals(socket.getSocketHint().getType())
         || CVOperations.CVBorderTypesEnum.class.equals(socket.getSocketHint().getType())
diff --git a/ui/src/main/java/edu/wpi/grip/ui/codegeneration/data/TInput.java b/ui/src/main/java/edu/wpi/grip/ui/codegeneration/data/TInput.java
index 74f5e045af..546b4ecaa3 100644
--- a/ui/src/main/java/edu/wpi/grip/ui/codegeneration/data/TInput.java
+++ b/ui/src/main/java/edu/wpi/grip/ui/codegeneration/data/TInput.java
@@ -50,6 +50,9 @@ protected String baseTypeHelper(String type) {
     if ("Double".equals(type)) {
       return "double";
     }
+    if ("MatWrapper".equals(type)) {
+      return "Mat";
+    }
     return type;
   }
 
diff --git a/ui/src/main/java/edu/wpi/grip/ui/codegeneration/data/TPipeline.java b/ui/src/main/java/edu/wpi/grip/ui/codegeneration/data/TPipeline.java
index 959d198d98..8012b92277 100644
--- a/ui/src/main/java/edu/wpi/grip/ui/codegeneration/data/TPipeline.java
+++ b/ui/src/main/java/edu/wpi/grip/ui/codegeneration/data/TPipeline.java
@@ -108,6 +108,7 @@ private void set(List<Step> pipeSteps) {
           type = steps.get(i).name() + "Type";
         }
         type = type.replace("Number", "Double");
+        type = type.replace("MatWrapper", "Mat");
         StringBuilder nameBuilder = new StringBuilder(tStep.name());
         if (stepInstances.get(pipeSteps.get(i).getOperationDescription().name()) > 1) {
           nameBuilder