diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua
index 4e3229c566..13d547f944 100644
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@@ -203,25 +203,25 @@ local professions = {
 		trades = {
 			{
 			{ { "mcl_core:coal_lump", 16, 24 }, E1 },
-			{ { "mcl_core:emerald", 4, 6 }, { "3d_armor:helmet_iron", 1, 1 } },
+			{ { "mcl_core:emerald", 4, 6 }, { "mcl_armor:helmet_iron", 1, 1 } },
 			},
 
 			{
 			{ { "mcl_core:iron_ingot", 7, 9 }, E1 },
-			{ { "mcl_core:emerald", 10, 14 }, { "3d_armor:chestplate_iron", 1, 1 } },
+			{ { "mcl_core:emerald", 10, 14 }, { "mcl_armor:chestplate_iron", 1, 1 } },
 			},
 
 			{
 			{ { "mcl_core:diamond", 3, 4 }, E1 },
 			-- TODO: enchant
-			{ { "mcl_core:emerald", 16, 19 }, { "3d_armor:chestplate_diamond", 1, 1 } },
+			{ { "mcl_core:emerald", 16, 19 }, { "mcl_armor:chestplate_diamond", 1, 1 } },
 			},
 
 			{
-			{ { "mcl_core:emerald", 5, 7 }, { "3d_armor:boots_chain", 1, 1 } },
-			{ { "mcl_core:emerald", 9, 11 }, { "3d_armor:leggings_chain", 1, 1 } },
-			{ { "mcl_core:emerald", 5, 7 }, { "3d_armor:helmet_chain", 1, 1 } },
-			{ { "mcl_core:emerald", 11, 15 }, { "3d_armor:chestplate_chain", 1, 1 } },
+			{ { "mcl_core:emerald", 5, 7 }, { "mcl_armor:boots_chain", 1, 1 } },
+			{ { "mcl_core:emerald", 9, 11 }, { "mcl_armor:leggings_chain", 1, 1 } },
+			{ { "mcl_core:emerald", 5, 7 }, { "mcl_armor:helmet_chain", 1, 1 } },
+			{ { "mcl_core:emerald", 11, 15 }, { "mcl_armor:chestplate_chain", 1, 1 } },
 			},
 		},
 	},
