diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index e98ff0c23..f4cfeae2b 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -779,10 +779,7 @@
         "canRiskySpikeSuit",
         {"shinespark": {"frames": 12, "excessFrames": 12}}
       ],
-      "flashSuitChecked": true,
-      "devNote": [
-        "The `canBeVeryPatient` is for difficulty placement, as it may be required to get in a single attempt."
-      ]
+      "flashSuitChecked": true
     },
     {
       "id": 24,
@@ -1085,7 +1082,7 @@
         ]},
         {"shineChargeFrames": 80},
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "resetsObstacles": ["A", "B", "R-Mode"],
@@ -1119,7 +1116,7 @@
           ]}
         ]},
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "resetsObstacles": ["A", "B", "R-Mode"],
@@ -1765,7 +1762,7 @@
         ]},
         {"shineChargeFrames": 60},
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "resetsObstacles": ["A", "B", "R-Mode"],
@@ -1799,7 +1796,7 @@
           ]}
         ]},
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "resetsObstacles": ["A", "B", "R-Mode"],
diff --git a/region/brinstar/kraid/Kraid Eye Door Room.json b/region/brinstar/kraid/Kraid Eye Door Room.json
index df10ac44a..0ad51cf03 100644
--- a/region/brinstar/kraid/Kraid Eye Door Room.json	
+++ b/region/brinstar/kraid/Kraid Eye Door Room.json	
@@ -200,7 +200,7 @@
       "requires": [
         {"shineChargeFrames": 75},
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 4, "excessFrames": 4}}
       ],
       "flashSuitChecked": true,
@@ -218,7 +218,7 @@
       },
       "requires": [
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 4, "excessFrames": 4}}
       ],
       "flashSuitChecked": true,
@@ -235,7 +235,7 @@
         "canUseFlashSuitInitialSpark",
         {"shineChargeFrames": 125},
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 19}}
       ],
       "exitCondition": {
@@ -265,7 +265,7 @@
       "requires": [
         "canUseFlashSuitInitialSpark",
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 19}}
       ],
       "exitCondition": {
@@ -291,7 +291,7 @@
         "canUseFlashSuitInitialSpark",
         "canTrickyCarryFlashSuit",
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 19}}
       ],
       "exitCondition": {
@@ -822,7 +822,7 @@
         "canDownBack",
         "canShinechargeMovementTricky",
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 19}}
       ],
       "exitCondition": {
@@ -908,7 +908,7 @@
         "canDownBack",
         "canShinechargeMovementTricky",
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 4, "excessFrames": 4}}
       ],
       "flashSuitChecked": true,
@@ -1266,7 +1266,7 @@
       "requires": [
         {"shineChargeFrames": 65},
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 5, "excessFrames": 5}}
       ],
       "flashSuitChecked": true,
@@ -1284,7 +1284,7 @@
       },
       "requires": [
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 5, "excessFrames": 5}}
       ],
       "flashSuitChecked": true,
@@ -1301,7 +1301,7 @@
         "canUseFlashSuitInitialSpark",
         {"shineChargeFrames": 105},
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 13}}
       ],
       "exitCondition": {
@@ -1331,7 +1331,7 @@
       "requires": [
         "canUseFlashSuitInitialSpark",
         {"thornHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 13}}
       ],
       "exitCondition": {
diff --git a/region/brinstar/red/Below Spazer.json b/region/brinstar/red/Below Spazer.json
index d5affdee3..211f7c9e0 100644
--- a/region/brinstar/red/Below Spazer.json	
+++ b/region/brinstar/red/Below Spazer.json	
@@ -116,7 +116,7 @@
         ]},
         {"thornHits": 1},
         "h_spikeSuitThornHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 5, "excessFrames": 5}}
       ],
       "flashSuitChecked": true
@@ -591,7 +591,7 @@
         ]},
         {"thornHits": 1},
         "h_spikeSuitThornHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 5, "excessFrames": 5}}
       ],
       "flashSuitChecked": true
