3 files changed, 8 insertions, 8 deletions
diff --git a/json/recipes/000shot.json b/json/recipes/000shot.json
index 3b6118e..298587d 100644
--- a/json/recipes/000shot.json
+++ b/json/recipes/000shot.json
@@ -13,7 +13,7 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 12 ], [ "ammo_000_shot", 1 ] ],
-    "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ]
+    "components": [ [ [ "gunpowder", 6 ] ] ]
   },
   {
     "result": "reloaded_shot_000_inc",
@@ -29,7 +29,7 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 12 ], [ "ammo_000_shot", 1 ] ],
-    "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ], [ "gunpowder_shotgun", 5 ] ], [ [ "incendiary", 5 ] ] ]
+    "components": [ [ [ "gunpowder", 5 ] ], [ [ "incendiary", 5 ] ] ]
   },
   {
     "result": "reloaded_shot_000_flechette",
@@ -45,7 +45,7 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "shot_forming", 1 ], [ "ammo_000_shot", 1 ] ],
-    "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 12 ] ] ]
+    "components": [ [ [ "gunpowder", 6 ] ], [ [ "combatnail", 12 ] ] ]
   },
   {
     "result": "reloaded_shot_000_slug",
@@ -61,6 +61,6 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 24 ], [ "ammo_000_shot", 1 ] ],
-    "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ]
+    "components": [ [ [ "gunpowder", 6 ] ] ]
   }
 ]
diff --git a/json/recipes/473.json b/json/recipes/473.json
index 42f7d47..19c764f 100644
--- a/json/recipes/473.json
+++ b/json/recipes/473.json
@@ -17,7 +17,7 @@
     "components": [
       [ [ "473mm_mold", 1 ] ],
       [ [ "smrifle_primer", 1 ] ],
-      [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ] ],
+      [ [ "gunpowder", 6 ] ],
       [ [ "copper", 1 ] ]
     ]
   },
diff --git a/json/uncraft/000shot.json b/json/uncraft/000shot.json
index a639af7..39ae0c8 100644
--- a/json/uncraft/000shot.json
+++ b/json/uncraft/000shot.json
@@ -6,7 +6,7 @@
     "difficulty": 5,
     "time": "1 s",
     "qualities": [ { "id": "PULL", "level": 1 } ],
-    "components": [ [ [ "000shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 6 ] ], [ [ "lead", 10 ] ] ],
+    "components": [ [ [ "000shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "lead", 10 ] ] ],
     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
   },
   {
@@ -16,7 +16,7 @@
     "difficulty": 5,
     "time": "1 s",
     "qualities": [ { "id": "PULL", "level": 1 } ],
-    "components": [ [ [ "000shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 10 ] ] ],
+    "components": [ [ [ "000shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "combatnail", 10 ] ] ],
     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
   },
   {
@@ -26,7 +26,7 @@
     "difficulty": 5,
     "time": "1 s",
     "qualities": [ { "id": "PULL", "level": 1 } ],
-    "components": [ [ [ "000shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 6 ] ], [ [ "lead", 20 ] ] ],
+    "components": [ [ [ "000shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "lead", 20 ] ] ],
     "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
   }
 ]