diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeUrl.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeUrl.java
index f5adc25086..f67fe0b2d6 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeUrl.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/DataTypeUrl.java
@@ -36,7 +36,7 @@ public class DataTypeUrl {
 	// see javadoc for format
 	private static String PROTOCOL = "datatype";
 	private static Pattern URL_PATTERN =
-		Pattern.compile(PROTOCOL + ":/(\\d+)\\?uid=(\\d*)&name=(\\w+)");
+		Pattern.compile(PROTOCOL + ":/(\\d+)\\?uid=(\\d*)&name=(.+)");
 
 	private UniversalID dataTypeManagerId;
 	private UniversalID dataTypeId;
diff --git a/Ghidra/Features/Base/src/test/java/ghidra/app/util/datatype/DataTypeUrlTest.java b/Ghidra/Features/Base/src/test/java/ghidra/app/util/datatype/DataTypeUrlTest.java
index b36b2b4e30..37d9683dfd 100644
--- a/Ghidra/Features/Base/src/test/java/ghidra/app/util/datatype/DataTypeUrlTest.java
+++ b/Ghidra/Features/Base/src/test/java/ghidra/app/util/datatype/DataTypeUrlTest.java
@@ -115,7 +115,7 @@ public class DataTypeUrlTest {
 
 		String dtmId = "3295333330922457057";
 		String dtId = "3295333330922457056";
-		String name = " ";
+		String name = "";
 		String urlString = "datatype:/" + dtmId + "?uid=" + dtId + "&name=" + name;
 
 		new DataTypeUrl(urlString);