diff --git a/code/datums/trading/food.dm b/code/datums/trading/food.dm
index 11387871e4f..ab927688c45 100644
--- a/code/datums/trading/food.dm
+++ b/code/datums/trading/food.dm
@@ -251,7 +251,7 @@
 		/obj/item/reagent_containers/food/drinks/bottle/treebark_firewater   = TRADER_THIS_TYPE,
 		/obj/item/reagent_containers/food/drinks/bottle/veterans_choice      = TRADER_THIS_TYPE,
 		/obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water  = TRADER_THIS_TYPE,
-		/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor       = TRADER_THIS_TYPE,
+		/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor       = TRADER_THIS_TYPE,
 		/obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine    = TRADER_THIS_TYPE,
 		/obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz       = TRADER_THIS_TYPE,
 		/obj/item/reagent_containers/food/drinks/bottle/hrozamal_soda        = TRADER_THIS_TYPE
diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm
index f89d083ac35..c06fc201c94 100644
--- a/code/game/machinery/vending_types.dm
+++ b/code/game/machinery/vending_types.dm
@@ -946,7 +946,7 @@
 		/obj/item/seeds/limeseed = 3,
 		/obj/item/seeds/mtearseed = 3,
 		/obj/item/seeds/mintseed = 3,
-		/obj/item/seeds/nifberries = 2,
+		/obj/item/seeds/dirtberries = 2,
 		/obj/item/seeds/onionseed = 3,
 		/obj/item/seeds/oracleseed = 3,
 		/obj/item/seeds/orangeseed = 3,
@@ -1030,7 +1030,7 @@
 		/obj/item/seeds/limeseed = 50,
 		/obj/item/seeds/mtearseed = 60,
 		/obj/item/seeds/mintseed = 70,
-		/obj/item/seeds/nifberries = 70,
+		/obj/item/seeds/dirtberries = 70,
 		/obj/item/seeds/onionseed = 30,
 		/obj/item/seeds/oracleseed = 50,
 		/obj/item/seeds/orangeseed = 40,
diff --git a/code/modules/cargo/bounties/hydroponics.dm b/code/modules/cargo/bounties/hydroponics.dm
index 74a80baac03..b195953386f 100644
--- a/code/modules/cargo/bounties/hydroponics.dm
+++ b/code/modules/cargo/bounties/hydroponics.dm
@@ -88,10 +88,10 @@
 				/datum/seed/watermelon,
 				/datum/seed/citrus,
 				/datum/seed/cherries,
-				/datum/seed/nifberries,
+				/datum/seed/dirtberries,
 				/datum/seed/dyn,
 				/datum/seed/wulumunusha,
-				/datum/seed/nmshaan)
+				/datum/seed/sugartree)
 
 /datum/bounty/item/hydroponicist/produce/mushroom
 	name = "Produce - Mushrooms"
diff --git a/code/modules/cargo/items/hospitality.dm b/code/modules/cargo/items/hospitality.dm
index bbb8b1bb32b..fbc1dd8c22d 100644
--- a/code/modules/cargo/items/hospitality.dm
+++ b/code/modules/cargo/items/hospitality.dm
@@ -1540,14 +1540,14 @@
 	groupable = TRUE
 	spawn_amount = 1
 
-/singleton/cargo_item/nmshaan_liquor
+/singleton/cargo_item/sugartree_liquor
 	category = "hospitality"
-	name = "Nm'shaan Liquor"
+	name = "Sugar Tree Liquor"
 	supplier = "getmore"
-	description = "A strong Adhomian liquor reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking."
+	description = "Called Nm'shaan Liquor in native Siik'maas, this strong Adhomian liquor is reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking."
 	price = 200
 	items = list(
-		/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor
+		/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor
 	)
 	access = 0
 	container_type = "crate"
diff --git a/code/modules/cooking/recipes/cultural/recipes_tajara.dm b/code/modules/cooking/recipes/cultural/recipes_tajara.dm
index 70b3591e4e7..df12fc98bd1 100644
--- a/code/modules/cooking/recipes/cultural/recipes_tajara.dm
+++ b/code/modules/cooking/recipes/cultural/recipes_tajara.dm
@@ -1,7 +1,7 @@
 // Tajaran breads
 /singleton/recipe/tajaran_bread
 	appliance = OVEN
-	fruit = list("nifberries" = 1)
+	fruit = list("dirtberries" = 1)
 	reagents = list(/singleton/reagent/spacespice = 1)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/flatbread
