diff --git a/objects/AllPlayerCards.15bb07.json b/objects/AllPlayerCards.15bb07.json
index cd0d2fddc..2bdaf3a4a 100644
--- a/objects/AllPlayerCards.15bb07.json
+++ b/objects/AllPlayerCards.15bb07.json
@@ -1650,45 +1650,45 @@
     "ThrowtheBookatThem.d617ab",
     "FoxMask.4144cd",
     "MouseMask.32ad21",
-    "TaskForce0.a5c06a",
+    "TaskForce.a5c06a",
     "Microscope4.fbd296",
     "BackInjury.f6c482",
-    "Lightfooted0.fe1fb6",
+    "Lightfooted.fe1fb6",
     "Bewitching3.db335c",
     "FlurryofBlows5.9e7bc8",
     "BritishBullDog2.7b7050",
-    "BiancaDieKatz0.897a94",
+    "BiancaDieKatz.897a94",
     "DirtyDeeds3.aa2d6a",
     "EsotericMethod1.9250e1",
-    "Katana0.f5beb5",
+    "Katana.f5beb5",
     "EtherealWeaving3.697efd",
     "PutrescentRot.2d1e60",
     "RavenousMyconid4.df93ca",
     "SecondWind2.c3c979",
     "FireAxe2.326ec3",
-    "StirthePot0.c25479",
+    "StirthePot.c25479",
     "KeeperoftheKey.014086",
-    "BideYourTime0.24d3b3",
-    "ThoroughInquiry0.c6b644",
+    "BideYourTime.24d3b3",
+    "ThoroughInquiry.c6b644",
     "Steady-Handed1.9181f7",
     "DawnStar1.8b15d7",
     "SealoftheElders5.d2b649",
     "KeepFaith2.73e4ee",
     "MarinersCompass2.596053",
-    "BankJob0.c4dfa2",
+    "BankJob.c4dfa2",
     "AbyssalRot.bbeac6",
     "MaimedHand.cb14d3",
-    "TestingSprint0.a4846b",
+    "TestingSprint.a4846b",
     "BladeofYoth.c61a83",
     "CalltheBeyond2.0dd070",
     "GabrielCarillo1.7e1088",
-    "DiabolicalLuck0.1fea59",
-    "CleaningKit0.d07668",
+    "DiabolicalLuck.1fea59",
+    "CleaningKit.d07668",
     "EvanescentAscension.9e763b",
-    "Matchbox0.b533db",
-    "BritishBullDog0.9b76a0",
+    "Matchbox.b533db",
+    "BritishBullDog.9b76a0",
     "TwilightDiadem.a2f8f8",
-    "RodofCarnamagos0.66ec64",
+    "RodofCarnamagos.66ec64",
     "SpectralRazor2.b38ded",
     "EtherealForm2.e58c7b",
     "CleaningKit3.94c3e1",
@@ -1697,7 +1697,7 @@
     "FakeCredentials4.7ebb67",
     "HuntingJacket2.5355fa",
     "DarkHorse5.d00e4d",
-    "AntediluvianHymn0.ba4746",
+    "AntediluvianHymn.ba4746",
     "AemberRot.3e6219",
     "TheSilverMoth.2c6dc1",
     "ScarletRot.fe476c",
@@ -1712,7 +1712,7 @@
     "BiancaDieKatz.992ccd",
     "ServantofBrass.06bc7e",
     "ReadtheSigns2.5ce4d4",
-    "ElaborateDistraction0.d1422e"
+    "ElaborateDistraction.d1422e"
   ],
   "ContainedObjects_path": "AllPlayerCards.15bb07",
   "Description": "",
diff --git a/objects/AllPlayerCards.15bb07/AntediluvianHymn0.ba4746.gmnotes b/objects/AllPlayerCards.15bb07/AntediluvianHymn.ba4746.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/AntediluvianHymn0.ba4746.gmnotes
rename to objects/AllPlayerCards.15bb07/AntediluvianHymn.ba4746.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/AntediluvianHymn0.ba4746.json b/objects/AllPlayerCards.15bb07/AntediluvianHymn.ba4746.json
similarity index 91%
rename from objects/AllPlayerCards.15bb07/AntediluvianHymn0.ba4746.json
rename to objects/AllPlayerCards.15bb07/AntediluvianHymn.ba4746.json
index bb4bf8e47..61e7d0bb9 100644
--- a/objects/AllPlayerCards.15bb07/AntediluvianHymn0.ba4746.json
+++ b/objects/AllPlayerCards.15bb07/AntediluvianHymn.ba4746.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/AntediluvianHymn0.ba4746.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/AntediluvianHymn.ba4746.gmnotes",
   "GUID": "ba4746",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Antediluvian Hymn (0)",