diff --git a/region/brinstar/red/Skree Boost Room.json b/region/brinstar/red/Skree Boost Room.json
index 560b4537a..ebbba722a 100644
--- a/region/brinstar/red/Skree Boost Room.json	
+++ b/region/brinstar/red/Skree Boost Room.json	
@@ -235,7 +235,7 @@
         {"shineChargeFrames": 155},
         {"thornHits": 1},
         "h_spikeSuitThornHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 7, "excessFrames": 7}}
       ],
       "flashSuitChecked": true
@@ -577,7 +577,7 @@
         {"shineChargeFrames": 60},
         {"thornHits": 1},
         "h_spikeSuitThornHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 7, "excessFrames": 7}}
       ],
       "flashSuitChecked": true
@@ -589,9 +589,7 @@
       "requires": [
         "Gravity",
         "h_thornXModeSpikeSuit",
-        "h_spikeSuitThornHitLeniency",
         "h_thornXModeFramePerfectExtraLeniency",
-        "canSpikeSuit",
         {"shinespark": {"frames": 7, "excessFrames": 7}}
       ],
       "flashSuitChecked": true
diff --git a/region/crateria/central/Crateria Power Bomb Room.json b/region/crateria/central/Crateria Power Bomb Room.json
index 073a675bd..145fc9667 100644
--- a/region/crateria/central/Crateria Power Bomb Room.json	
+++ b/region/crateria/central/Crateria Power Bomb Room.json	
@@ -174,7 +174,7 @@
         "canMidAirMorph",
         "h_spikeSuitSpikeHitLeniency",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canTrickySpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "flashSuitChecked": true
@@ -225,7 +225,7 @@
         "canMidAirMorph",
         "h_spikeSuitSpikeHitLeniency",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canTrickySpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "flashSuitChecked": true
diff --git a/region/lowernorfair/east/Wasteland.json b/region/lowernorfair/east/Wasteland.json
index 79eefac6e..dbc8b2b83 100644
--- a/region/lowernorfair/east/Wasteland.json
+++ b/region/lowernorfair/east/Wasteland.json
@@ -337,7 +337,7 @@
         {"shineChargeFrames": 140},
         "h_spikeSuitSpikeHitLeniency",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 4, "excessFrames": 4}}
       ],
       "flashSuitChecked": true
@@ -359,7 +359,7 @@
         ]},
         "h_spikeSuitSpikeHitLeniency",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 4, "excessFrames": 4}}
       ],
       "flashSuitChecked": true
@@ -550,7 +550,7 @@
         {"shineChargeFrames": 75},
         "h_spikeSuitSpikeHitLeniency",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 3, "excessFrames": 3}}
       ],
       "flashSuitChecked": true
@@ -750,7 +750,7 @@
         {"shineChargeFrames": 175},
         "h_spikeSuitSpikeHitLeniency",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canTrickySpikeSuit",
         {"shinespark": {"frames": 5, "excessFrames": 5}}
       ],
       "flashSuitChecked": true
@@ -1021,7 +1021,7 @@
         "canOffScreenMovement",
         "h_spikeSuitSpikeHitLeniency",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canTrickySpikeSuit",
         {"shinespark": {"frames": 4, "excessFrames": 4}}
       ],
       "flashSuitChecked": true
diff --git a/region/norfair/east/Spiky Platforms Tunnel.json b/region/norfair/east/Spiky Platforms Tunnel.json
index 599ee3989..df05f4169 100644
--- a/region/norfair/east/Spiky Platforms Tunnel.json	
+++ b/region/norfair/east/Spiky Platforms Tunnel.json	
@@ -93,7 +93,7 @@
         {"heatFrames": 750},
         {"shineChargeFrames": 75},
         "h_spikeSuitSpikeHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1}},
         {"lavaFrames": 40}
       ],
@@ -699,7 +699,7 @@
         {"heatFrames": 750},
         {"shineChargeFrames": 75},
         "h_spikeSuitSpikeHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1}},
         {"lavaFrames": 40}
       ],