@@ -22,7 +22,7 @@
 // Tajaran peasant food
 /singleton/recipe/tajaran_stew
 	appliance = SAUCEPAN | POT
-	fruit = list("nifberries" = 2, "mushroom" = 1, "mtear" = 1)
+	fruit = list("dirtberries" = 2, "mushroom" = 1, "mtear" = 1)
 	reagents = list(/singleton/reagent/water = 10)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/meat/adhomai,
@@ -51,7 +51,7 @@
 		/obj/item/reagent_containers/food/snacks/meat/adhomai,
 		/obj/item/stack/rods
 	)
-	fruit = list("earthenroot" = 1, "nifberries" = 1)
+	fruit = list("earthenroot" = 1, "dirtberries" = 1)
 	result = /obj/item/reagent_containers/food/snacks/nomadskewer
 
 /datum/chemical_reaction/fermentedworm
@@ -106,7 +106,7 @@
 
 /singleton/recipe/earthenroot_salad
 	appliance = MIX
-	fruit = list("earthenroot" = 1, "mtear" = 2, "nifberries" = 1)
+	fruit = list("earthenroot" = 1, "mtear" = 2, "dirtberries" = 1)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/dip/sarmikhir
 	)
@@ -226,7 +226,7 @@
 /singleton/recipe/dirt_roast
 	appliance = OVEN
 	reagents = list(/singleton/reagent/spacespice = 1, /singleton/reagent/sugar = 5)
-	fruit = list("nifberries" = 1)
+	fruit = list("dirtberries" = 1)
 	result = /obj/item/reagent_containers/food/snacks/dirt_roast
 
 /singleton/recipe/fatshouter_fillet
@@ -253,7 +253,7 @@
 
 /singleton/recipe/creamice
 	reagents = list(/singleton/reagent/drink/milk/adhomai = 10, /singleton/reagent/sugar = 10, /singleton/reagent/drink/ice = 10)
-	fruit = list("nifberries" = 1)
+	fruit = list("dirtberries" = 1)
 	result = /obj/item/reagent_containers/food/snacks/creamice
 
 /singleton/recipe/stuffed_earthenroot
@@ -278,7 +278,7 @@
 
 /singleton/recipe/scoutration
 	appliance = OVEN