+  "Nickname": "Antediluvian Hymn",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/BankJob0.c4dfa2.gmnotes b/objects/AllPlayerCards.15bb07/BankJob.c4dfa2.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/BankJob0.c4dfa2.gmnotes
rename to objects/AllPlayerCards.15bb07/BankJob.c4dfa2.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/BankJob0.c4dfa2.json b/objects/AllPlayerCards.15bb07/BankJob.c4dfa2.json
similarity index 92%
rename from objects/AllPlayerCards.15bb07/BankJob0.c4dfa2.json
rename to objects/AllPlayerCards.15bb07/BankJob.c4dfa2.json
index e1726a3ab..ea39457be 100644
--- a/objects/AllPlayerCards.15bb07/BankJob0.c4dfa2.json
+++ b/objects/AllPlayerCards.15bb07/BankJob.c4dfa2.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/BankJob0.c4dfa2.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/BankJob.c4dfa2.gmnotes",
   "GUID": "c4dfa2",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Bank Job (0)",
+  "Nickname": "Bank Job",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/BiancaDieKatz0.897a94.gmnotes b/objects/AllPlayerCards.15bb07/BiancaDieKatz.897a94.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/BiancaDieKatz0.897a94.gmnotes
rename to objects/AllPlayerCards.15bb07/BiancaDieKatz.897a94.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/BiancaDieKatz0.897a94.json b/objects/AllPlayerCards.15bb07/BiancaDieKatz.897a94.json
similarity index 91%
rename from objects/AllPlayerCards.15bb07/BiancaDieKatz0.897a94.json
rename to objects/AllPlayerCards.15bb07/BiancaDieKatz.897a94.json
index 32013db39..7db6a99af 100644
--- a/objects/AllPlayerCards.15bb07/BiancaDieKatz0.897a94.json
+++ b/objects/AllPlayerCards.15bb07/BiancaDieKatz.897a94.json
@@ -24,7 +24,7 @@
   },
   "Description": "Singing Your Songs",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/BiancaDieKatz0.897a94.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/BiancaDieKatz.897a94.gmnotes",
   "GUID": "897a94",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Bianca \"Die Katz\" (0)",
+  "Nickname": "Bianca \"Die Katz\"",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/BideYourTime0.24d3b3.gmnotes b/objects/AllPlayerCards.15bb07/BideYourTime.24d3b3.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/BideYourTime0.24d3b3.gmnotes
rename to objects/AllPlayerCards.15bb07/BideYourTime.24d3b3.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/BideYourTime0.24d3b3.json b/objects/AllPlayerCards.15bb07/BideYourTime.24d3b3.json
similarity index 91%
rename from objects/AllPlayerCards.15bb07/BideYourTime0.24d3b3.json
rename to objects/AllPlayerCards.15bb07/BideYourTime.24d3b3.json
index 7f8c15771..f1a43b9e7 100644
--- a/objects/AllPlayerCards.15bb07/BideYourTime0.24d3b3.json
+++ b/objects/AllPlayerCards.15bb07/BideYourTime.24d3b3.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/BideYourTime0.24d3b3.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/BideYourTime.24d3b3.gmnotes",
   "GUID": "24d3b3",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Bide Your Time (0)",
+  "Nickname": "Bide Your Time",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/BritishBullDog0.9b76a0.gmnotes b/objects/AllPlayerCards.15bb07/BritishBullDog.9b76a0.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/BritishBullDog0.9b76a0.gmnotes
rename to objects/AllPlayerCards.15bb07/BritishBullDog.9b76a0.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/BritishBullDog0.9b76a0.json b/objects/AllPlayerCards.15bb07/BritishBullDog.9b76a0.json
similarity index 91%
rename from objects/AllPlayerCards.15bb07/BritishBullDog0.9b76a0.json
rename to objects/AllPlayerCards.15bb07/BritishBullDog.9b76a0.json
index 0eaab1d61..3d3c9fc6b 100644
--- a/objects/AllPlayerCards.15bb07/BritishBullDog0.9b76a0.json
+++ b/objects/AllPlayerCards.15bb07/BritishBullDog.9b76a0.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/BritishBullDog0.9b76a0.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/BritishBullDog.9b76a0.gmnotes",
   "GUID": "9b76a0",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "British Bull Dog (0)",
