diff --git a/sdk/DefaultSchemaNameManager.cs b/sdk/DefaultSchemaNameManager.cs
index b8ca7a2..6e7690e 100644
--- a/sdk/DefaultSchemaNameManager.cs
+++ b/sdk/DefaultSchemaNameManager.cs
@@ -1,10 +1,19 @@
-namespace EAVFW.Extensions.Manifest.SDK
+namespace EAVFW.Extensions.Manifest.SDK
 {
     public class DefaultSchemaNameManager : ISchemaNameManager
     {
         public string ToSchemaName(string displayName)
         {
-            return displayName?.Replace(" ", "").Replace(":", "_").Replace("/", "or").Replace("-", "").Replace("(", "").Replace(")", "").Replace(".",""); ;
+            return displayName
+                ?.Replace(" ", "")
+                .Replace(":", "_")
+                .Replace("/", "Or")
+                .Replace("&","And")
+                .Replace("-", "")
+                .Replace("(", "")
+                .Replace(")", "")
+                .Replace(".","")
+                .Trim();
         }
     }
 }
\ No newline at end of file