From 658cd15718895afcad430dd3cab8b4685fa83154 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Wed, 4 Jan 2017 06:20:13 +0100
Subject: [PATCH] Make all item names more Minecraft-like

---
 mods/default/craftitems.lua                   |   6 +-
 mods/default/nodes.lua                        |  99 +++++++++---------
 mods/doors/init.lua                           |  12 +--
 mods/fences/init.lua                          |   4 +-
 mods/flowers/init.lua                         |  29 ++---
 ...r_houstonia.png => flower_azure_bluet.png} | Bin
 .../{flower_paeonia.png => flower_peony.png}  | Bin
 mods/redstone/mesecons_delayer/init.lua       |   2 +-
 mods/redstone/mesecons_materials/init.lua     |   2 +-
 mods/redstone/mesecons_noteblock/init.lua     |   2 +-
 mods/redstone/mesecons_solarpanel/init.lua    |   4 +-
 mods/redstone/mesecons_torch/init.lua         |   2 +-
 mods/vessels/init.lua                         |   2 +-
 mods/xpanes/init.lua                          |  32 +++---
 14 files changed, 99 insertions(+), 97 deletions(-)
 rename mods/flowers/textures/{flower_houstonia.png => flower_azure_bluet.png} (100%)
 rename mods/flowers/textures/{flower_paeonia.png => flower_peony.png} (100%)

diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index d99106081..78b336332 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -23,13 +23,13 @@ minetest.register_craftitem("default:book", {
 })
 
 minetest.register_craftitem("default:coal_lump", {
-	description = "Coal Lump",
+	description = "Coal",
 	inventory_image = "default_coal_lump.png",
 	stack_max = 64,
 })
 
 minetest.register_craftitem("default:charcoal_lump", {
-	description = "Charcoal Lump",
+	description = "Charcoal",
 	inventory_image = "default_charcoal_lump.png",
 	stack_max = 64,
 })