-	fruit = list("nifberries" = 2)
+	fruit = list("dirtberries" = 2)
 	reagents = list(/singleton/reagent/sodiumchloride = 1)
 	reagent_mix = RECIPE_REAGENT_REPLACE
 	items = list(
@@ -321,7 +321,7 @@
 // Tajaran candy
 /singleton/recipe/tajcandy
 	appliance = OVEN
-	fruit = list("nmshaan" = 2)
+	fruit = list("sugartree" = 2)
 	reagents = list(/singleton/reagent/drink/milk/adhomai = 5, /singleton/reagent/nutriment/protein/egg = 3)
 	reagent_mix = RECIPE_REAGENT_REPLACE
 	items = list(
@@ -338,14 +338,14 @@
 
 /singleton/recipe/tajhummus
 	appliance = MIX
-	fruit = list("mtear" = 1, "nifberries" = 1)
+	fruit = list("mtear" = 1, "dirtberries" = 1)
 	reagents = list(/singleton/reagent/spacespice = 1, /singleton/reagent/nutriment/flour/nfrihi = 5)
 	result = /obj/item/reagent_containers/food/snacks/dip/tajhummus
 
 // Tajaran gelatin-based food
 /singleton/recipe/seafoodmousse
 	appliance = MIX
-	fruit = list("nifberries" = 1)
+	fruit = list("dirtberries" = 1)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/clam,
 		/obj/item/reagent_containers/food/snacks/clam,
@@ -357,14 +357,14 @@
 
 /singleton/recipe/vegello
 	appliance = MIX
-	fruit = list("nifberries" = 2, "earthenroot" = 2, "mtear" = 2)
+	fruit = list("dirtberries" = 2, "earthenroot" = 2, "mtear" = 2)
 	reagents = list(/singleton/reagent/nutriment/gelatin = 10, /singleton/reagent/water = 5, /singleton/reagent/spacespice = 1)
 	reagent_mix = RECIPE_REAGENT_REPLACE
 	result = /obj/item/reagent_containers/food/snacks/sliceable/vegello
 
 /singleton/recipe/fruitgello
 	appliance = MIX
-	fruit = list("nmshaan" = 2, "nifberries" = 1)
+	fruit = list("sugartree" = 2, "dirtberries" = 1)
 	reagents = list(/singleton/reagent/nutriment/gelatin = 10, /singleton/reagent/water = 5, /singleton/reagent/sugar = 5, /singleton/reagent/drink/milk/cream = 5)
 	reagent_mix = RECIPE_REAGENT_REPLACE
 	result = /obj/item/reagent_containers/food/snacks/fruitgello
@@ -385,7 +385,7 @@
 
 /singleton/recipe/fatshouterbake
 	appliance = OVEN
-	fruit = list("nmshaan" = 2)
+	fruit = list("sugartree" = 2)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/adhomian_can,
 		/obj/item/reagent_containers/food/snacks/adhomian_can
@@ -396,7 +396,7 @@
 
 /singleton/recipe/crownfurter
 	appliance = OVEN
-	fruit = list("nifberries" = 1)
+	fruit = list("dirtberries" = 1)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/adhomian_sausage,
 		/obj/item/reagent_containers/food/snacks/adhomian_sausage,
diff --git a/code/modules/hydroponics/seed_datums/adhomai.dm b/code/modules/hydroponics/seed_datums/adhomai.dm
index 8046ab5c5b0..b185f59ba2c 100644
--- a/code/modules/hydroponics/seed_datums/adhomai.dm
+++ b/code/modules/hydroponics/seed_datums/adhomai.dm
@@ -76,16 +76,16 @@
 /obj/item/seeds/earthenroot
 	seed_type = "earthenroot"
 
-/datum/seed/nifberries
-	name = "nifberries"
-	seed_name = "dirt berries"
+/datum/seed/dirtberries
+	name = "dirtberries"
+	seed_name = "dirtberries"
 	display_name = "dirt berries shrub"
 	product_desc = "a pile of Adhomian berries used by the Tajara for its oil."
 	product_desc_extended = "An above-ground evergreen shrub that grows sweet, starchy legumes underground in thick pods. 'Dirt Berries', or Zhu'hagha Nifs, grow like peanuts but bear several nuts like peas in a pod, typically around 8 thumb-sized nifs in each pod. Their flavor is rich, fatty, and savory, and they are used to produce oil."
 	chems = list(/singleton/reagent/nutriment = list(0, 15), /singleton/reagent/nutriment/triglyceride/oil = list(1, 5), /singleton/reagent/drink/dirtberryjuice = list(10,10))
-	kitchen_tag = "nifberries"
+	kitchen_tag = "dirtberries"
 
-/datum/seed/nifberries/setup_traits()
+/datum/seed/dirtberries/setup_traits()
 	..()
 	set_trait(TRAIT_HARVEST_REPEAT, 1)
 	set_trait(TRAIT_JUICY, 1)
@@ -101,8 +101,8 @@
 	set_trait(TRAIT_WATER_CONSUMPTION, 6)
 	set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
 
-/obj/item/seeds/nifberries
-	seed_type = "nifberries"
+/obj/item/seeds/dirtberries
+	seed_type = "dirtberries"
 
 /datum/seed/mushroom/nfrihi
 	name = "nfrihi"
@@ -133,8 +133,8 @@
 /obj/item/seeds/blizzard
 	seed_type = "nfrihi"
 
-/datum/seed/nmshaan
-	name = "nmshaan"
+/datum/seed/sugartree
+	name = "sugar tree"
 	seed_name = "sugar tree"
 	display_name = "sugar trees"
 	product_desc = "the fruit of the Sugar Tree, native to Adhomai. It is sweet and commonly used in candies."
@@ -142,21 +142,21 @@
 	seed_noun = SEED_NOUN_SEEDS
 	mutants = null
 	chems = list(/singleton/reagent/sugar = list(2, 10), /singleton/reagent/nutriment/gelatin = list(2, 5))
-	kitchen_tag = "nmshaan"
+	kitchen_tag = "sugartree"
 
-/datum/seed/nmshaan/setup_traits()
+/datum/seed/sugartree/setup_traits()
 	..()
 	set_trait(TRAIT_HARVEST_REPEAT, 1)
 	set_trait(TRAIT_MATURATION, 9)
 	set_trait(TRAIT_PRODUCTION, 5)
 	set_trait(TRAIT_YIELD, 2)
-	set_trait(TRAIT_PRODUCT_ICON,"nmshaan")
+	set_trait(TRAIT_PRODUCT_ICON,"sugartree")
 	set_trait(TRAIT_PRODUCT_COLOUR,"#fffdf7")
 	set_trait(TRAIT_PLANT_COLOUR,"#31331c")
-	set_trait(TRAIT_PLANT_ICON,"nmshaan")
+	set_trait(TRAIT_PLANT_ICON,"sugartree")
 	set_trait(TRAIT_IDEAL_HEAT, 253)
 	set_trait(TRAIT_WATER_CONSUMPTION, 4)
 	set_trait(TRAIT_IDEAL_LIGHT, 3)
 
 /obj/item/seeds/sugartree
-	seed_type = "nmshaan"
+	seed_type = "sugartree"
diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index 3f57d1ecf0b..a6ecaf3f1a4 100644
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -292,7 +292,7 @@
 		/obj/item/seeds/cocoapodseed = 3,
 		/obj/item/seeds/coffeeseed = 3,
 		/obj/item/seeds/cornseed = 3,
-		/obj/item/seeds/nifberries = 2,
+		/obj/item/seeds/dirtberries = 2,
 		/obj/item/seeds/dynseed = 3,
 		/obj/item/seeds/earthenroot = 2,
 		/obj/item/seeds/eggplantseed = 3,
@@ -378,7 +378,7 @@
 		/obj/item/seeds/cocoapodseed = 3,
 		/obj/item/seeds/coffeeseed = 3,
 		/obj/item/seeds/cornseed = 3,
-		/obj/item/seeds/nifberries = 2,
+		/obj/item/seeds/dirtberries = 2,
 		/obj/item/seeds/dynseed = 3,
 		/obj/item/seeds/replicapod = 3,
 		/obj/item/seeds/earthenroot = 2,
diff --git a/code/modules/mapping/planet_types/lore/srandmarr.dm b/code/modules/mapping/planet_types/lore/srandmarr.dm
index 712154753fe..3bbcaaf2f32 100644
--- a/code/modules/mapping/planet_types/lore/srandmarr.dm
+++ b/code/modules/mapping/planet_types/lore/srandmarr.dm
@@ -154,7 +154,7 @@
 	water_color = "#b5dfeb"
 	generated_name = FALSE
 	ruin_planet_type = PLANET_LORE
-	small_flora_types = list(/datum/seed/shand, /datum/seed/mtear, /datum/seed/earthenroot, /datum/seed/nifberries, /datum/seed/mushroom/nfrihi, /datum/seed/nmshaan)
+	small_flora_types = list(/datum/seed/shand, /datum/seed/mtear, /datum/seed/earthenroot, /datum/seed/dirtberries, /datum/seed/mushroom/nfrihi, /datum/seed/sugartree)
 	ruin_type_whitelist = list (/datum/map_template/ruin/exoplanet/adhomai_hunting, /datum/map_template/ruin/exoplanet/adhomai_minefield, /datum/map_template/ruin/exoplanet/adhomai_village,
 	/datum/map_template/ruin/exoplanet/adhomai_abandoned_village, /datum/map_template/ruin/exoplanet/adhomai_battlefield, /datum/map_template/ruin/exoplanet/adhomai_cavern, /datum/map_template/ruin/exoplanet/adhomai_bar,
 	/datum/map_template/ruin/exoplanet/adhomai_war_memorial, /datum/map_template/ruin/exoplanet/adhomai_raskara_ritual, /datum/map_template/ruin/exoplanet/adhomai_raskariim_hideout, /datum/map_template/ruin/exoplanet/adhomai_cavern_geist,
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm
index 42d996e7d3a..f861647be3a 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/food_drink_species_tajara.dm
@@ -217,19 +217,19 @@
 	glass_name = "glass of shyyr kirr'tyr wine"
 	glass_desc = "Tajaran spirit infused with some eel-like Adhomian creature."
 
-/singleton/reagent/alcohol/nmshaan_liquor
-	name = "Nm'shaan Liquor"
+/singleton/reagent/alcohol/sugartree_liquor
+	name = "Sugar Tree Liquor"
 	color = "#FE6B03"
-	description = "A strong Adhomian liquor reserved for special occasions."
+	description = "A strong Adhomian nm'shaan liquor reserved for special occasions."
 	taste_description = "sweet and silky alcohol"
 
 	strength = 70
 
-	glass_icon_state = "nmshaanliquor_glass"
-	glass_name = "glass of nm'shaan liquor"
-	glass_desc = "A strong Adhomian liquor reserved for special occasions."
+	glass_icon_state = "sugartreeliquor_glass"
+	glass_name = "glass of sugar tree liquor"
+	glass_desc = "A strong nm'shaan Adhomian liquor reserved for special occasions."
 
-/singleton/reagent/alcohol/nmshaan_liquor/darmadhirbrew
+/singleton/reagent/alcohol/sugartree_liquor/darmadhirbrew
 	name = "Darmadhir Brew"
 	color = "#E4A769"
 	description = "A rare and expensive brand of nm'shaan liquor."
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index 5e480adb718..d2b0d3bc87a 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -839,14 +839,14 @@
 	Tajara consider the wine to be exotic or outright disgusting. The Shyyr Kirr'tyr is usually eaten after the beverage is imbibed."
 	reagents_to_add = list(/singleton/reagent/alcohol/shyyrkirrtyr_wine = 100)
 
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor
-	name = "nm'shaan liquor"
-	desc = "A strong Adhomian liquor reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking."
-	icon_state = "nmshaanliquor"
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor
+	name = "sugar tree liquor"
+	desc = "Also called nm'shaan liquor in native Siik'maas: a strong Adhomian liquor reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking."
+	icon_state = "sugartreeliquor"
 	center_of_mass = list("x" = 16,"y" = 5)
 	desc_extended = "An alcoholic drink manufactured from the fruit of the Nm'shaan plant. It usually has a high level of alcohol by volume. Nm'shaan liquor was once reserved for the \
 	consumption of the nobility; even today it is considered a decadent drink reserved for fancy occasions."
-	reagents_to_add = list(/singleton/reagent/alcohol/nmshaan_liquor = 100)
+	reagents_to_add = list(/singleton/reagent/alcohol/sugartree_liquor = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/veterans_choice
 	name = "veteran's choice"
@@ -875,7 +875,7 @@
 	desc_extended = "A famous variation of the Nm'shaan Liquor; it is described as one of Adhomai's finest spirits. It is produced solely by a small family-owned brewery in Miran'mir. Its \
 	recipe is a secret passed down through the generations of the Darmadhir household since immemorial times. The only living member of the family, Hazyr Darmadhir, is a 68 years old \
 	Tajara. His sole heir and son died in the Second Revolution after being drafted to fight for the royal army. Alcohol collectors stipulate that the brew's price will skyrocket after Hazyr's death."
-	reagents_to_add = list(/singleton/reagent/alcohol/nmshaan_liquor/darmadhirbrew = 100)
+	reagents_to_add = list(/singleton/reagent/alcohol/sugartree_liquor/darmadhirbrew = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/pulque
 	name = "Don Augusto's pulque"
diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm
index e2f6b3bd241..566e1d5f9b9 100644
--- a/code/modules/reagents/reagent_containers/food/lunch.dm
+++ b/code/modules/reagents/reagent_containers/food/lunch.dm
@@ -173,7 +173,7 @@ GLOBAL_LIST_INIT(lunchables_alcohol_reagents_, list(
 	/singleton/reagent/alcohol/pwine,
 	/singleton/reagent/alcohol/threemileisland,
 	/singleton/reagent/alcohol/toxins_special,
-	/singleton/reagent/alcohol/nmshaan_liquor/darmadhirbrew
+	/singleton/reagent/alcohol/sugartree_liquor/darmadhirbrew
 ))
 
 /proc/lunchables_lunches()
diff --git a/html/changelogs/Batrachophreno-IngredientNameConsistency.yml b/html/changelogs/Batrachophreno-IngredientNameConsistency.yml
new file mode 100644
index 00000000000..f6a7d3fa1dc
--- /dev/null
+++ b/html/changelogs/Batrachophreno-IngredientNameConsistency.yml
@@ -0,0 +1,59 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Batrachophreno
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - qol: "Updated instances of 'nifberries' to 'dirtberries' in recipes/ingredients/products for general consistency."
+  - qol: "Updated instances of 'nm'shaan' to 'sugar tree' in recipes/ingredients/products for general consistency."
\ No newline at end of file
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 12879f924e1..d13994fa85c 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi
index 322bbc6c489..51996ea4248 100644
Binary files a/icons/obj/hydroponics_products.dmi and b/icons/obj/hydroponics_products.dmi differ
diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm
index f53dae237b7..b0cf3c377d8 100644
--- a/maps/away/away_site/romanovich/grand_romanovich.dmm
+++ b/maps/away/away_site/romanovich/grand_romanovich.dmm
@@ -1348,9 +1348,9 @@
 	dir = 1;
 	icon_state = "tube_empty"
 	},
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
 /turf/simulated/floor/lino,
 /area/grand_romanovich)
 "dE" = (
@@ -2947,7 +2947,7 @@
 /obj/item/reagent_containers/food/snacks/chipplate/tajcandy{
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor{
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor{
 	pixel_x = 7;
 	pixel_y = 15
 	},
@@ -6387,7 +6387,7 @@
 /obj/item/reagent_containers/food/snacks/chipplate/tajcandy{
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor{
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor{
 	pixel_x = 7;
 	pixel_y = 15
 	},
diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm
index b6cf8b19ad3..e932570323f 100644
--- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm
+++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm
@@ -417,9 +417,9 @@
 /area/tajara_safehouse)
 "lO" = (
 /obj/structure/closet/cabinet,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
 /turf/simulated/floor/wood,
 /area/tajara_safehouse)
 "mt" = (
diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
index 85e95609586..93a7a9444fb 100644
--- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
+++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
@@ -2297,8 +2297,8 @@
 /obj/item/reagent_containers/food/drinks/bottle/treebark_firewater,
 /obj/item/reagent_containers/food/drinks/bottle/veterans_choice,
 /obj/item/reagent_containers/food/drinks/bottle/veterans_choice,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
 /obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine,
 /obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine,
 /obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz,
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
index eab9c24e7ed..46048f630c3 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
@@ -14,8 +14,8 @@
 /obj/item/seeds/earthenroot,
 /obj/item/seeds/blizzard,
 /obj/item/seeds/blizzard,
-/obj/item/seeds/nifberries,
-/obj/item/seeds/nifberries,
+/obj/item/seeds/dirtberries,
+/obj/item/seeds/dirtberries,
 /turf/simulated/floor/exoplanet/wood,
 /area/adhomai_bar)
 "bf" = (
@@ -282,10 +282,10 @@
 /obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine,
 /obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine,
 /obj/item/reagent_containers/food/drinks/bottle/shyyrkirrtyr_wine,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
 /obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water,
 /obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water,
 /obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water,
@@ -865,8 +865,8 @@
 /obj/item/seeds/blizzard,
 /obj/item/seeds/sugartree,
 /obj/item/seeds/sugartree,
-/obj/item/seeds/nifberries,
-/obj/item/seeds/nifberries,
+/obj/item/seeds/dirtberries,
+/obj/item/seeds/dirtberries,
 /turf/simulated/floor/exoplanet/wood,
 /area/adhomai_bar)
 "Wa" = (
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm
index 977dba1bfde..2ca95d0b706 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm
@@ -179,7 +179,7 @@
 "wj" = (
 /obj/structure/closet/crate/hydroponics,
 /obj/item/seeds/mtearseed,
-/obj/item/seeds/nifberries,
+/obj/item/seeds/dirtberries,
 /obj/item/seeds/sugartree,
 /obj/item/seeds/earthenroot,
 /turf/simulated/floor/exoplanet/snow/cold,
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
index 06f6fd16864..a2fa6f227f7 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
@@ -256,8 +256,8 @@
 /obj/item/seeds/earthenroot,
 /obj/item/seeds/blizzard,
 /obj/item/seeds/blizzard,
-/obj/item/seeds/nifberries,
-/obj/item/seeds/nifberries,
+/obj/item/seeds/dirtberries,
+/obj/item/seeds/dirtberries,
 /turf/simulated/floor/exoplanet/wood,
 /area/adhomai_village)
 "qk" = (
@@ -606,8 +606,8 @@
 /obj/item/seeds/blizzard,
 /obj/item/seeds/sugartree,
 /obj/item/seeds/sugartree,
-/obj/item/seeds/nifberries,
-/obj/item/seeds/nifberries,
+/obj/item/seeds/dirtberries,
+/obj/item/seeds/dirtberries,
 /turf/simulated/floor/exoplanet/wood,
 /area/adhomai_village)
 "Iy" = (
diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm
index 1e5b13ac04c..a75074a07a5 100644
--- a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm
@@ -537,7 +537,7 @@
 /obj/item/reagent_containers/food/drinks/bottle/messa_mead,
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/mug,
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/mug,
-/obj/item/reagent_containers/food/drinks/bottle/nmshaan_liquor,
+/obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor,
 /turf/simulated/floor/exoplanet/wood,
 /area/nka_base)
 "Jg" = (