diff --git a/stairs.lua b/stairs.lua
index b521623..bd42cfc 100644
--- a/stairs.lua
+++ b/stairs.lua
@@ -55,14 +55,14 @@ stairs.register_stair_and_slab(
 	default.node_sound_stone_defaults(),
 	false
 )
--- Bluestone
+-- Sodalite
 stairs.register_stair_and_slab(
 	"bluestone",
 	"too_many_stones:bluestone",
 	{cracky = 3},
 	{"tms_bluestone.png"},
-	"Bluestone Stair",
-	"Bluestone Slab",
+	"Sodalite Stair",
+	"Sodalite Slab",
 	default.node_sound_stone_defaults(),
 	true
 )
@@ -72,8 +72,8 @@ stairs.register_stair_and_slab(
 	"too_many_stones:bluestone_cobble",
 	{cracky = 3},
 	{"tms_bluestone_cobble.png"},
-	"Cobbled Bluestone Stair",
-	"Cobbled Bluestone Slab",
+	"Cobbled Sodalite Stair",
+	"Cobbled Sodalite Slab",
 	default.node_sound_stone_defaults(),
 	true
 )
@@ -83,8 +83,8 @@ stairs.register_stair_and_slab(
 	"too_many_stones:bluestone_brick",
 	{cracky = 2},
 	{"tms_bluestone_brick.png"},
-	"Bluestone Brick Stair",
-	"Bluestone Brick Slab",
+	"Sodalite Brick Stair",
+	"Sodalite Brick Slab",
 	default.node_sound_stone_defaults(),
 	false
 )
@@ -94,8 +94,8 @@ stairs.register_stair_and_slab(
 	"too_many_stones:bluestone_cracked_brick",
 	{cracky = 2},
 	{"tms_bluestone_brick.png^tms_brick_crack_overlay.png"},
-	"Cracked Bluestone Brick Stair",
-	"Cracked Bluestone Brick Slab",
+	"Cracked Sodalite Brick Stair",
+	"Cracked Sodalite Brick Slab",
 	default.node_sound_stone_defaults(),
 	false
 )
@@ -105,8 +105,8 @@ stairs.register_stair_and_slab(
 	"too_many_stones:bluestone_block",
 	{cracky = 2},
 	{"tms_bluestone_block.png"},
-	"Bluestone Block Stair",
-	"Bluestone Block Slab",
+	"Sodalite Block Stair",
+	"Sodalite Block Slab",
 	default.node_sound_stone_defaults(),
 	false
 )
@@ -341,14 +341,14 @@ stairs.register_stair_and_slab(
 	default.node_sound_stone_defaults(),
 	false
 )
--- Greenstone
+-- Jade
 stairs.register_stair_and_slab(
 	"greenstone",
 	"too_many_stones:greenstone",
 	{cracky = 3},
 	{"tms_greenstone.png"},
-	"Greenstone Stair",
-	"Greenstone Slab",
+	"Jade Stair",
+	"Jade Slab",
 	default.node_sound_stone_defaults(),
 	true
 )
@@ -358,8 +358,8 @@ stairs.register_stair_and_slab(
 	"too_many_stones:greenstone_cobble",
 	{cracky = 3},
 	{"tms_greenstone_cobble.png"},
-	"Cobbled Greenstone Stair",
-	"Cobbled Greenstone Slab",
+	"Cobbled Jade Stair",
+	"Cobbled Jade Slab",
 	default.node_sound_stone_defaults(),
 	true
 )
@@ -369,8 +369,8 @@ stairs.register_stair_and_slab(
 	"too_many_stones:greenstone_brick",
 	{cracky = 2},
 	{"tms_greenstone_brick.png"},
-	"Greenstone Brick Stair",
-	"Greenstone Brick Slab",
+	"Jade Brick Stair",
+	"Jade Brick Slab",
 	default.node_sound_stone_defaults(),
 	false
 )
@@ -380,8 +380,8 @@ stairs.register_stair_and_slab(
 	"too_many_stones:greenstone_cracked_brick",
 	{cracky = 2},
 	{"tms_greenstone_brick.png^tms_brick_crack_overlay.png"},
-	"Cracked Greenstone Brick Stair",
-	"Cracked Greenstone Brick Slab",
+	"Cracked Jade Brick Stair",
+	"Cracked Jade Brick Slab",
 	default.node_sound_stone_defaults(),
 	false
 )
@@ -391,8 +391,8 @@ stairs.register_stair_and_slab(
 	"too_many_stones:greenstone_block",
 	{cracky = 2},
 	{"tms_greenstone_block.png"},
-	"Greenstone Block Stair",
-	"Greenstone Block Slab",
+	"Jade Block Stair",
+	"Jade Block Slab",
 	default.node_sound_stone_defaults(),
 	false
 )