@@ -71,7 +71,7 @@ minetest.register_craftitem("default:emerald", {
 })
 
 minetest.register_craftitem("default:clay_brick", {
-	description = "Clay Brick",
+	description = "Brick",
 	inventory_image = "default_clay_brick.png",
 	stack_max = 64,
 })
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 043577ec4..a650482c6 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -94,7 +94,7 @@ minetest.register_node("default:stone_with_emerald", {
 })
 
 minetest.register_node("default:stone_with_diamond", {
-	description = "Diamonds in Stone",
+	description = "Diamond Ore",
 	tiles = {"default_stone.png^default_mineral_diamond.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -104,7 +104,7 @@ minetest.register_node("default:stone_with_diamond", {
 })
 
 minetest.register_node("default:stonebrick", {
-	description = "Stone Brick",
+	description = "Stone Bricks",
 	tiles = {"default_stone_brick.png"},
 	stack_max = 64,
 	groups = {cracky=3, stone=1},
@@ -112,7 +112,7 @@ minetest.register_node("default:stonebrick", {
 })
 
 minetest.register_node("default:stonebrickcarved", {
-	description = "Stone Brick Carved",
+	description = "Chiseled Stone Bricks",
 	tiles = {"default_stonebrick_carved.png"},
 	stack_max = 64,
 	groups = {cracky=3, stone=1},
@@ -120,7 +120,7 @@ minetest.register_node("default:stonebrickcarved", {
 })
 
 minetest.register_node("default:stonebrickcracked", {
-	description = "Stone Brick Cracked",
+	description = "Cracked Stone Bricks",
 	tiles = {"default_stonebrick_cracked.png"},
 	stack_max = 64,
 	groups = {cracky=3, stone=1},
@@ -128,7 +128,7 @@ minetest.register_node("default:stonebrickcracked", {
 })
 
 minetest.register_node("default:stonebrickmossy", {
-	description = "Mossy Stone Brick",
+	description = "Mossy Stone Bricks",
 	tiles = {"default_stonebrick_mossy.png"},
 	stack_max = 64,
 	groups = {cracky=3, stone=1},
@@ -136,7 +136,7 @@ minetest.register_node("default:stonebrickmossy", {
 })
 
 minetest.register_node("default:dirt_with_grass", {
-	description = "Dirt with Grass",
+	description = "Grass Block",
 	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -148,7 +148,7 @@ minetest.register_node("default:dirt_with_grass", {
 })
 
 minetest.register_node("default:dirt_with_grass_footsteps", {
-	description = "Dirt with Grass and Footsteps",
+	description = "Grass Block with Footsteps",
 	tiles = {"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -219,7 +219,7 @@ minetest.register_node("default:sandstone", {
 })
 
 minetest.register_node("default:sandstonesmooth", {
-	description = "Sandstone Smooth",
+	description = "Smooth Sandstone",
 	tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_smooth.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -228,7 +228,7 @@ minetest.register_node("default:sandstonesmooth", {
 })
 
 minetest.register_node("default:sandstonecarved", {
-	description = "Sandstone Carved",
+	description = "Chiseled Sandstone",
 	tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_carved.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -248,7 +248,7 @@ minetest.register_node("default:redsand", {
 })
 
 minetest.register_node("default:redsandstone", {
-	description = "Red SandStone",
+	description = "Red Sandstone",
 	tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_normal.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -257,7 +257,7 @@ minetest.register_node("default:redsandstone", {
 })
 
 minetest.register_node("default:redsandstonesmooth", {
-	description = "Red SandStone Smooth",
+	description = "Smooth Red Sandstone",
 	tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_smooth.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -266,7 +266,7 @@ minetest.register_node("default:redsandstonesmooth", {
 })
 
 minetest.register_node("default:redsandstonecarved", {
-	description = "Red SandStone Carved",
+	description = "Chiseled Red Sandstone",
 	tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_carved.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -289,7 +289,7 @@ minetest.register_node("default:clay", {
 })
 
 minetest.register_node("default:brick", {
-	description = "Brick Block",
+	description = "Bricks",
 	tiles = {"default_brick.png"},
 	stack_max = 64,
 	groups = {cracky=3},
@@ -331,7 +331,7 @@ minetest.register_node("default:prismarine", {
 })
 
 minetest.register_node("default:prismarine_brick", {
-     description = "Prismarine Brick",
+     description = "Prismarine Bricks",
 	 stack_max = 64,
      tiles = {"default_prismarine_bricks.png"},
      groups = {cracky=2},
@@ -349,7 +349,7 @@ minetest.register_node("default:prismarine_dark", {
 
 -- Normal tree --
 minetest.register_node("default:tree", {
-	description = "Tree",
+	description = "Wood",
 	tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -360,7 +360,7 @@ minetest.register_node("default:tree", {
 })
 
 minetest.register_node("default:sapling", {
-	description = "Sapling",
+	description = "Oak Sapling",
 	drawtype = "plantlike",
 	visual_scale = 1.0,
 	tiles = {"default_sapling.png"},
@@ -378,7 +378,7 @@ minetest.register_node("default:sapling", {
 })
 
 minetest.register_node("default:leaves", {
-	description = "Leaves",
+	description = "Oak Leaves",
 	drawtype = "allfaces_optional",
 	visual_scale = 1.3,
 	tiles = {"default_leaves.png"},
@@ -411,7 +411,7 @@ minetest.register_node("default:leaves", {
 -- Jungle Tree --
 
 minetest.register_node("default:jungletree", {
-	description = "Jungle Tree",
+	description = "Jungle Wood",
 	tiles = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
 	stack_max = 64,
 	paramtype2 = "facedir",
@@ -422,7 +422,7 @@ minetest.register_node("default:jungletree", {
 })
 
 minetest.register_node("default:junglewood", {
-	description = "Junglewood Planks",
+	description = "Jungle Wood Planks",
 	tiles = {"default_junglewood.png"},
 	stack_max = 64,
 	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
@@ -477,7 +477,7 @@ minetest.register_node("default:junglesapling", {
 -- Accacia Tree --
 
 minetest.register_node("default:acaciatree", {
-	description = "Acacia Tree",
+	description = "Acacia Wood",
 	tiles = {"default_acaciatree_top.png", "default_acaciatree_top.png", "default_acaciatree.png"},
 	stack_max = 64,
 	paramtype2 = "facedir",
@@ -488,7 +488,7 @@ minetest.register_node("default:acaciatree", {
 })
 
 minetest.register_node("default:acaciawood", {
-	description = "Acaciawood Planks",
+	description = "Acacia Wood Planks",
 	tiles = {"default_acaciawood.png"},
 	stack_max = 64,
 	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
@@ -542,7 +542,7 @@ minetest.register_node("default:acaciasapling", {
 -- Spruce Tree --
 
 minetest.register_node("default:sprucetree", {
-	description = "Spruce Tree",
+	description = "Spruce Wood",
 	tiles = {"default_sprucetree_top.png", "default_sprucetree_top.png", "default_sprucetree.png"},
 	stack_max = 64,
 	paramtype2 = "facedir",
@@ -553,7 +553,7 @@ minetest.register_node("default:sprucetree", {
 })
 
 minetest.register_node("default:sprucewood", {
-	description = "Sprucewood Planks",
+	description = "Spruce Wood Planks",
 	tiles = {"default_sprucewood.png"},
 	stack_max = 64,
 	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
@@ -661,7 +661,7 @@ minetest.register_node("default:cactus", {
 })
 
 minetest.register_node("default:reeds", {
-	description = "Sugarcane",
+	description = "Sugar Canes",
 	drawtype = "plantlike",
 	tiles = {"default_papyrus.png"},
 	inventory_image = "default_sugar_cane.png",
@@ -701,7 +701,7 @@ minetest.register_node("default:quartz_ore", {
 })
 	 
 minetest.register_node("default:quartz_block", {
-	description = "Quartz Block",
+	description = "Block of Quartz",
 	stack_max = 64,
 	tiles = {"default_quartz_block_top.png", "default_quartz_block_bottom.png", "default_quartz_block_side.png"},
 	groups = {snappy=1,bendy=2,cracky=1,level=2},
@@ -717,7 +717,7 @@ minetest.register_node("default:quartz_chiseled", {
 })
 
 minetest.register_node("default:quartz_pillar", {
-	description = "Quartz Pillar",
+	description = "Pillar Quartz Block",
 	stack_max = 64,
 	paramtype2 = "facedir",
 	on_place = minetest.rotate_node,
@@ -776,21 +776,22 @@ minetest.register_node("default:glass", {
 })
 
 ---- colored glass
-AddGlass( "Glass Red",  "basecolor_red", "_red")
-AddGlass( "Glass Green",  "unicolor_dark_green", "_green")
-AddGlass( "Glass Blue",  "basecolor_blue", "_blue")
-AddGlass( "Glass Light Blue",  "basecolor_cyan", "_light_blue")
-AddGlass( "Glass Black",  "basecolor_black", "_black")
-AddGlass( "Glass White",  "basecolor_white", "_white")
-AddGlass( "Glass Yellow",  "basecolor_yellow", "_yellow")
-AddGlass( "Glass Brown",  "unicolor_dark_orange", "_brown")
-AddGlass( "Glass Orange",  "excolor_orange", "_orange")
-AddGlass( "Glass Pink",  "unicolor_light_red", "_pink")
-AddGlass( "Glass Gray",  "unicolor_darkgrey", "_gray")
-AddGlass( "Glass Lime",  "basecolor_green", "_lime")
-AddGlass( "Glass Silver",  "basecolor_grey", "_silver")
-AddGlass( "Glass Magenta",  "basecolor_magenta", "_magenta")
-AddGlass( "Glass Purple",  "excolor_violet", "_purple")
+AddGlass( "Red Glass",  "basecolor_red", "_red")
+AddGlass( "Green Glass",  "unicolor_dark_green", "_green")
+AddGlass( "Blue Glass",  "basecolor_blue", "_blue")
+AddGlass( "Light Blue Glass",  "basecolor_cyan", "_light_blue")
+AddGlass( "Black Glass",  "basecolor_black", "_black")
+AddGlass( "White Glass",  "basecolor_white", "_white")
+AddGlass( "Yellow Glass",  "basecolor_yellow", "_yellow")
+AddGlass( "Brown Glass",  "unicolor_dark_orange", "_brown")
+AddGlass( "Orange Glass",  "excolor_orange", "_orange")
+AddGlass( "Pink Glass",  "unicolor_light_red", "_pink")
+AddGlass( "Gray Glass",  "unicolor_darkgrey", "_gray")
+AddGlass( "Lime Glass",  "basecolor_green", "_lime")
+AddGlass( "Light Gray Glass",  "basecolor_grey", "_silver")
+AddGlass( "Magenta Glass",  "basecolor_magenta", "_magenta")
+AddGlass( "Purple Glass",  "excolor_violet", "_purple")
+AddGlass( "Cyan Glass",  "basecolor_cyan", "_cyan")
 
 minetest.register_node("default:rail", {
 	description = "Rail",
@@ -833,7 +834,7 @@ minetest.register_node("default:ladder", {
 
 
 minetest.register_node("default:vine", {
-	description = "Vine",
+	description = "Vines",
 	drawtype = "signlike",
 	tiles = {"default_vine.png"},
 	inventory_image = "default_vine.png",
@@ -874,7 +875,7 @@ minetest.register_node("default:vine", {
 
 
 minetest.register_node("default:wood", {
-	description = "Wooden Planks",
+	description = "Wood Planks",
 	tiles = {"default_wood.png"},
 	stack_max = 64,
 	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
@@ -1537,7 +1538,7 @@ minetest.register_node("default:cobble", {
 })
 
 minetest.register_node("default:mossycobble", {
-	description = "Mossy Cobblestone",
+	description = "Moss Stone",
 	tiles = {"default_mossycobble.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -1555,7 +1556,7 @@ minetest.register_node("default:steelblock", {
 })
 
 minetest.register_node("default:goldblock", {
-	description = "Gold Block",
+	description = "Block of Gold",
 	tiles = {"default_gold_block.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -1564,7 +1565,7 @@ minetest.register_node("default:goldblock", {
 })
 
 minetest.register_node("default:diamondblock", {
-	description = "Diamond Block",
+	description = "Block of Diamond",
 	tiles = {"default_diamond_block.png"},
 	is_ground_content = true,
 	stack_max = 64,
@@ -1581,7 +1582,7 @@ minetest.register_node("default:lapisblock", {
 })
 
 minetest.register_node("default:emeraldblock", {
-	description = "Emerald Block",
+	description = "Block of Emerald",
 	tiles = {"default_emerald_block.png"},
 	stack_max = 64,
 	groups = {cracky=1},
@@ -1827,7 +1828,7 @@ minetest.register_node("default:packedice", {
 })
 
 minetest.register_node("default:snow", {
-	description = "Snow",
+	description = "Snow Layer",
 	tiles = {"default_snow.png"},
 	inventory_image = "default_snowball.png",
 	wield_image = "default_snowball.png",
@@ -1856,7 +1857,7 @@ minetest.register_node("default:snow", {
 })
 
 minetest.register_node("default:snowblock", {
-	description = "Snow Block",
+	description = "Snow",
 	tiles = {"default_snow.png"},
 	is_ground_content = true,
 	stack_max = 64,
diff --git a/mods/doors/init.lua b/mods/doors/init.lua
index e608f9627..4da2b61fb 100644
--- a/mods/doors/init.lua
+++ b/mods/doors/init.lua
@@ -292,7 +292,7 @@ end
 
 --- Normal Door ---
 doors:register_door("doors:door_wood", {
-	description = "Wooden Door",
+	description = "Oak Door",
 	inventory_image = "door_wood.png",
 	stack_max = 16,
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
@@ -311,7 +311,7 @@ minetest.register_craft({
 
 --- Accacia Door --
 doors:register_door("doors:door_acacia", {
-	description = "Wooden Acacia Door",
+	description = "Acacia Door",
 	inventory_image = "door_acacia.png",
 	stack_max = 16,
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
@@ -330,7 +330,7 @@ minetest.register_craft({
 
 --- birch Door --
 doors:register_door("doors:door_birch", {
-	description = "Wooden Birch Door",
+	description = "Birch Door",
 	stack_max = 16,
 	inventory_image = "door_birch.png",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
@@ -340,7 +340,7 @@ doors:register_door("doors:door_birch", {
 
 --- dark oak Door --
 doors:register_door("doors:door_dark_oak", {
-	description = "Wooden Dark Oak Door",
+	description = "Dark Oak Door",
 	inventory_image = "door_dark_oak.png",
 	stack_max = 16,
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
@@ -350,7 +350,7 @@ doors:register_door("doors:door_dark_oak", {
 
 --- jungle Door --
 doors:register_door("doors:door_jungle", {
-	description = "Wooden Jungle Door",
+	description = "Jungle Door",
 	stack_max = 16,
 	inventory_image = "door_jungle.png",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
@@ -369,7 +369,7 @@ minetest.register_craft({
 
 --- spruce Door --
 doors:register_door("doors:door_spruce", {
-	description = "Wooden Spruce Door",
+	description = "Spruce Door",
 	stack_max = 16,
 	inventory_image = "door_spruce.png",
 	groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
diff --git a/mods/fences/init.lua b/mods/fences/init.lua
index 8dc87e745..41cfe3fa8 100644
--- a/mods/fences/init.lua
+++ b/mods/fences/init.lua
@@ -96,7 +96,7 @@ local bx21 = {5/16, 1/2-1/16, -1/16, 5/16, 1/2+8/16, -1/16}   --oben_block(quer)
 
 
 minetest.register_node("fences:fence_wood", {
-	description = "Wooden Fence",
+	description = "Oak Fence",
 	tiles = {"default_wood.png"},
 	inventory_image = "default_fence.png",
 	wield_image = "default_fence.png",
@@ -625,7 +625,7 @@ minetest.register_node("fences:fencegate_open", {
 })
 
 minetest.register_node("fences:fencegate", {
-	description = "Wooden Fancegate",
+	description = "Oak Fence Gate",
 	tiles = {"default_wood.png"},
 	inventory_image = "fences_fencegate.png",
 	wield_image = "fences_fencegate.png",
diff --git a/mods/flowers/init.lua b/mods/flowers/init.lua
index e08dfd7d3..ddd8d95ef 100644
--- a/mods/flowers/init.lua
+++ b/mods/flowers/init.lua
@@ -35,8 +35,7 @@ local function add_simple_flower(name, desc, image, color)
 	})
 end
 
-add_simple_flower("rose", "Coqlicot", "flowers_coqlicot", "color_red")
---add_simple_flower("rose", "Rose", "flowers_rose", "color_red") -- Old skin :( you miss me
+add_simple_flower("rose", "Poppy", "flowers_coqlicot", "color_red")
 add_simple_flower("dandelion_yellow", "Yellow Dandelion", "flowers_dandelion_yellow", "color_yellow")
 add_simple_flower("oxeye_daisy", "Oxeye Daisy", "flower_oxeye_daisy", "color_yellow")
 add_simple_flower("tulip_orange", "Orange Tulip", "flower_tulip_orange", "color_orange")
@@ -117,14 +116,14 @@ minetest.register_node("flowers:allium", {
 	},
 })
 
---- paeonia ---
+--- peony ---
 
-minetest.register_node("flowers:paeonia", {
-	description = "Paeonia",
+minetest.register_node("flowers:peony", {
+	description = "Peony",
 	drawtype = "plantlike",
-	tiles = { "flower_paeonia.png" },
-	inventory_image = "flower_paeonia.png",
-	wield_image = "flower_paeonia.png",
+	tiles = { "flower_peony.png" },
+	inventory_image = "flower_peony.png",
+	wield_image = "flower_peony.png",
 	sunlight_propagates = true,
 	paramtype = "light",
 	walkable = false,
@@ -138,14 +137,14 @@ minetest.register_node("flowers:paeonia", {
 })
 
 
---- houstonia ---
+--- azure bluet ---
 
-minetest.register_node("flowers:houstonia", {
-	description = "Houstonia",
+minetest.register_node("flowers:azure_bluet", {
+	description = "Azure Bluet",
 	drawtype = "plantlike",
-	tiles = { "flower_houstonia.png" },
-	inventory_image = "flower_houstonia.png",
-	wield_image = "flower_houstonia.png",
+	tiles = { "flower_azure_bluet.png" },
+	inventory_image = "flower_azure_bluet.png",
+	wield_image = "flower_azure_bluet.png",
 	sunlight_propagates = true,
 	paramtype = "light",
 	walkable = false,
@@ -364,3 +363,5 @@ minetest.register_node("flowers:pot",{
 local time_to_load= os.clock() - init
 print(string.format("[MOD] "..minetest.get_current_modname().." loaded in %.4f s", time_to_load))
 
+minetest.register_alias("flowers:azure_bluet", "flowers:azure_bluet")
+minetest.register_alias("flowers:peony", "flowers:peony")
diff --git a/mods/flowers/textures/flower_houstonia.png b/mods/flowers/textures/flower_azure_bluet.png
similarity index 100%
rename from mods/flowers/textures/flower_houstonia.png
rename to mods/flowers/textures/flower_azure_bluet.png
diff --git a/mods/flowers/textures/flower_paeonia.png b/mods/flowers/textures/flower_peony.png
similarity index 100%
rename from mods/flowers/textures/flower_paeonia.png
rename to mods/flowers/textures/flower_peony.png
diff --git a/mods/redstone/mesecons_delayer/init.lua b/mods/redstone/mesecons_delayer/init.lua
index 39b548c0b..9577030ab 100644
--- a/mods/redstone/mesecons_delayer/init.lua
+++ b/mods/redstone/mesecons_delayer/init.lua
@@ -86,7 +86,7 @@ boxes = {
 end
 
 minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), {
-	description = "Delayer",
+	description = "Redstone Repeater",
 	drawtype = "nodebox",
 	tiles = {
 		"mesecons_delayer_off.png",
diff --git a/mods/redstone/mesecons_materials/init.lua b/mods/redstone/mesecons_materials/init.lua
index 26967c504..c270e5c79 100644
--- a/mods/redstone/mesecons_materials/init.lua
+++ b/mods/redstone/mesecons_materials/init.lua
@@ -2,7 +2,7 @@
 minetest.register_craftitem("mesecons_materials:glue", {
 	image = "jeija_glue.png",
 	on_place_on_ground = minetest.craftitem_place_item,
-    	description="Glue",
+    	description="Slimeball",
 })
 
 minetest.register_craft({
diff --git a/mods/redstone/mesecons_noteblock/init.lua b/mods/redstone/mesecons_noteblock/init.lua
index 71843e03a..4dce4f495 100644
--- a/mods/redstone/mesecons_noteblock/init.lua
+++ b/mods/redstone/mesecons_noteblock/init.lua
@@ -1,5 +1,5 @@
 minetest.register_node("mesecons_noteblock:noteblock", {
-	description = "Noteblock",
+	description = "Note Block",
 	tiles = {"mesecons_noteblock.png"},
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	drawtype = "allfaces_optional",
diff --git a/mods/redstone/mesecons_solarpanel/init.lua b/mods/redstone/mesecons_solarpanel/init.lua
index 633a88fd6..d8fcad4ce 100644
--- a/mods/redstone/mesecons_solarpanel/init.lua
+++ b/mods/redstone/mesecons_solarpanel/init.lua
@@ -43,7 +43,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_off", {
 		fixed = boxes
 	},
 	groups = {dig_immediate=3},
-    	description="Solar Panel",
+    	description="Daylight Sensor",
 	sounds = default.node_sound_glass_defaults(),
 	mesecons = {receptor = {
 		state = mesecon.state.off
@@ -132,7 +132,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_off", {
 		fixed = boxes
 	},
 	groups = {dig_immediate=3},
-    	description="Solar Panel Inverted",
+    	description="Inverted Daylight Sensor",
 	sounds = default.node_sound_glass_defaults(),
 	mesecons = {receptor = {
 		state = mesecon.state.off
diff --git a/mods/redstone/mesecons_torch/init.lua b/mods/redstone/mesecons_torch/init.lua
index 4ab9be579..46cb5f1ef 100644
--- a/mods/redstone/mesecons_torch/init.lua
+++ b/mods/redstone/mesecons_torch/init.lua
@@ -86,7 +86,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", {
 })
 
 minetest.register_node("mesecons_torch:redstoneblock", {
-	description = "Redstone Block",
+	description = "Block of Redstone",
 	tiles = {"default_redstone_block.png"},
 	stack_max = 64,
 	groups = {cracky=1},
diff --git a/mods/vessels/init.lua b/mods/vessels/init.lua
index 03ecbb784..7293b2922 100644
--- a/mods/vessels/init.lua
+++ b/mods/vessels/init.lua
@@ -2,7 +2,7 @@
 -- See README.txt for licensing and other information.
 
 minetest.register_node("vessels:glass_bottle", {
-	description = "Glass Bottle (empty)",
+	description = "Glass Bottle",
 	drawtype = "plantlike",
 	tiles = {"vessels_glass_bottle.png"},
 	inventory_image = "vessels_glass_bottle_inv.png",
diff --git a/mods/xpanes/init.lua b/mods/xpanes/init.lua
index 7117f5e80..23215730b 100644
--- a/mods/xpanes/init.lua
+++ b/mods/xpanes/init.lua
@@ -117,22 +117,22 @@ function pane(node, desc, dropitem, recipeitem, color)
 end
 -- Glass
 pane("glass", "Glass Pane", "", "default:glass", "_natural")
-pane("glass", "Glass Pane Red", "", "default:glass_red", "_red")
-pane("glass", "Glass Pane Green", "", "default:glass_green", "_green")
-pane("glass", "Glass Pane Blue", "", "default:glass_blue", "_blue")
-pane("glass", "Glass Pane Light Blue", "", "default:glass_light_blue", "_light_blue")
-pane("glass", "Glass Pane Black", "", "default:glass_black", "_black")
-pane("glass", "Glass Pane White", "", "default:glass_white", "_white")
-pane("glass", "Glass Pane Yellow", "", "default:glass_yellow", "_yellow")
-pane("glass", "Glass Pane Brown", "", "default:glass_brown", "_brown")
-pane("glass", "Glass Pane Orange", "", "default:glass_orange", "_orange")
-pane("glass", "Glass Pane Pink", "", "default:glass_pink", "_pink")
-pane("glass", "Glass Pane Gray", "", "default:glass_gray", "_gray")
-pane("glass", "Glass Pane Lime", "", "default:glass_lime", "_lime")
-pane("glass", "Glass Pane Silver", "", "default:glass_silver", "_silver")
-pane("glass", "Glass Pane Magenta", "", "default:glass_magenta", "_magenta")
-pane("glass", "Glass Pane Purple", "", "default:glass_purple", "_purple")
-
+pane("glass", "Red Stained Glass Pane", "", "default:glass_red", "_red")
+pane("glass", "Green Stained Glass Pane", "", "default:glass_green", "_green")
+pane("glass", "Blue Stained Glass Pane", "", "default:glass_blue", "_blue")
+pane("glass", "Light Blue Stained Glass Pane", "", "default:glass_light_blue", "_light_blue")
+pane("glass", "Black Stained Glass Pane", "", "default:glass_black", "_black")
+pane("glass", "White Stained Glass Pane", "", "default:glass_white", "_white")
+pane("glass", "Yellow Stained Glass Pane", "", "default:glass_yellow", "_yellow")
+pane("glass", "Brown Stained Glass Pane", "", "default:glass_brown", "_brown")
+pane("glass", "Orange Stained Glass Pane", "", "default:glass_orange", "_orange")
+pane("glass", "Pink Stained Glass Pane", "", "default:glass_pink", "_pink")
+pane("glass", "Gray Stained Glass Pane", "", "default:glass_gray", "_gray")
+pane("glass", "Lime Stained Glass Pane", "", "default:glass_lime", "_lime")
+pane("glass", "Light Gray Stained Glass Pane", "", "default:glass_silver", "_silver")
+pane("glass", "Magenta Stained Glass Pane", "", "default:glass_magenta", "_magenta")
+pane("glass", "Purple Stained Glass Pane", "", "default:glass_purple", "_purple")
+pane("glass", "Cyan Stained Glass Pane", "", "default:glass_cyan", "_cyan")
 
 -- Iron
 pane("iron", "Iron Bars", "xpanes:pane_iron", "default:steel_ingot", "")