@@ -231,12 +231,12 @@ local professions = {
 		trades = {
 			{
 			{ { "mcl_mobitems:leather", 9, 12 }, E1 },
-			{ { "mcl_core:emerald", 2, 4 }, { "3d_armor:leggings_leather", 2, 4 } },
+			{ { "mcl_core:emerald", 2, 4 }, { "mcl_armor:leggings_leather", 2, 4 } },
 			},
 
 			{
 			-- TODO: enchant
-			{ { "mcl_core:emerald", 7, 12 }, { "3d_armor:chestplate_leather", 1, 1 } },
+			{ { "mcl_core:emerald", 7, 12 }, { "mcl_armor:chestplate_leather", 1, 1 } },
 			},
 
 			{
diff --git a/mods/HUD/mcl_hbarmor/README.md b/mods/HUD/mcl_hbarmor/README.md
index 0f4816e4af..0eccd69166 100644
--- a/mods/HUD/mcl_hbarmor/README.md
+++ b/mods/HUD/mcl_hbarmor/README.md
@@ -1,4 +1,4 @@
-# MineClone 2 HUD bar for `3d_armor` [`mcl_hbarmor`]
+# MineClone 2 HUD bar for `mcl_armor` [`mcl_hbarmor`]
 
 ## Description
 This mod adds a simple HUD bar which displays the player's armor points.
diff --git a/mods/HUD/mcl_hbarmor/init.lua b/mods/HUD/mcl_hbarmor/init.lua
index f05d50459d..36dad2a503 100644
--- a/mods/HUD/mcl_hbarmor/init.lua
+++ b/mods/HUD/mcl_hbarmor/init.lua
@@ -1,7 +1,7 @@
 local S = minetest.get_translator("mcl_hbarmor")
 
 if (not armor) or (not armor.def) then
-	minetest.log("error", "[mcl_hbarmor] Outdated 3d_armor version. Please update your version of 3d_armor!")
+	minetest.log("error", "[mcl_hbarmor] Outdated mcl_armor version. Please update your version of mcl_armor!")
 end
 
 local mcl_hbarmor = {}
diff --git a/mods/HUD/mcl_hbarmor/mod.conf b/mods/HUD/mcl_hbarmor/mod.conf
index 4d595c8c91..de5a2f20a2 100644
--- a/mods/HUD/mcl_hbarmor/mod.conf
+++ b/mods/HUD/mcl_hbarmor/mod.conf
@@ -1,2 +1,2 @@
 name = mcl_hbarmor
-depends = hudbars, 3d_armor
+depends = hudbars, mcl_armor
diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua
index bcca4772d4..7032994a0a 100644
--- a/mods/HUD/mcl_inventory/creative.lua
+++ b/mods/HUD/mcl_inventory/creative.lua
@@ -7,7 +7,7 @@ local players = {}
 -- Containing all the items for each Creative Mode tab
 local inventory_lists = {}
 
-local show_armor = minetest.get_modpath("3d_armor") ~= nil
+local show_armor = minetest.get_modpath("mcl_armor") ~= nil
 local mod_player = minetest.get_modpath("mcl_player") ~= nil
 
 -- TODO: Brewing is disabled. Add brewing (uncommented code) when it is implemented properly
diff --git a/mods/HUD/mcl_inventory/depends.txt b/mods/HUD/mcl_inventory/depends.txt
index 46d93c42a4..056b070d37 100644
--- a/mods/HUD/mcl_inventory/depends.txt
+++ b/mods/HUD/mcl_inventory/depends.txt
@@ -1,4 +1,4 @@
 mcl_init
 mcl_player?
 _mcl_autogroup?
-3d_armor?
+mcl_armor?
diff --git a/mods/HUD/mcl_inventory/init.lua b/mods/HUD/mcl_inventory/init.lua
index 03227e85d9..84f2552449 100644
--- a/mods/HUD/mcl_inventory/init.lua
+++ b/mods/HUD/mcl_inventory/init.lua
@@ -3,7 +3,7 @@ local F = minetest.formspec_escape
 
 mcl_inventory = {}
 
-local show_armor = minetest.get_modpath("3d_armor") ~= nil
+local show_armor = minetest.get_modpath("mcl_armor") ~= nil
 local mod_player = minetest.get_modpath("mcl_player") ~= nil
 local mod_craftguide = minetest.get_modpath("mcl_craftguide") ~= nil
 
diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt b/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt
index c17d2db096..9eb136da49 100644
--- a/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt
+++ b/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt
@@ -6,6 +6,6 @@ mcl_worlds
 mcl_core
 mcl_nether
 3d_armor_stand
-3d_armor
+mcl_armor
 doc?
 screwdriver?
diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua
index fd4697813b..4ca7976f34 100644
--- a/mods/ITEMS/mcl_fishing/init.lua
+++ b/mods/ITEMS/mcl_fishing/init.lua
@@ -65,7 +65,7 @@ local fish = function(itemstack, player)
 										{ itemstring = "mcl_core:bowl", weight = 10 },
 										{ itemstring = "mcl_fishing:fishing_rod", weight = 2, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage
 										{ itemstring = "mcl_mobitems:leather", weight = 10 },
-										{ itemstring = "3d_armor:boots_leather", weight = 10, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage
+										{ itemstring = "mcl_armor:boots_leather", weight = 10, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage
 										{ itemstring = "mcl_mobitems:rotten_flesh", weight = 10 },
 										{ itemstring = "mcl_core:stick", weight = 5 },
 										{ itemstring = "mcl_mobitems:string", weight = 5 },
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_generic.ogg b/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_generic.ogg
deleted file mode 100644
index 29b4bcd5f5..0000000000
Binary files a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_generic.ogg and /dev/null differ
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/README.txt b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/README.txt
index 3fe7fb8c40..d5a2c18f4e 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/README.txt
+++ b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/README.txt
@@ -1,6 +1,6 @@
 [mod] 3d Armor Stand [3d_armor_stand]
 =====================================
 
-Depends: 3d_armor
+Depends: mcl_armor
 
-Adds a chest-like armor stand for armor storage and display.
+Adds an armor stand for armor storage and display.
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/depends.txt b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/depends.txt
index f3ae02169e..02ce27d737 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/depends.txt
+++ b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/depends.txt
@@ -1,4 +1,4 @@
-3d_armor
+mcl_armor
 mcl_core
 mcl_sounds
 mcl_stairs
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua
index e2d0f12251..98d3b6a7ca 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua
+++ b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua
@@ -43,6 +43,9 @@ local function update_entity(pos)
 				local stack = inv:get_stack("armor_"..element, 1)
 				if stack:get_count() == 1 then
 					local item = stack:get_name() or ""
+					if minetest.registered_aliases[item] then
+						item = minetest.registered_aliases[item]
+					end
 					local def = stack:get_definition() or {}
 					local groups = def.groups or {}
 					if groups["armor_"..element] then
diff --git a/mods/ITEMS/minetest-3d_armor/README.md b/mods/ITEMS/minetest-3d_armor/README.md
index 0ac2c29ad6..4e2ddcd163 100644
--- a/mods/ITEMS/minetest-3d_armor/README.md
+++ b/mods/ITEMS/minetest-3d_armor/README.md
@@ -1,30 +1,15 @@
-Modpack - 3d Armor
+Modpack - Armor
 ==================
 
-[mod] Unified Skins [unified_skins]
------------------------------------
-
-depends: default
-
-A 3d character model re-texturing api used as the framework for this modpack.
-
-Compatible with player skins mod [skins] by Zeg9 and Player Textures [player_textures] by sdzen.
-
-Note: Currently only supports 64x32px player skins.
-
-[mod] Visible Wielded Items [wieldview]
----------------------------------------
-
-depends: unified_skins
+[mod] Visible Wielded Items `[wieldview]`
+-----------------------------------------
 
 Makes hand wielded items visible to other players.
 
 Note: Currently only supports 16x16px texture packs, sorry!
 
-[mod] Visible Player Armor [3d_armor]
--------------------------------------
-
-depends: unified_skins, inventory_plus
+[mod] Visible Player Armor `[mcl_armor]`
+----------------------------------------
 
 Adds craftable armor that is visible to other players. Each armor item worn contributes to
 a player's armor group level making them less vulnerable to weapons.
@@ -32,10 +17,3 @@ a player's armor group level making them less vulnerable to weapons.
 Armor takes damage when a player is hurt, however, many armor items offer a 'stackable'
 percentage chance of restoring the lost health points.
 
-[mod] Shields [shields]
--------------------------------------
-
-depends: 3d_armor
-
-Originally a part of 3d_armor, shields have been re-included as an optional extra.
-If you do not want shields then simply remove the shields folder from the modpack.
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/README.txt b/mods/ITEMS/minetest-3d_armor/mcl_armor/README.txt
similarity index 73%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/README.txt
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/README.txt
index 92ff6d1471..6e9268c25b 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor/README.txt
+++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/README.txt
@@ -1,7 +1,5 @@
-[mod] Visible Player Armor [3d_armor]
-=====================================
-MineClone 2 edition
--------------------------------------
+[mod] Visible Player Armor [mcl_armor]
+======================================
 
 Adds craftable armor that is visible to other players. Each armor item worn contributes to
 a player's armor group level making them less vulnerable to some forms of damage.
@@ -12,13 +10,13 @@ This mod is based on 3D Armor mod by stu.
 
 Media credits
 -------------
-* 3d_armor_equip_diamond.ogg
-* 3d_armor_unequip_diamond.ogg
+* mcl_armor_equip_diamond.ogg
+* mcl_armor_unequip_diamond.ogg
 Licensed CC0, by Freesound.org user juryduty.
 Source: <https://freesound.org/people/juryduty/sounds/180231/>
 
-* 3d_armor_equip_iron.ogg
-* 3d_armor_unequip_iron.ogg
+* mcl_armor_equip_iron.ogg
+* mcl_armor_unequip_iron.ogg
 Licensed CC0, by Freesound.org user mtchanary.
 Source: <https://freesound.org/people/mitchanary/sounds/506148/>
 
diff --git a/mods/ITEMS/minetest-3d_armor/mcl_armor/alias.lua b/mods/ITEMS/minetest-3d_armor/mcl_armor/alias.lua
new file mode 100644
index 0000000000..19c2424d0d
--- /dev/null
+++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/alias.lua
@@ -0,0 +1,23 @@
+minetest.register_alias("3d_armor:helmet_leather", "mcl_armor:helmet_leather")
+minetest.register_alias("3d_armor:helmet_iron", "mcl_armor:helmet_iron")
+minetest.register_alias("3d_armor:helmet_chain", "mcl_armor:helmet_chain")
+minetest.register_alias("3d_armor:helmet_gold", "mcl_armor:helmet_gold")
+minetest.register_alias("3d_armor:helmet_diamond", "mcl_armor:helmet_diamond")
+
+minetest.register_alias("3d_armor:chestplate_leather", "mcl_armor:chestplate_leather")
+minetest.register_alias("3d_armor:chestplate_iron", "mcl_armor:chestplate_iron")
+minetest.register_alias("3d_armor:chestplate_chain", "mcl_armor:chestplate_chain")
+minetest.register_alias("3d_armor:chestplate_gold", "mcl_armor:chestplate_gold")
+minetest.register_alias("3d_armor:chestplate_diamond", "mcl_armor:chestplate_diamond")
+
+minetest.register_alias("3d_armor:leggings_leather", "mcl_armor:leggings_leather")
+minetest.register_alias("3d_armor:leggings_iron", "mcl_armor:leggings_iron")
+minetest.register_alias("3d_armor:leggings_chain", "mcl_armor:leggings_chain")
+minetest.register_alias("3d_armor:leggings_gold", "mcl_armor:leggings_gold")
+minetest.register_alias("3d_armor:leggings_diamond", "mcl_armor:leggings_diamond")
+
+minetest.register_alias("3d_armor:boots_leather", "mcl_armor:boots_leather")
+minetest.register_alias("3d_armor:boots_iron", "mcl_armor:boots_iron")
+minetest.register_alias("3d_armor:boots_chain", "mcl_armor:boots_chain")
+minetest.register_alias("3d_armor:boots_gold", "mcl_armor:boots_gold")
+minetest.register_alias("3d_armor:boots_diamond", "mcl_armor:boots_diamond")
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/armor.lua b/mods/ITEMS/minetest-3d_armor/mcl_armor/armor.lua
similarity index 94%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/armor.lua
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/armor.lua
index 007bb2744c..d06d5444d6 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor/armor.lua
+++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/armor.lua
@@ -18,7 +18,6 @@ armor = {
 		.."listring[current_player;craft]",
 	textures = {},
 	default_skin = "character",
-	version = "0.4.6",
 }
 
 if minetest.get_modpath("mcl_skins") then
@@ -71,6 +70,9 @@ armor.set_player_armor = function(self, player)
 	for i=1, 6 do
 		local stack = player_inv:get_stack("armor", i)
 		local item = stack:get_name()
+		if minetest.registered_aliases[item] then
+			item = minetest.registered_aliases[item]
+		end
 		if stack:get_count() == 1 then
 			local def = stack:get_definition()
 			for k, v in pairs(elements) do
@@ -177,11 +179,11 @@ end
 
 armor.get_armor_formspec = function(self, name)
 	if not armor.textures[name] then
-		minetest.log("error", "3d_armor: Player texture["..name.."] is nil [get_armor_formspec]")
+		minetest.log("error", "mcl_armor: Player texture["..name.."] is nil [get_armor_formspec]")
 		return ""
 	end
 	if not armor.def[name] then
-		minetest.log("error", "3d_armor: Armor def["..name.."] is nil [get_armor_formspec]")
+		minetest.log("error", "mcl_armor: Armor def["..name.."] is nil [get_armor_formspec]")
 		return ""
 	end
 	local formspec = armor.formspec.."list[detached:"..name.."_armor;armor;0,1;2,3;]"
@@ -197,25 +199,25 @@ end
 armor.get_valid_player = function(self, player, msg)
 	msg = msg or ""
 	if not player then
-		minetest.log("error", "3d_armor: Player reference is nil "..msg)
+		minetest.log("error", "mcl_armor: Player reference is nil "..msg)
 		return
 	end
 	local name = player:get_player_name()
 	if not name then
-		minetest.log("error", "3d_armor: Player name is nil "..msg)
+		minetest.log("error", "mcl_armor: Player name is nil "..msg)
 		return
 	end
 	local pos = player:get_pos()
 	local player_inv = player:get_inventory()
 	local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"})
 	if not pos then
-		minetest.log("error", "3d_armor: Player position is nil "..msg)
+		minetest.log("error", "mcl_armor: Player position is nil "..msg)
 		return
 	elseif not player_inv then
-		minetest.log("error", "3d_armor: Player inventory is nil "..msg)
+		minetest.log("error", "mcl_armor: Player inventory is nil "..msg)
 		return
 	elseif not armor_inv then
-		minetest.log("error", "3d_armor: Detached armor inventory is nil "..msg)
+		minetest.log("error", "mcl_armor: Detached armor inventory is nil "..msg)
 		return
 	end
 	return name, player_inv, armor_inv, pos
@@ -230,7 +232,7 @@ armor.play_equip_sound = function(self, player, stack, unequip)
 	local snd = def.sounds and def.sounds["_mcl_armor_"..estr]
 	if not snd then
 		-- Fallback sound
-		snd = { name = "3d_armor_"..estr.."_iron" }
+		snd = { name = "mcl_armor_"..estr.."_iron" }
 	end
 	if snd then
 		minetest.sound_play(snd, {object=player, gain=0.5, max_hear_distance=8})
@@ -239,7 +241,7 @@ end
 
 -- Register Player Model
 
-mcl_player.player_register_model("3d_armor_character.b3d", {
+mcl_player.player_register_model("mcl_armor_character.b3d", {
 	animation_speed = 30,
 	textures = {
 		armor.default_skin..".png",
@@ -282,7 +284,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 end)
 
 minetest.register_on_joinplayer(function(player)
-	mcl_player.player_set_model(player, "3d_armor_character.b3d")
+	mcl_player.player_set_model(player, "mcl_armor_character.b3d")
 	local name = player:get_player_name()
 	local player_inv = player:get_inventory()
 	local armor_inv = minetest.create_detached_inventory(name.."_armor", {
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/depends.txt b/mods/ITEMS/minetest-3d_armor/mcl_armor/depends.txt
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/depends.txt
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/depends.txt
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/description.txt b/mods/ITEMS/minetest-3d_armor/mcl_armor/description.txt
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/description.txt
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/description.txt
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/init.lua b/mods/ITEMS/minetest-3d_armor/mcl_armor/init.lua
similarity index 60%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/init.lua
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/init.lua
index 774bd07a3c..42ad8f2405 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor/init.lua
+++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/init.lua
@@ -1,258 +1,259 @@
-local S = minetest.get_translator("3d_armor")
+local S = minetest.get_translator("mcl_armor")
 
 dofile(minetest.get_modpath(minetest.get_current_modname()).."/armor.lua")
+dofile(minetest.get_modpath(minetest.get_current_modname()).."/alias.lua")
 
 -- Regisiter Head Armor
 
 local longdesc = S("This is a piece of equippable armor which reduces the amount of damage you receive.")
 local usage = S("To equip it, put it on the corresponding armor slot in your inventory menu.")
 
-minetest.register_tool("3d_armor:helmet_leather", {
+minetest.register_tool("mcl_armor:helmet_leather", {
 	description = S("Leather Cap"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_helmet_leather.png",
+	inventory_image = "mcl_armor_inv_helmet_leather.png",
 	groups = {armor_head=1, mcl_armor_points=1, mcl_armor_uses=56},
 	_repair_material = "mcl_mobitems:leather",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_leather",
-		_mcl_armor_unequip = "3d_armor_unequip_leather",
+		_mcl_armor_equip = "mcl_armor_equip_leather",
+		_mcl_armor_unequip = "mcl_armor_unequip_leather",
 	},
 })
 
-minetest.register_tool("3d_armor:helmet_iron", {
+minetest.register_tool("mcl_armor:helmet_iron", {
 	description = S("Iron Helmet"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_helmet_iron.png",
+	inventory_image = "mcl_armor_inv_helmet_iron.png",
 	groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=166},
 	_repair_material = "mcl_core:iron_ingot",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_iron",
-		_mcl_armor_unequip = "3d_armor_unequip_iron",
+		_mcl_armor_equip = "mcl_armor_equip_iron",
+		_mcl_armor_unequip = "mcl_armor_unequip_iron",
 	},
 })
 
-minetest.register_tool("3d_armor:helmet_gold", {
+minetest.register_tool("mcl_armor:helmet_gold", {
 	description = S("Golden Helmet"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_helmet_gold.png",
+	inventory_image = "mcl_armor_inv_helmet_gold.png",
 	groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=78},
 	_repair_material = "mcl_core:gold_ingot",
 })
 
-minetest.register_tool("3d_armor:helmet_diamond",{
+minetest.register_tool("mcl_armor:helmet_diamond",{
 	description = S("Diamond Helmet"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_helmet_diamond.png",
+	inventory_image = "mcl_armor_inv_helmet_diamond.png",
 	groups = {armor_head=1, mcl_armor_points=3, mcl_armor_uses=364, mcl_armor_toughness=2},
 	_repair_material = "mcl_core:diamond",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_diamond",
-		_mcl_armor_unequip = "3d_armor_unequip_diamond",
+		_mcl_armor_equip = "mcl_armor_equip_diamond",
+		_mcl_armor_unequip = "mcl_armor_unequip_diamond",
 	},
 })
 
-minetest.register_tool("3d_armor:helmet_chain", {
+minetest.register_tool("mcl_armor:helmet_chain", {
 	description = S("Chain Helmet"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_helmet_chain.png",
+	inventory_image = "mcl_armor_inv_helmet_chain.png",
 	groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=166},
 	_repair_material = "mcl_core:iron_ingot",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_chainmail",
-		_mcl_armor_unequip = "3d_armor_unequip_chainmail",
+		_mcl_armor_equip = "mcl_armor_equip_chainmail",
+		_mcl_armor_unequip = "mcl_armor_unequip_chainmail",
 	},
 })
 
 -- Regisiter Torso Armor
 
-minetest.register_tool("3d_armor:chestplate_leather", {
+minetest.register_tool("mcl_armor:chestplate_leather", {
 	description = S("Leather Tunic"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_chestplate_leather.png",
+	inventory_image = "mcl_armor_inv_chestplate_leather.png",
 	groups = {armor_torso=1, mcl_armor_points=3, mcl_armor_uses=81},
 	_repair_material = "mcl_mobitems:leather",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_leather",
-		_mcl_armor_unequip = "3d_armor_unequip_leather",
+		_mcl_armor_equip = "mcl_armor_equip_leather",
+		_mcl_armor_unequip = "mcl_armor_unequip_leather",
 	},
 })
 
-minetest.register_tool("3d_armor:chestplate_iron", {
+minetest.register_tool("mcl_armor:chestplate_iron", {
 	description = S("Iron Chestplate"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_chestplate_iron.png",
+	inventory_image = "mcl_armor_inv_chestplate_iron.png",
 	groups = {armor_torso=1, mcl_armor_points=6, mcl_armor_uses=241},
 	_repair_material = "mcl_core:iron_ingot",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_iron",
-		_mcl_armor_unequip = "3d_armor_unequip_iron",
+		_mcl_armor_equip = "mcl_armor_equip_iron",
+		_mcl_armor_unequip = "mcl_armor_unequip_iron",
 	},
 })
 
-minetest.register_tool("3d_armor:chestplate_gold", {
+minetest.register_tool("mcl_armor:chestplate_gold", {
 	description = S("Golden Chestplate"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_chestplate_gold.png",
+	inventory_image = "mcl_armor_inv_chestplate_gold.png",
 	groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=113},
 	_repair_material = "mcl_core:gold_ingot",
 })
 
-minetest.register_tool("3d_armor:chestplate_diamond",{
+minetest.register_tool("mcl_armor:chestplate_diamond",{
 	description = S("Diamond Chestplate"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_chestplate_diamond.png",
+	inventory_image = "mcl_armor_inv_chestplate_diamond.png",
 	groups = {armor_torso=1, mcl_armor_points=8, mcl_armor_uses=529, mcl_armor_toughness=2},
 	_repair_material = "mcl_core:diamond",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_diamond",
-		_mcl_armor_unequip = "3d_armor_unequip_diamond",
+		_mcl_armor_equip = "mcl_armor_equip_diamond",
+		_mcl_armor_unequip = "mcl_armor_unequip_diamond",
 	},
 })
 
-minetest.register_tool("3d_armor:chestplate_chain", {
+minetest.register_tool("mcl_armor:chestplate_chain", {
 	description = S("Chain Chestplate"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_chestplate_chain.png",
+	inventory_image = "mcl_armor_inv_chestplate_chain.png",
 	groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=241},
 	_repair_material = "mcl_core:iron_ingot",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_chainmail",
-		_mcl_armor_unequip = "3d_armor_unequip_chainmail",
+		_mcl_armor_equip = "mcl_armor_equip_chainmail",
+		_mcl_armor_unequip = "mcl_armor_unequip_chainmail",
 	},
 })
 
 -- Regisiter Leg Armor
 
-minetest.register_tool("3d_armor:leggings_leather", {
+minetest.register_tool("mcl_armor:leggings_leather", {
 	description = S("Leather Pants"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_leggings_leather.png",
+	inventory_image = "mcl_armor_inv_leggings_leather.png",
 	groups = {armor_legs=1, mcl_armor_points=2, mcl_armor_uses=76},
 	_repair_material = "mcl_mobitems:leather",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_leather",
-		_mcl_armor_unequip = "3d_armor_unequip_leather",
+		_mcl_armor_equip = "mcl_armor_equip_leather",
+		_mcl_armor_unequip = "mcl_armor_unequip_leather",
 	},
 })
 
-minetest.register_tool("3d_armor:leggings_iron", {
+minetest.register_tool("mcl_armor:leggings_iron", {
 	description = S("Iron Leggings"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_leggings_iron.png",
+	inventory_image = "mcl_armor_inv_leggings_iron.png",
 	groups = {armor_legs=1, mcl_armor_points=5, mcl_armor_uses=226},
 	_repair_material = "mcl_core:iron_ingot",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_iron",
-		_mcl_armor_unequip = "3d_armor_unequip_iron",
+		_mcl_armor_equip = "mcl_armor_equip_iron",
+		_mcl_armor_unequip = "mcl_armor_unequip_iron",
 	},
 })
 
-minetest.register_tool("3d_armor:leggings_gold", {
+minetest.register_tool("mcl_armor:leggings_gold", {
 	description = S("Golden Leggings"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_leggings_gold.png",
+	inventory_image = "mcl_armor_inv_leggings_gold.png",
 	groups = {armor_legs=1, mcl_armor_points=3, mcl_armor_uses=106},
 	_repair_material = "mcl_core:gold_ingot",
 })
 
-minetest.register_tool("3d_armor:leggings_diamond",{
+minetest.register_tool("mcl_armor:leggings_diamond",{
 	description = S("Diamond Leggings"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_leggings_diamond.png",
+	inventory_image = "mcl_armor_inv_leggings_diamond.png",
 	groups = {armor_legs=1, mcl_armor_points=6, mcl_armor_uses=496, mcl_armor_toughness=2},
 	_repair_material = "mcl_core:diamond",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_diamond",
-		_mcl_armor_unequip = "3d_armor_unequip_diamond",
+		_mcl_armor_equip = "mcl_armor_equip_diamond",
+		_mcl_armor_unequip = "mcl_armor_unequip_diamond",
 	},
 })
 
-minetest.register_tool("3d_armor:leggings_chain", {
+minetest.register_tool("mcl_armor:leggings_chain", {
 	description = S("Chain Leggings"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_leggings_chain.png",
+	inventory_image = "mcl_armor_inv_leggings_chain.png",
 	groups = {armor_legs=1, mcl_armor_points=4, mcl_armor_uses=226},
 	_repair_material = "mcl_core:iron_ingot",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_chainmail",
-		_mcl_armor_unequip = "3d_armor_unequip_chainmail",
+		_mcl_armor_equip = "mcl_armor_equip_chainmail",
+		_mcl_armor_unequip = "mcl_armor_unequip_chainmail",
 	},
 })
 -- Regisiter Boots
 
-minetest.register_tool("3d_armor:boots_leather", {
+minetest.register_tool("mcl_armor:boots_leather", {
 	description = S("Leather Boots"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_boots_leather.png",
+	inventory_image = "mcl_armor_inv_boots_leather.png",
 	groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=66},
 	_repair_material = "mcl_mobitems:leather",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_leather",
-		_mcl_armor_unequip = "3d_armor_unequip_leather",
+		_mcl_armor_equip = "mcl_armor_equip_leather",
+		_mcl_armor_unequip = "mcl_armor_unequip_leather",
 	},
 })
 
-minetest.register_tool("3d_armor:boots_iron", {
+minetest.register_tool("mcl_armor:boots_iron", {
 	description = S("Iron Boots"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_boots_iron.png",
+	inventory_image = "mcl_armor_inv_boots_iron.png",
 	groups = {armor_feet=1, mcl_armor_points=2, mcl_armor_uses=196},
 	_repair_material = "mcl_core:iron_ingot",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_iron",
-		_mcl_armor_unequip = "3d_armor_unequip_iron",
+		_mcl_armor_equip = "mcl_armor_equip_iron",
+		_mcl_armor_unequip = "mcl_armor_unequip_iron",
 	},
 })
 
-minetest.register_tool("3d_armor:boots_gold", {
+minetest.register_tool("mcl_armor:boots_gold", {
 	description = S("Golden Boots"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_boots_gold.png",
+	inventory_image = "mcl_armor_inv_boots_gold.png",
 	groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=92},
 	_repair_material = "mcl_core:gold_ingot",
 })
 
-minetest.register_tool("3d_armor:boots_diamond",{
+minetest.register_tool("mcl_armor:boots_diamond",{
 	description = S("Diamond Boots"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_boots_diamond.png",
+	inventory_image = "mcl_armor_inv_boots_diamond.png",
 	groups = {armor_feet=1, mcl_armor_points=3, mcl_armor_uses=430, mcl_armor_toughness=2},
 	_repair_material = "mcl_core:diamond",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_diamond",
-		_mcl_armor_unequip = "3d_armor_unequip_diamond",
+		_mcl_armor_equip = "mcl_armor_equip_diamond",
+		_mcl_armor_unequip = "mcl_armor_unequip_diamond",
 	},
 })
 
-minetest.register_tool("3d_armor:boots_chain", {
+minetest.register_tool("mcl_armor:boots_chain", {
 	description = S("Chain Boots"),
 	_doc_items_longdesc = longdesc,
 	_doc_items_usagehelp = usage,
-	inventory_image = "3d_armor_inv_boots_chain.png",
+	inventory_image = "mcl_armor_inv_boots_chain.png",
 	groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=196},
 	_repair_material = "mcl_core:iron_ingot",
 	sounds = {
-		_mcl_armor_equip = "3d_armor_equip_chainmail",
-		_mcl_armor_unequip = "3d_armor_unequip_chainmail",
+		_mcl_armor_equip = "mcl_armor_equip_chainmail",
+		_mcl_armor_unequip = "mcl_armor_unequip_chainmail",
 	},
 })
 
@@ -273,7 +274,7 @@ for k, v in pairs(craft_ingreds) do
 	local c = v[2]
 	if m ~= nil then
 		minetest.register_craft({
-			output = "3d_armor:helmet_"..k,
+			output = "mcl_armor:helmet_"..k,
 			recipe = {
 				{m, m, m},
 				{m, "", m},
@@ -281,7 +282,7 @@ for k, v in pairs(craft_ingreds) do
 			},
 		})
 		minetest.register_craft({
-			output = "3d_armor:chestplate_"..k,
+			output = "mcl_armor:chestplate_"..k,
 			recipe = {
 				{m, "", m},
 				{m, m, m},
@@ -289,7 +290,7 @@ for k, v in pairs(craft_ingreds) do
 			},
 		})
 		minetest.register_craft({
-			output = "3d_armor:leggings_"..k,
+			output = "mcl_armor:leggings_"..k,
 			recipe = {
 				{m, m, m},
 				{m, "", m},
@@ -297,7 +298,7 @@ for k, v in pairs(craft_ingreds) do
 			},
 		})
 		minetest.register_craft({
-			output = "3d_armor:boots_"..k,
+			output = "mcl_armor:boots_"..k,
 			recipe = {
 				{m, "", m},
 				{m, "", m},
@@ -308,26 +309,27 @@ for k, v in pairs(craft_ingreds) do
 		minetest.register_craft({
 			type = "cooking",
 			output = c,
-			recipe = "3d_armor:helmet_"..k,
+			recipe = "mcl_armor:helmet_"..k,
 			cooktime = 10,
 		})
 		minetest.register_craft({
 			type = "cooking",
 			output = c,
-			recipe = "3d_armor:chestplate_"..k,
+			recipe = "mcl_armor:chestplate_"..k,
 			cooktime = 10,
 		})
 		minetest.register_craft({
 			type = "cooking",
 			output = c,
-			recipe = "3d_armor:leggings_"..k,
+			recipe = "mcl_armor:leggings_"..k,
 			cooktime = 10,
 		})
 		minetest.register_craft({
 			type = "cooking",
 			output = c,
-			recipe = "3d_armor:boots_"..k,
+			recipe = "mcl_armor:boots_"..k,
 			cooktime = 10,
 		})
 	end
 end
+
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.de.tr b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.de.tr
similarity index 97%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.de.tr
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.de.tr
index 12c7c09eb1..09da3a9cc7 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.de.tr
+++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.de.tr
@@ -1,4 +1,4 @@
-# textdomain: 3d_armor
+# textdomain: mcl_armor
 This is a piece of equippable armor which reduces the amount of damage you receive.=Dies ist ein Teil einer tragbaren Rüstung, die die Menge an Schaden, den Sie erleiden, reduziert.
 To equip it, put it on the corresponding armor slot in your inventory menu.=Um es zu tragen, legen Sie es in den passenden Rüstungsplatz in ihrem Inventarmenü.
 Leather Cap=Lederkappe
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.es.tr b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.es.tr
similarity index 97%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.es.tr
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.es.tr
index 6606d2ff93..e770dff0cb 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.es.tr
+++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.es.tr
@@ -1,4 +1,4 @@
-# textdomain: 3d_armor
+# textdomain: mcl_armor
 This is a piece of equippable armor which reduces the amount of damage you receive.=Dies ist ein Teil einer tragbaren Rüstung, die die Menge an Schaden, den Sie erleiden, reduziert.
 To equip it, put it on the corresponding armor slot in your inventory menu.=Um es zu tragen, legen Sie es in den passenden Rüstungsplatz in ihrem Inventarmenü.
 Leather Cap=Sombrero de cuero
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/template.txt b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/template.txt
similarity index 95%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/locale/template.txt
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/locale/template.txt
index f0126bca94..8a95fca02d 100644
--- a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/template.txt
+++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/template.txt
@@ -1,4 +1,4 @@
-# textdomain: 3d_armor
+# textdomain: mcl_armor
 This is a piece of equippable armor which reduces the amount of damage you receive.=
 To equip it, put it on the corresponding armor slot in your inventory menu.=
 Leather Cap=
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/models/3d_armor_character.b3d b/mods/ITEMS/minetest-3d_armor/mcl_armor/models/mcl_armor_character.b3d
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/models/3d_armor_character.b3d
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/models/mcl_armor_character.b3d
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/models/3d_armor_character.blend b/mods/ITEMS/minetest-3d_armor/mcl_armor/models/mcl_armor_character.blend
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/models/3d_armor_character.blend
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/models/mcl_armor_character.blend
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_chainmail.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_chainmail.ogg
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_chainmail.ogg
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_chainmail.ogg
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_diamond.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_diamond.ogg
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_diamond.ogg
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_diamond.ogg
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_iron.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_iron.ogg
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_iron.ogg
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_iron.ogg
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_leather.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_leather.ogg
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_leather.ogg
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_leather.ogg
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_chainmail.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_chainmail.ogg
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_chainmail.ogg
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_chainmail.ogg
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_diamond.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_diamond.ogg
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_diamond.ogg
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_diamond.ogg
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_iron.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_iron.ogg
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_iron.ogg
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_iron.ogg
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_leather.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_leather.ogg
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_leather.ogg
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_leather.ogg
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_chain.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_chain.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_chain.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_chain_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_chain_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_chain_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_chain_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_diamond.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_diamond.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_diamond.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_diamond_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_diamond_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_diamond_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_diamond_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_gold.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_gold.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_gold.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_gold_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_gold_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_gold_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_gold_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_iron.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_iron.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_iron.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_iron_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_iron_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_iron_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_iron_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_leather.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_leather.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_leather.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_leather_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_leather_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_leather_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_leather_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_chain.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_chain.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_chain.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_chain_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_chain_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_chain_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_chain_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_diamond.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_diamond.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_diamond.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_diamond_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_diamond_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_diamond_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_diamond_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_gold.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_gold.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_gold.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_gold_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_gold_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_gold_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_gold_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_iron.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_iron.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_iron.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_iron_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_iron_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_iron_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_iron_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_leather.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_leather.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_leather.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_leather_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_leather_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_leather_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_leather_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_chain.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_chain.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_chain.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_chain_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_chain_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_chain_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_chain_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_diamond.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_diamond.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_diamond.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_diamond_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_diamond_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_diamond_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_diamond_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_gold.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_gold.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_gold.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_gold_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_gold_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_gold_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_gold_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_iron.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_iron.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_iron.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_iron_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_iron_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_iron_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_iron_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_leather.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_leather.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_leather.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_leather_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_leather_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_leather_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_leather_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_chain.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_chain.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_chain.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_diamond.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_diamond.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_diamond.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_gold.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_gold.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_gold.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_iron.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_iron.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_iron.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_leather.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_leather.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_leather.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_chain.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_chain.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_chain.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_diamond.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_diamond.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_diamond.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_gold.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_gold.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_gold.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_iron.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_iron.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_iron.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_leather.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_leather.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_leather.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_chain.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_chain.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_chain.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_diamond.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_diamond.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_diamond.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_gold.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_gold.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_gold.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_iron.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_iron.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_iron.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_leather.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_leather.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_leather.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_chain.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_chain.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_chain.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_diamond.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_diamond.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_diamond.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_gold.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_gold.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_gold.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_iron.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_iron.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_iron.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_leather.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_leather.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_leather.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_chain.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_chain.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_chain.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_chain_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_chain_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_chain_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_chain_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_diamond.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_diamond.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_diamond.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_diamond_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_diamond_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_diamond_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_diamond_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_gold.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_gold.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_gold.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_gold_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_gold_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_gold_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_gold_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_iron.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_iron.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_iron.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_iron_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_iron_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_iron_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_iron_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_leather.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_leather.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_leather.png
diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_leather_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_leather_preview.png
similarity index 100%
rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_leather_preview.png
rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_leather_preview.png
diff --git a/mods/ITEMS/minetest-3d_armor/wieldview/README.txt b/mods/ITEMS/minetest-3d_armor/wieldview/README.txt
index e6be7490ac..66133c745a 100644
--- a/mods/ITEMS/minetest-3d_armor/wieldview/README.txt
+++ b/mods/ITEMS/minetest-3d_armor/wieldview/README.txt
@@ -1,7 +1,7 @@
 [mod] visible wielded items [wieldview]
 =======================================
 
-Depends on: 3d_armor
+Depends on: mcl_armor
 
 Makes hand wielded items visible to other players.
 
diff --git a/mods/ITEMS/minetest-3d_armor/wieldview/depends.txt b/mods/ITEMS/minetest-3d_armor/wieldview/depends.txt
index b6cac2191f..2bbf820fd6 100644
--- a/mods/ITEMS/minetest-3d_armor/wieldview/depends.txt
+++ b/mods/ITEMS/minetest-3d_armor/wieldview/depends.txt
@@ -1 +1 @@
-3d_armor
+mcl_armor
diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua
index 2bb7ff61e7..fdde8004f1 100644
--- a/mods/MISC/mcl_temp_helper_recipes/init.lua
+++ b/mods/MISC/mcl_temp_helper_recipes/init.lua
@@ -40,7 +40,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "3d_armor:helmet_chain",
+	output = "mcl_armor:helmet_chain",
 	recipe = {
 		{ "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" },
 		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
@@ -48,7 +48,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "3d_armor:leggings_chain",
+	output = "mcl_armor:leggings_chain",
 	recipe = {
 		{ "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" },
 		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
@@ -57,7 +57,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "3d_armor:boots_chain",
+	output = "mcl_armor:boots_chain",
 	recipe = {
 		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
 		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
@@ -65,7 +65,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "3d_armor:chestplate_chain",
+	output = "mcl_armor:chestplate_chain",
 	recipe = {
 		{ "xpanes:bar_flat", "", "xpanes:bar_flat" },
 		{ "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" },
diff --git a/mods/PLAYER/mcl_death_drop/depends.txt b/mods/PLAYER/mcl_death_drop/depends.txt
index b6cac2191f..2bbf820fd6 100644
--- a/mods/PLAYER/mcl_death_drop/depends.txt
+++ b/mods/PLAYER/mcl_death_drop/depends.txt
@@ -1 +1 @@
-3d_armor
+mcl_armor
diff --git a/mods/PLAYER/mcl_playerinfo/depends.txt b/mods/PLAYER/mcl_playerinfo/depends.txt
index 3fb3720197..d0334ff541 100644
--- a/mods/PLAYER/mcl_playerinfo/depends.txt
+++ b/mods/PLAYER/mcl_playerinfo/depends.txt
@@ -2,4 +2,3 @@ mcl_init
 mcl_core
 mcl_particles
 mcl_death_messages
-3d_armor?
diff --git a/mods/PLAYER/mcl_playerplus/depends.txt b/mods/PLAYER/mcl_playerplus/depends.txt
index 3e89821cc8..6bbe4cbdb8 100644
--- a/mods/PLAYER/mcl_playerplus/depends.txt
+++ b/mods/PLAYER/mcl_playerplus/depends.txt
@@ -5,6 +5,5 @@ mcl_hunger
 mcl_death_messages
 playerphysics
 mcl_playerinfo
-3d_armor?
 mcl_weather
 mcl_spawn
diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua
index 19e5c2d54b..99939d1df6 100644
--- a/mods/PLAYER/mcl_playerplus/init.lua
+++ b/mods/PLAYER/mcl_playerplus/init.lua
@@ -3,7 +3,6 @@ local S = minetest.get_translator("mcl_playerplus")
 -- Internal player state
 local mcl_playerplus_internal = {}
 
-local armor_mod = minetest.get_modpath("3d_armor")
 local def = {}
 local time = 0
 
diff --git a/mods/PLAYER/mcl_skins/depends.txt b/mods/PLAYER/mcl_skins/depends.txt
index e0804a6f9f..09bdf5205e 100644
--- a/mods/PLAYER/mcl_skins/depends.txt
+++ b/mods/PLAYER/mcl_skins/depends.txt
@@ -1,4 +1,4 @@
 mcl_player
 mcl_inventory?
 intllib?
-3d_armor?
+mcl_armor?
diff --git a/mods/PLAYER/mcl_skins/init.lua b/mods/PLAYER/mcl_skins/init.lua
index 401ba1600b..c1f557d943 100644
--- a/mods/PLAYER/mcl_skins/init.lua
+++ b/mods/PLAYER/mcl_skins/init.lua
@@ -105,7 +105,7 @@ mcl_skins.set_player_skin = function(player, skin_id)
 	mcl_skins.previews[playername] = preview
 	player:get_meta():set_string("mcl_skins:skin_id", tostring(skin_id))
 	mcl_skins.update_player_skin(player)
-	if minetest.get_modpath("3d_armor") then
+	if minetest.get_modpath("mcl_armor") then
 		armor.textures[playername].skin = skin_file
 		armor:update_player_visuals(player)
 	end
diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv
index ab4a945190..db82bd1f27 100644
--- a/tools/Conversion_Table.csv
+++ b/tools/Conversion_Table.csv
@@ -589,26 +589,26 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/blocks,wool_colored_purple.png,/mods/ITEMS/mcl_wool/textures,wool_violet.png,,,,,,,
 /assets/minecraft/textures/blocks,wool_colored_white.png,/mods/ITEMS/mcl_wool/textures,wool_white.png,,,,,,,
 /assets/minecraft/textures/blocks,wool_colored_yellow.png,/mods/ITEMS/mcl_wool/textures,wool_yellow.png,,,,,,,
-/assets/minecraft/textures/items,chainmail_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_chain.png,,,,,,,
-/assets/minecraft/textures/items,diamond_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_diamond.png,,,,,,,
-/assets/minecraft/textures/items,gold_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_gold.png,,,,,,,
-/assets/minecraft/textures/items,iron_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_iron.png,,,,,,,
-/assets/minecraft/textures/items,leather_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_leather.png,,,,,,,
-/assets/minecraft/textures/items,chainmail_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_chain.png,,,,,,,
-/assets/minecraft/textures/items,diamond_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_diamond.png,,,,,,,
-/assets/minecraft/textures/items,gold_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_gold.png,,,,,,,
-/assets/minecraft/textures/items,iron_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_iron.png,,,,,,,
-/assets/minecraft/textures/items,leather_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_leather.png,,,,,,,
-/assets/minecraft/textures/items,chainmail_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_chain.png,,,,,,,
-/assets/minecraft/textures/items,diamond_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_diamond.png,,,,,,,
-/assets/minecraft/textures/items,gold_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_gold.png,,,,,,,
-/assets/minecraft/textures/items,iron_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_iron.png,,,,,,,
-/assets/minecraft/textures/items,leather_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_leather.png,,,,,,,
-/assets/minecraft/textures/items,chainmail_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_chain.png,,,,,,,
-/assets/minecraft/textures/items,diamond_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_diamond.png,,,,,,,
-/assets/minecraft/textures/items,gold_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_gold.png,,,,,,,
-/assets/minecraft/textures/items,iron_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_iron.png,,,,,,,
-/assets/minecraft/textures/items,leather_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_leather.png,,,,,,,
+/assets/minecraft/textures/items,chainmail_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_chain.png,,,,,,,
+/assets/minecraft/textures/items,diamond_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_diamond.png,,,,,,,
+/assets/minecraft/textures/items,gold_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_gold.png,,,,,,,
+/assets/minecraft/textures/items,iron_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_iron.png,,,,,,,
+/assets/minecraft/textures/items,leather_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_leather.png,,,,,,,
+/assets/minecraft/textures/items,chainmail_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_chain.png,,,,,,,
+/assets/minecraft/textures/items,diamond_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_diamond.png,,,,,,,
+/assets/minecraft/textures/items,gold_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_gold.png,,,,,,,
+/assets/minecraft/textures/items,iron_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_iron.png,,,,,,,
+/assets/minecraft/textures/items,leather_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_leather.png,,,,,,,
+/assets/minecraft/textures/items,chainmail_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_chain.png,,,,,,,
+/assets/minecraft/textures/items,diamond_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_diamond.png,,,,,,,
+/assets/minecraft/textures/items,gold_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_gold.png,,,,,,,
+/assets/minecraft/textures/items,iron_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_iron.png,,,,,,,
+/assets/minecraft/textures/items,leather_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_leather.png,,,,,,,
+/assets/minecraft/textures/items,chainmail_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_chain.png,,,,,,,
+/assets/minecraft/textures/items,diamond_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_diamond.png,,,,,,,
+/assets/minecraft/textures/items,gold_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_gold.png,,,,,,,
+/assets/minecraft/textures/items,iron_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_iron.png,,,,,,,
+/assets/minecraft/textures/items,leather_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_leather.png,,,,,,,
 /assets/minecraft/textures/items,wooden_armorstand.png,/mods/ITEMS/minetest-3d_armor/3d_armor_stand/textures,3d_armor_stand_item.png,,,,,,,
 /assets/minecraft/textures/blocks,dispenser_front_horizontal.png,/mods/ITEMS/REDSTONE/mcl_dispensers/textures,mcl_dispensers_dispenser_front_horizontal.png,,,,,,,
 /assets/minecraft/textures/blocks,dispenser_front_vertical.png,/mods/ITEMS/REDSTONE/mcl_dispensers/textures,mcl_dispensers_dispenser_front_vertical.png,,,,,,,