+  "Nickname": "British Bull Dog",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/CleaningKit0.d07668.gmnotes b/objects/AllPlayerCards.15bb07/CleaningKit.d07668.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/CleaningKit0.d07668.gmnotes
rename to objects/AllPlayerCards.15bb07/CleaningKit.d07668.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/CleaningKit0.d07668.json b/objects/AllPlayerCards.15bb07/CleaningKit.d07668.json
similarity index 92%
rename from objects/AllPlayerCards.15bb07/CleaningKit0.d07668.json
rename to objects/AllPlayerCards.15bb07/CleaningKit.d07668.json
index ffdace5ea..af83744a0 100644
--- a/objects/AllPlayerCards.15bb07/CleaningKit0.d07668.json
+++ b/objects/AllPlayerCards.15bb07/CleaningKit.d07668.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/CleaningKit0.d07668.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/CleaningKit.d07668.gmnotes",
   "GUID": "d07668",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Cleaning Kit (0)",
+  "Nickname": "Cleaning Kit",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/DiabolicalLuck0.1fea59.gmnotes b/objects/AllPlayerCards.15bb07/DiabolicalLuck.1fea59.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/DiabolicalLuck0.1fea59.gmnotes
rename to objects/AllPlayerCards.15bb07/DiabolicalLuck.1fea59.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/DiabolicalLuck0.1fea59.json b/objects/AllPlayerCards.15bb07/DiabolicalLuck.1fea59.json
similarity index 91%
rename from objects/AllPlayerCards.15bb07/DiabolicalLuck0.1fea59.json
rename to objects/AllPlayerCards.15bb07/DiabolicalLuck.1fea59.json
index 2ee7267c4..a299fb16e 100644
--- a/objects/AllPlayerCards.15bb07/DiabolicalLuck0.1fea59.json
+++ b/objects/AllPlayerCards.15bb07/DiabolicalLuck.1fea59.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/DiabolicalLuck0.1fea59.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/DiabolicalLuck.1fea59.gmnotes",
   "GUID": "1fea59",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Diabolical Luck (0)",
+  "Nickname": "Diabolical Luck",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/ElaborateDistraction0.d1422e.gmnotes b/objects/AllPlayerCards.15bb07/ElaborateDistraction.d1422e.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/ElaborateDistraction0.d1422e.gmnotes
rename to objects/AllPlayerCards.15bb07/ElaborateDistraction.d1422e.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/ElaborateDistraction0.d1422e.json b/objects/AllPlayerCards.15bb07/ElaborateDistraction.d1422e.json
similarity index 90%
rename from objects/AllPlayerCards.15bb07/ElaborateDistraction0.d1422e.json
rename to objects/AllPlayerCards.15bb07/ElaborateDistraction.d1422e.json
index 23738b6b3..3f0fe1780 100644
--- a/objects/AllPlayerCards.15bb07/ElaborateDistraction0.d1422e.json
+++ b/objects/AllPlayerCards.15bb07/ElaborateDistraction.d1422e.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/ElaborateDistraction0.d1422e.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/ElaborateDistraction.d1422e.gmnotes",
   "GUID": "d1422e",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Elaborate Distraction (0)",
+  "Nickname": "Elaborate Distraction",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/Katana0.f5beb5.gmnotes b/objects/AllPlayerCards.15bb07/Katana.f5beb5.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/Katana0.f5beb5.gmnotes
rename to objects/AllPlayerCards.15bb07/Katana.f5beb5.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/Katana0.f5beb5.json b/objects/AllPlayerCards.15bb07/Katana.f5beb5.json
similarity index 92%
rename from objects/AllPlayerCards.15bb07/Katana0.f5beb5.json
rename to objects/AllPlayerCards.15bb07/Katana.f5beb5.json
index 3276fdfde..fbeb81aaf 100644
--- a/objects/AllPlayerCards.15bb07/Katana0.f5beb5.json
+++ b/objects/AllPlayerCards.15bb07/Katana.f5beb5.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/Katana0.f5beb5.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/Katana.f5beb5.gmnotes",
   "GUID": "f5beb5",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Katana (0)",
