diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PMXPublisher.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PMXPublisher.php
index 15eee7117..9ac9d6e9f 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PMXPublisher.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PMXPublisher.php
@@ -32,8 +32,7 @@ class PMXPublisher
             if (strlen(basename($outputFile)) >= $limit) {
                 $lastPos = strrpos(basename($outputFile), '.');
                 $fileName = substr(basename($outputFile), 0, $lastPos);
-                $newFileName = str_replace(".", "_", $fileName);
-                $newFileName = str_replace(" ", "_", $fileName);
+                $newFileName = \G::inflect($fileName);
                 $excess = strlen($newFileName) - $limit;
                 $newFileName = substr($newFileName, 0, strlen($newFileName) - $excess);
                 $newOutputFile = str_replace($fileName, $newFileName, $outputFile);
@@ -43,8 +42,7 @@ class PMXPublisher
                 $outputFile = $newOutputFile;
             }
         } else {
-            $outputFile = str_replace(".", "_", $outputFile);
-            $outputFile = str_replace(" ", "_", $outputFile);
+            $outputFile = \G::inflect($outputFile);
             if (strlen($outputFile) >= $limit) {
                 $excess = strlen($outputFile) - $limit;
                 $newFileName = substr($outputFile, 0, strlen($outputFile) - $excess);
diff --git a/workflow/engine/src/ProcessMaker/Exporter/XmlExporter.php b/workflow/engine/src/ProcessMaker/Exporter/XmlExporter.php
index 9fcc91bdd..abd6d6d7b 100644
--- a/workflow/engine/src/ProcessMaker/Exporter/XmlExporter.php
+++ b/workflow/engine/src/ProcessMaker/Exporter/XmlExporter.php
@@ -167,8 +167,7 @@ class XmlExporter extends Exporter
             if (strlen(basename($outputFile)) >= $limit) {
                 $lastPos = strrpos(basename($outputFile),'.');
                 $fileName = substr(basename($outputFile),0,$lastPos);
-                $newFileName = str_replace(".","_",$fileName);
-                $newFileName = str_replace(" ","_",$fileName);
+                $newFileName = \G::inflect($fileName);
                 $excess = strlen($newFileName) - $limit;
                 $newFileName = substr($newFileName,0,strlen($newFileName)-$excess);
                 $newOutputFile = str_replace($fileName,$newFileName,$outputFile);
@@ -178,8 +177,7 @@ class XmlExporter extends Exporter
                 $outputFile = $newOutputFile;
             } 
         } else {
-            $outputFile = str_replace(".","_",$outputFile);
-            $outputFile = str_replace(" ","_",$outputFile);
+            $outputFile = \G::inflect($outputFile);
             if (strlen($outputFile) >= $limit) {
                 $excess = strlen($outputFile) - $limit;
                 $newFileName = substr($outputFile,0,strlen($outputFile)-$excess);