diff --git a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
index b0ff5d9263..ddf694f630 100644
--- a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
+++ b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
@@ -42,8 +42,8 @@ namespace Umbraco.Web.Editors
         {
             var dataType = (DataTypeSave)actionContext.ActionArguments["dataType"];
 
-            dataType.Name = dataType.Name.CleanForXss();
-            dataType.Alias = dataType.Name.CleanForXss();
+            dataType.Name = dataType.Name.CleanForXss('[', ']', '(', ')');
+            dataType.Alias = dataType.Name.CleanForXss('[', ']', '(', ')');
 
             //Validate that the property editor exists
             var propertyEditor = PropertyEditorResolver.Current.GetByAlias(dataType.SelectedEditor);
diff --git a/src/Umbraco.Web/WebServices/SaveFileController.cs b/src/Umbraco.Web/WebServices/SaveFileController.cs
index 5da935da64..c238ec9e64 100644
--- a/src/Umbraco.Web/WebServices/SaveFileController.cs
+++ b/src/Umbraco.Web/WebServices/SaveFileController.cs
@@ -152,8 +152,8 @@ namespace Umbraco.Web.WebServices
             {
                 t = new Template(templateId)
                 {
-                    Text = templateName.CleanForXss(),
-                    Alias = templateAlias.CleanForXss(),
+                    Text = templateName.CleanForXss('[', ']', '(', ')'),
+                    Alias = templateAlias.CleanForXss('[', ']', '(', ')'),
                     Design = templateContents
                 };