diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js
index 6ffd5dda7..7642c3a7f 100644
--- a/FloatingSpace/StrategyPart.js
+++ b/FloatingSpace/StrategyPart.js
@@ -510,7 +510,7 @@ function newStrategyPart () {
         let parent = thisObject.payload.parentNode
         for (let i = 0; i < parent.phases.length; i++) {
           let phase = parent.phases[i]
-          if (phase.name === thisObject.payload.node.name) {
+          if (phase.id === thisObject.payload.node.id) {
             label = label + ' #' + (i + 1)
             return label
           }
@@ -521,7 +521,7 @@ function newStrategyPart () {
         let parent = thisObject.payload.parentNode
         for (let i = 0; i < parent.situations.length; i++) {
           let situation = parent.situations[i]
-          if (situation.name === thisObject.payload.node.name) {
+          if (situation.id === thisObject.payload.node.id) {
             label = label + ' #' + (i + 1)
             return label
           }
@@ -532,7 +532,7 @@ function newStrategyPart () {
         let parent = thisObject.payload.parentNode
         for (let i = 0; i < parent.conditions.length; i++) {
           let condition = parent.conditions[i]
-          if (condition.name === thisObject.payload.node.name) {
+          if (condition.id === thisObject.payload.node.id) {
             label = label + ' #' + (i + 1)
             return label
           }
diff --git a/StrategySpace/Strategy.js b/StrategySpace/Strategy.js
index 5fe185c67..14c9efb9c 100644
--- a/StrategySpace/Strategy.js
+++ b/StrategySpace/Strategy.js
@@ -66,6 +66,10 @@ function newStrategy () {
 
     node.handle = canvas.floatingSpace.strategyParts.createNewStrategyPart(partType, payload)
     node.payload = payload
+
+    if (node.id === undefined) {
+      node.id = newUniqueId()
+    }
   }
 
   function destroyPart (node) {
@@ -245,7 +249,7 @@ function newStrategy () {
           let phaseParent = payload.node
           let m = phaseParent.phases.length
           let phase = {
-            name: 'New Phase' + ' #' + (m + 1),
+            name: 'New Phase',
             code: '',
             situations: []
           }
@@ -264,7 +268,7 @@ function newStrategy () {
           let phase = payload.node
           let m = phase.situations.length
           let situation = {
-            name: 'New Situation' + ' #' + (m + 1),
+            name: 'New Situation',
             conditions: []
           }
           phase.situations.push(situation)
@@ -276,7 +280,7 @@ function newStrategy () {
           let situation = payload.node
           let m = situation.conditions.length
           let condition = {
-            name: 'New Condition' + ' #' + (m + 1),
+            name: 'New Condition',
             code: ''
           }
           situation.conditions.push(condition)
@@ -304,7 +308,7 @@ function newStrategy () {
     let payload = node.payload
     for (let k = 0; k < payload.parentNode.phases.length; k++) {
       let phase = payload.parentNode.phases[k]
-      if (phase.name === node.name) {
+      if (phase.id === node.id) {
         for (let j = 0; j < phase.situations.length; j++) {
           let situation = phase.situations[j]
           for (let i = 0; i < situation.conditions.length; i++) {
@@ -335,7 +339,7 @@ function newStrategy () {
     let payload = node.payload
     for (let j = 0; j < payload.parentNode.situations.length; j++) {
       let situation = payload.parentNode.situations[j]
-      if (situation.name === node.name) {
+      if (situation.id === node.id) {
         for (let i = 0; i < situation.conditions.length; i++) {
           let condition = situation.conditions[i]
           destroyPart(condition)
@@ -354,7 +358,7 @@ function newStrategy () {
     let payload = node.payload
     for (let i = 0; i < payload.parentNode.conditions.length; i++) {
       let condition = payload.parentNode.conditions[i]
-      if (condition.name === node.name) {
+      if (condition.id === node.id) {
         destroyPart(node)
         payload.parentNode.conditions.splice(i, 1)
         cleanNode(condition)
@@ -378,4 +382,3 @@ function newStrategy () {
     node.cleaned = true
   }
 }
-
diff --git a/Utilities.js b/Utilities.js
index 663e3eb4b..8f38d99d8 100644
--- a/Utilities.js
+++ b/Utilities.js
@@ -172,7 +172,7 @@ function loadEmoji (pPath) {
 function printLabel (labelToPrint, x, y, opacity, fontSize) {
   let labelPoint
 
-  browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY  
+  browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY
 
   let label = '' + labelToPrint
 
@@ -181,3 +181,10 @@ function printLabel (labelToPrint, x, y, opacity, fontSize) {
   browserCanvasContext.fillStyle = 'rgba(' + UI_COLOR.DARK + ', ' + opacity + ')'
   browserCanvasContext.fillText(label, x, y)
 }
+
+function newUniqueId () {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8)
+    return v.toString(16)
+  })
+}