diff --git a/src/TSMapEditor/Models/AITriggerType.cs b/src/TSMapEditor/Models/AITriggerType.cs
index 72f1fe51..8a96ddf8 100644
--- a/src/TSMapEditor/Models/AITriggerType.cs
+++ b/src/TSMapEditor/Models/AITriggerType.cs
@@ -92,7 +92,7 @@ public AITriggerType(string iniName)
         public AITriggerType Clone(string newUniqueId)
         {
             var clonedAITrigger = (AITriggerType)MemberwiseClone();
-            clonedAITrigger.Name = "Clone of " + Name;
+            clonedAITrigger.Name = Name + " (Clone)";
             clonedAITrigger.ININame = newUniqueId;
             return clonedAITrigger;
         }
diff --git a/src/TSMapEditor/Models/Script.cs b/src/TSMapEditor/Models/Script.cs
index 63d7001b..4400e1e3 100644
--- a/src/TSMapEditor/Models/Script.cs
+++ b/src/TSMapEditor/Models/Script.cs
@@ -63,7 +63,8 @@ public Script(string iniName)
         public Script Clone(string iniName)
         {
             var script = new Script(iniName);
-            script.Name = "Clone of " + Name;
+            script.Name = Name + " (Clone)";
+
             foreach (var action in Actions)
             {
                 script.Actions.Add(new ScriptActionEntry() 
diff --git a/src/TSMapEditor/Models/TaskForce.cs b/src/TSMapEditor/Models/TaskForce.cs
index 1039805e..6134f92c 100644
--- a/src/TSMapEditor/Models/TaskForce.cs
+++ b/src/TSMapEditor/Models/TaskForce.cs
@@ -153,7 +153,7 @@ public string GetHintText()
         public TaskForce Clone(string iniName)
         {
             var newTaskForce = new TaskForce(iniName);
-            newTaskForce.Name = "Clone of " + Name;
+            newTaskForce.Name = Name + " (Clone)";
             newTaskForce.Group = Group;
 
             for (int i = 0; i < TechnoTypes.Length; i++)
diff --git a/src/TSMapEditor/Models/TeamType.cs b/src/TSMapEditor/Models/TeamType.cs
index b52338ea..3636702b 100644
--- a/src/TSMapEditor/Models/TeamType.cs
+++ b/src/TSMapEditor/Models/TeamType.cs
@@ -128,7 +128,7 @@ public TeamType Clone(string iniName)
         {
             var clone = MemberwiseClone() as TeamType;
             clone.ININame = iniName;
-            clone.Name = "Clone of " + Name;
+            clone.Name = Name + " (Clone)";
 
             clone.EnabledTeamTypeFlags = new List<string>(EnabledTeamTypeFlags);
 
diff --git a/src/TSMapEditor/Models/Trigger.cs b/src/TSMapEditor/Models/Trigger.cs
index ff20b49a..6877d340 100644
--- a/src/TSMapEditor/Models/Trigger.cs
+++ b/src/TSMapEditor/Models/Trigger.cs
@@ -105,7 +105,7 @@ public Trigger Clone(string uniqueId)
         {
             Trigger clone = (Trigger)MemberwiseClone();
             clone.ID = uniqueId;
-            clone.Name = "Clone of " + Name;
+            clone.Name = Name + " (Clone)";
 
             // Deep clone the events and actions