+  "Nickname": "Katana",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/Lightfooted0.fe1fb6.gmnotes b/objects/AllPlayerCards.15bb07/Lightfooted.fe1fb6.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/Lightfooted0.fe1fb6.gmnotes
rename to objects/AllPlayerCards.15bb07/Lightfooted.fe1fb6.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/Lightfooted0.fe1fb6.json b/objects/AllPlayerCards.15bb07/Lightfooted.fe1fb6.json
similarity index 92%
rename from objects/AllPlayerCards.15bb07/Lightfooted0.fe1fb6.json
rename to objects/AllPlayerCards.15bb07/Lightfooted.fe1fb6.json
index a46b42387..3241aa579 100644
--- a/objects/AllPlayerCards.15bb07/Lightfooted0.fe1fb6.json
+++ b/objects/AllPlayerCards.15bb07/Lightfooted.fe1fb6.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/Lightfooted0.fe1fb6.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/Lightfooted.fe1fb6.gmnotes",
   "GUID": "fe1fb6",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Lightfooted (0)",
+  "Nickname": "Lightfooted",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/Matchbox0.b533db.gmnotes b/objects/AllPlayerCards.15bb07/Matchbox.b533db.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/Matchbox0.b533db.gmnotes
rename to objects/AllPlayerCards.15bb07/Matchbox.b533db.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/Matchbox0.b533db.json b/objects/AllPlayerCards.15bb07/Matchbox.b533db.json
similarity index 92%
rename from objects/AllPlayerCards.15bb07/Matchbox0.b533db.json
rename to objects/AllPlayerCards.15bb07/Matchbox.b533db.json
index eaec5c2f0..a7a04a325 100644
--- a/objects/AllPlayerCards.15bb07/Matchbox0.b533db.json
+++ b/objects/AllPlayerCards.15bb07/Matchbox.b533db.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/Matchbox0.b533db.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/Matchbox.b533db.gmnotes",
   "GUID": "b533db",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Matchbox (0)",
+  "Nickname": "Matchbox",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/RodofCarnamagos0.66ec64.gmnotes b/objects/AllPlayerCards.15bb07/RodofCarnamagos.66ec64.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/RodofCarnamagos0.66ec64.gmnotes
rename to objects/AllPlayerCards.15bb07/RodofCarnamagos.66ec64.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/RodofCarnamagos0.66ec64.json b/objects/AllPlayerCards.15bb07/RodofCarnamagos.66ec64.json
similarity index 91%
rename from objects/AllPlayerCards.15bb07/RodofCarnamagos0.66ec64.json
rename to objects/AllPlayerCards.15bb07/RodofCarnamagos.66ec64.json
index 4ac48de5c..9aa1fb74d 100644
--- a/objects/AllPlayerCards.15bb07/RodofCarnamagos0.66ec64.json
+++ b/objects/AllPlayerCards.15bb07/RodofCarnamagos.66ec64.json
@@ -24,7 +24,7 @@
   },
   "Description": "Scepter of the Mad Seer",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/RodofCarnamagos0.66ec64.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/RodofCarnamagos.66ec64.gmnotes",
   "GUID": "66ec64",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Rod of Carnamagos (0)",
+  "Nickname": "Rod of Carnamagos",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/StirthePot0.c25479.gmnotes b/objects/AllPlayerCards.15bb07/StirthePot.c25479.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/StirthePot0.c25479.gmnotes
rename to objects/AllPlayerCards.15bb07/StirthePot.c25479.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/StirthePot0.c25479.json b/objects/AllPlayerCards.15bb07/StirthePot.c25479.json
similarity index 92%
rename from objects/AllPlayerCards.15bb07/StirthePot0.c25479.json
rename to objects/AllPlayerCards.15bb07/StirthePot.c25479.json
index 0e8334dbc..d37d6e209 100644
--- a/objects/AllPlayerCards.15bb07/StirthePot0.c25479.json
+++ b/objects/AllPlayerCards.15bb07/StirthePot.c25479.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/StirthePot0.c25479.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/StirthePot.c25479.gmnotes",
   "GUID": "c25479",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Stir the Pot (0)",