diff --git a/wall.lua b/wall.lua
index 2225a33..9bdd0c1 100644
--- a/wall.lua
+++ b/wall.lua
@@ -14,20 +14,20 @@ walls.register("too_many_stones:amazonite_block_wall", "Amazonite Block Wall", "
 
 walls.register("too_many_stones:amazonite_cobble_wall", "Cobbled Amazonite Wall", "tms_amazonite_cobble.png",
 		"too_many_stones:amazonite_cobble", default.node_sound_stone_defaults())
--- Bluestone
-walls.register("too_many_stones:bluestone_wall", "Bluestone Wall", "tms_bluestone.png",
+-- Sodalite
+walls.register("too_many_stones:bluestone_wall", "Sodalite Wall", "tms_bluestone.png",
 		"too_many_stones:bluestone", default.node_sound_stone_defaults())
 		
-walls.register("too_many_stones:bluestone_brick_wall", "Bluestone Brick Wall", "tms_bluestone_brick.png",
+walls.register("too_many_stones:bluestone_brick_wall", "Sodalite Brick Wall", "tms_bluestone_brick.png",
 		"too_many_stones:bluestone_brick", default.node_sound_stone_defaults())
 
-walls.register("too_many_stones:bluestone_cracked_brick_wall", "Cracked Bluestone Brick Wall", "tms_bluestone_brick.png^tms_brick_crack_overlay.png",
+walls.register("too_many_stones:bluestone_cracked_brick_wall", "Cracked Sodalite Brick Wall", "tms_bluestone_brick.png^tms_brick_crack_overlay.png",
 		"too_many_stones:bluestone_cracked_brick", default.node_sound_stone_defaults())
 
-walls.register("too_many_stones:bluestone_block_wall", "Bluestone Block Wall", "tms_bluestone_block.png",
+walls.register("too_many_stones:bluestone_block_wall", "Sodalite Block Wall", "tms_bluestone_block.png",
 		"too_many_stones:bluestone_block", default.node_sound_stone_defaults())
 
-walls.register("too_many_stones:bluestone_cobble_wall", "Cobbled Bluestone Wall", "tms_bluestone_cobble.png",
+walls.register("too_many_stones:bluestone_cobble_wall", "Cobbled Sodalite Wall", "tms_bluestone_cobble.png",
 		"too_many_stones:bluestone_cobble", default.node_sound_stone_defaults())
 -- Calcite
 walls.register("too_many_stones:calcite_wall", "Calcite Wall", "tms_calcite.png",
@@ -92,20 +92,20 @@ walls.register("too_many_stones:granite_red_cracked_brick_wall", "Cracked Red Gr
 
 walls.register("too_many_stones:granite_red_block_wall", "Red Granite Block Wall", "tms_granite_red_block.png",
 		"too_many_stones:granite_red_block", default.node_sound_stone_defaults())
--- Greenstone
-walls.register("too_many_stones:greenstone_wall", "Greentone Wall", "tms_greenstone.png",
+-- Jade
+walls.register("too_many_stones:greenstone_wall", "Jade Wall", "tms_greenstone.png",
 		"too_many_stones:greenstone", default.node_sound_stone_defaults())
 		
-walls.register("too_many_stones:greenstone_brick_wall", "Greentone Brick Wall", "tms_greenstone_brick.png",
+walls.register("too_many_stones:greenstone_brick_wall", "Jade Brick Wall", "tms_greenstone_brick.png",
 		"too_many_stones:greenstone_brick", default.node_sound_stone_defaults())
 
-walls.register("too_many_stones:greenstone_cracked_brick_wall", "Cracked Greenstone Brick Wall", "tms_greenstone_brick.png^tms_brick_crack_overlay.png",
+walls.register("too_many_stones:greenstone_cracked_brick_wall", "Cracked Jade Brick Wall", "tms_greenstone_brick.png^tms_brick_crack_overlay.png",
 		"too_many_stones:greenstone_cracked_brick", default.node_sound_stone_defaults())
 
-walls.register("too_many_stones:greenstone_block_wall", "Greenstone Block Wall", "tms_greenstone_block.png",
+walls.register("too_many_stones:greenstone_block_wall", "Jade Block Wall", "tms_greenstone_block.png",
 		"too_many_stones:greenstone_block", default.node_sound_stone_defaults())
 
-walls.register("too_many_stones:greenstone_cobble_wall", "Cobbled Greentone Wall", "tms_greenstone_cobble.png",
+walls.register("too_many_stones:greenstone_cobble_wall", "Cobbled Jade Wall", "tms_greenstone_cobble.png",
 		"too_many_stones:greenstone_cobble", default.node_sound_stone_defaults())
 -- Ilvaite
 walls.register("too_many_stones:ilvaite_wall", "Ilvaite Wall", "tms_ilvaite.png",