diff --git a/region/wreckedship/main/Bowling Alley.json b/region/wreckedship/main/Bowling Alley.json
index 1046e8513..88c7fcce7 100644
--- a/region/wreckedship/main/Bowling Alley.json	
+++ b/region/wreckedship/main/Bowling Alley.json	
@@ -829,7 +829,7 @@
         {"shineChargeFrames": 65},
         {"spikeHits": 1},
         "h_spikeSuitSpikeHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 3, "excessFrames": 3}}
       ],
       "flashSuitChecked": true
@@ -847,7 +847,7 @@
         {"shineChargeFrames": 90},
         {"spikeHits": 1},
         "h_spikeSuitSpikeHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 7}}
       ],
       "exitCondition": {
diff --git a/region/wreckedship/main/Robot Assembly Line.json b/region/wreckedship/main/Robot Assembly Line.json
index 390f09cd0..0e8b0ff03 100644
--- a/region/wreckedship/main/Robot Assembly Line.json	
+++ b/region/wreckedship/main/Robot Assembly Line.json	
@@ -140,7 +140,7 @@
         {"shineChargeFrames": 75},
         {"thornHits": 1},
         "h_spikeSuitThornHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 6, "excessFrames": 6}}
       ],
       "flashSuitChecked": true
@@ -158,7 +158,7 @@
       "requires": [
         {"thornHits": 1},
         "h_spikeSuitThornHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 6, "excessFrames": 6}}
       ],
       "flashSuitChecked": true
diff --git a/region/wreckedship/main/Spiky Death Room.json b/region/wreckedship/main/Spiky Death Room.json
index b96319dcf..ba60e089c 100644
--- a/region/wreckedship/main/Spiky Death Room.json	
+++ b/region/wreckedship/main/Spiky Death Room.json	
@@ -73,7 +73,7 @@
         "f_DefeatedPhantoon",
         "h_spikeSuitSpikeHitLeniency",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "flashSuitChecked": true
@@ -92,7 +92,7 @@
         "canTrickyJump",
         "canComplexCarryFlashSuit",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "flashSuitChecked": true
@@ -908,7 +908,7 @@
         "f_DefeatedPhantoon",
         "h_spikeSuitSpikeHitLeniency",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "flashSuitChecked": true
@@ -927,7 +927,7 @@
         "canTrickyJump",
         "canComplexCarryFlashSuit",
         {"spikeHits": 1},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "flashSuitChecked": true
diff --git a/region/wreckedship/main/Wrecked Ship East Super Room.json b/region/wreckedship/main/Wrecked Ship East Super Room.json
index e9b9373ff..e0d7e2113 100644
--- a/region/wreckedship/main/Wrecked Ship East Super Room.json	
+++ b/region/wreckedship/main/Wrecked Ship East Super Room.json	
@@ -414,7 +414,7 @@
           "canShinechargeMovementTricky",
           {"thornHits": 3}
         ]},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "flashSuitChecked": true
@@ -433,7 +433,7 @@
             {"shineChargeFrames": 55},
             {"spikeHits": 1},
             "h_spikeSuitSpikeHitLeniency",
-            "canSpikeSuit",
+            "canPatientSpikeSuit",
             {"shinespark": {"frames": 4, "excessFrames": 4}}
           ]},
           {"and": [
@@ -445,7 +445,7 @@
             ]},
             {"thornHits": 1},
             "h_spikeSuitThornHitLeniency",
-            "canSpikeSuit",
+            "canPatientSpikeSuit",
             {"shinespark": {"frames": 1, "excessFrames": 1}}
           ]}
         ]}
diff --git a/region/wreckedship/main/Wrecked Ship Main Shaft.json b/region/wreckedship/main/Wrecked Ship Main Shaft.json
index 640abbdd1..23054bf22 100644
--- a/region/wreckedship/main/Wrecked Ship Main Shaft.json	
+++ b/region/wreckedship/main/Wrecked Ship Main Shaft.json	
@@ -2274,7 +2274,7 @@
         {"shineChargeFrames": 55},
         {"thornHits": 1},
         "h_spikeSuitThornHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "flashSuitChecked": true