+  "Nickname": "Stir the Pot",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/TaskForce0.a5c06a.gmnotes b/objects/AllPlayerCards.15bb07/TaskForce.a5c06a.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/TaskForce0.a5c06a.gmnotes
rename to objects/AllPlayerCards.15bb07/TaskForce.a5c06a.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/TaskForce0.a5c06a.json b/objects/AllPlayerCards.15bb07/TaskForce.a5c06a.json
similarity index 92%
rename from objects/AllPlayerCards.15bb07/TaskForce0.a5c06a.json
rename to objects/AllPlayerCards.15bb07/TaskForce.a5c06a.json
index f91f13a77..50d22aa86 100644
--- a/objects/AllPlayerCards.15bb07/TaskForce0.a5c06a.json
+++ b/objects/AllPlayerCards.15bb07/TaskForce.a5c06a.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/TaskForce0.a5c06a.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/TaskForce.a5c06a.gmnotes",
   "GUID": "a5c06a",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Task Force (0)",
+  "Nickname": "Task Force",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/TestingSprint0.a4846b.gmnotes b/objects/AllPlayerCards.15bb07/TestingSprint.a4846b.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/TestingSprint0.a4846b.gmnotes
rename to objects/AllPlayerCards.15bb07/TestingSprint.a4846b.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/TestingSprint0.a4846b.json b/objects/AllPlayerCards.15bb07/TestingSprint.a4846b.json
similarity index 91%
rename from objects/AllPlayerCards.15bb07/TestingSprint0.a4846b.json
rename to objects/AllPlayerCards.15bb07/TestingSprint.a4846b.json
index e2c62c781..dfdacf061 100644
--- a/objects/AllPlayerCards.15bb07/TestingSprint0.a4846b.json
+++ b/objects/AllPlayerCards.15bb07/TestingSprint.a4846b.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/TestingSprint0.a4846b.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/TestingSprint.a4846b.gmnotes",
   "GUID": "a4846b",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Testing Sprint (0)",
+  "Nickname": "Testing Sprint",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/objects/AllPlayerCards.15bb07/ThoroughInquiry0.c6b644.gmnotes b/objects/AllPlayerCards.15bb07/ThoroughInquiry.c6b644.gmnotes
similarity index 100%
rename from objects/AllPlayerCards.15bb07/ThoroughInquiry0.c6b644.gmnotes
rename to objects/AllPlayerCards.15bb07/ThoroughInquiry.c6b644.gmnotes
diff --git a/objects/AllPlayerCards.15bb07/ThoroughInquiry0.c6b644.json b/objects/AllPlayerCards.15bb07/ThoroughInquiry.c6b644.json
similarity index 91%
rename from objects/AllPlayerCards.15bb07/ThoroughInquiry0.c6b644.json
rename to objects/AllPlayerCards.15bb07/ThoroughInquiry.c6b644.json
index 08d67a7d7..5448f9e21 100644
--- a/objects/AllPlayerCards.15bb07/ThoroughInquiry0.c6b644.json
+++ b/objects/AllPlayerCards.15bb07/ThoroughInquiry.c6b644.json
@@ -24,7 +24,7 @@
   },
   "Description": "",
   "DragSelectable": true,
-  "GMNotes_path": "AllPlayerCards.15bb07/ThoroughInquiry0.c6b644.gmnotes",
+  "GMNotes_path": "AllPlayerCards.15bb07/ThoroughInquiry.c6b644.gmnotes",
   "GUID": "c6b644",
   "Grid": true,
   "GridProjection": false,
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Card",
-  "Nickname": "Thorough Inquiry (0)",
+  "Nickname": "Thorough Inquiry",
   "SidewaysCard": false,
   "Snap": true,
   "Sticky": true,
diff --git a/src/core/CustomDataHelper.ttslua b/src/core/CustomDataHelper.ttslua
index 22bc30964..063931ac6 100644
--- a/src/core/CustomDataHelper.ttslua
+++ b/src/core/CustomDataHelper.ttslua
@@ -23,7 +23,7 @@ LOCATIONS_DATA_JSON = [[
 
 PLAYER_CARD_DATA_JSON = [[
 {
-  "Tool Belt (0)": {
+  "Tool Belt": {
     "tokenType": "resource",
     "tokenCount": 2
   },