diff --git a/region/lowernorfair/east/Red Kihunter Shaft.json b/region/lowernorfair/east/Red Kihunter Shaft.json
index 55458b15e..b9af45321 100644
--- a/region/lowernorfair/east/Red Kihunter Shaft.json	
+++ b/region/lowernorfair/east/Red Kihunter Shaft.json	
@@ -1089,29 +1089,23 @@
     {
       "id": 33,
       "link": [3, 7],
-      "name": "Wave Plasma Kill (Bottom)",
+      "name": "Plasma Kill (Bottom)",
       "requires": [
-        "Wave",
+        {"or": [
+          "Wave",
+          {"and": [
+            "canDodgeWhileShooting",
+            {"heatFrames": 60}
+          ]}
+        ]},
         "Plasma",
         {"heatFrames": 300}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
-      "note": "Immediately move left to the end of the runway to prevent the Kihunter from descending."
-    },
-    {
-      "link": [3, 7],
-      "name": "Plasma Kihunter Kill (Bottom)",
-      "requires": [
-        "canDodgeWhileShooting",
-        "Plasma",
-        {"heatFrames": 360}
-      ],
-      "flashSuitChecked": true,
-      "blueSuitChecked": true,
       "note": [
         "Immediately move left to the end of the runway to prevent the Kihunter from descending.",
-        "Fire shots upward through the edge of the platform while standing safely under the ledge."
+        "The Kihunter can be safely killed without Wave by firing shots up through the edge of the platform."
       ]
     },
     {
@@ -1985,7 +1979,7 @@
     {
       "id": 65,
       "link": [7, 5],
-      "name": "Slow Kihunter Kill",
+      "name": "Slow Kihunter Kill (Top)",
       "requires": [
         "h_heatProof",
         "canBePatient",
@@ -2011,7 +2005,7 @@
     {
       "id": 66,
       "link": [7, 5],
-      "name": "Tank the Damage",
+      "name": "Tank the Damage (Top)",
       "requires": [
         "canDash",
         {"enemyDamage": {"enemy": "Kihunter (red)", "type": "contact", "hits": 2}},
@@ -2024,7 +2018,7 @@
     {
       "id": 67,
       "link": [7, 5],
-      "name": "Super Kill",
+      "name": "Super Kill (Top)",
       "requires": [
         "canDash",
         {"enemyKill": {
@@ -2039,7 +2033,7 @@
     {
       "id": 68,
       "link": [7, 5],
-      "name": "Ice Wave Spazer Kill",
+      "name": "Ice Wave Spazer Kill (Top)",
       "requires": [
         "canDash",
         "Wave",
@@ -2053,20 +2047,30 @@
     {
       "id": 69,
       "link": [7, 5],
-      "name": "Wave Plasma Kill",
+      "name": "Plasma Kill (Top)",
       "requires": [
         "canDash",
-        "Wave",
+        {"or": [
+          "Wave",
+          {"and": [
+            "canDodgeWhileShooting",
+            {"heatFrames": 160}
+          ]}
+        ]},
         "Plasma",
         {"heatFrames": 840}
       ],
       "flashSuitChecked": true,
-      "blueSuitChecked": true
+      "blueSuitChecked": true,
+      "note": [
+        "The top Kihunter can be safely killed without Wave by firing shots up through the edge of the upper platform.",
+        "It's faster if the top Kihunter descends, because some shots will hit both enemies."
+      ]
     },
     {
       "id": 70,
       "link": [7, 5],
-      "name": "Screw Kill",
+      "name": "Screw Kill (Top)",
       "requires": [
         "canDash",
         "ScrewAttack",