diff --git a/maidroid/api.lua b/maidroid/api.lua
index 9cf5615..929ff26 100644
--- a/maidroid/api.lua
+++ b/maidroid/api.lua
@@ -145,6 +145,28 @@ end) ()
 
 ---------------------------------------------------------------------
 
+local formspec_opened_selves = {}
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+    if formname ~= "maidroid:gui" then return end
+
+    local self = formspec_opened_selves[player]
+
+    if not self then return end
+
+    if fields.name then
+        if fields.name == "" then
+            self.nametag = self.inventory_name
+        else
+            self.nametag = fields.name
+        end
+
+        self.object:set_nametag_attributes{
+            text = self.nametag
+        }
+    end
+end)
+
 -- maidroid.register_core registers a definition of a new core.
 function maidroid.register_core(core_name, def)
 	maidroid.registered_cores[core_name] = def
@@ -181,7 +203,7 @@ function maidroid.register_maidroid(product_name, def)
 
 	-- create_inventory creates a new inventory, and returns it.
 	local function create_inventory(self)
-		self.inventory_name = self.product_name .. tostring(self.manufacturing_number)
+		self.inventory_name = self.product_name .. "_" .. tostring(self.manufacturing_number)
 		local inventory = minetest.create_detached_inventory(self.inventory_name, {
 			on_put = function(inv, listname, index, stack, player)
 				if listname == "core" then
@@ -222,12 +244,18 @@ function maidroid.register_maidroid(product_name, def)
 
 	-- create_formspec_string returns a string that represents a formspec definition.
 	local function create_formspec_string(self)
+		local nametag = self.object:get_nametag_attributes().text
 		return "size[8,9]"
+			.. default.gui_bg
+			.. default.gui_bg_img
+ 			.. default.gui_slots
 			.. "list[detached:"..self.inventory_name..";main;0,0;4,4;]"
-			.. "label[5,0;core]"
-			.. "list[detached:"..self.inventory_name..";core;6,0;1,1;]"
+			.. "label[5.5,1;core]"
+			.. "list[detached:"..self.inventory_name..";core;5.5,1.5;1,1;]"
 			.. "list[current_player;main;0,5;8,1;]"
 			.. "list[current_player;main;0,6.2;8,3;8]"
+			.. "button[7,0.25;1,0.875;apply_name;Apply]"
+			.. "field[4.5,0.5;2.75,1;name;name;" .. nametag .. "]"
 	end
 
 	-- on_activate is a callback function that is called when the object is created or recreated.
@@ -238,12 +266,14 @@ function maidroid.register_maidroid(product_name, def)
 			self.manufacturing_number = maidroid.manufacturing_data[product_name]
 			maidroid.manufacturing_data[product_name] = maidroid.manufacturing_data[product_name] + 1
 			create_inventory(self)
+			self.nametag = self.inventory_name
 		else
 			-- if static data is not empty string, this object has beed already created.
 			local data = minetest.deserialize(staticdata)
 
 			self.product_name = data["product_name"]
 			self.manufacturing_number = data["manufacturing_number"]
+			self.nametag = data["nametag"]
 
 			local inventory = create_inventory(self)
 			local core_name = data["inventory"]["core"]
@@ -263,9 +293,12 @@ function maidroid.register_maidroid(product_name, def)
 			end
 		end
 
-		self.formspec_string = create_formspec_string(self)
 		update_infotext(self)
 
+		self.object:set_nametag_attributes{
+			text = self.nametag
+		}
+
 		local core = self:get_core()
 		if core ~= nil then
 			core.on_start(self)
@@ -281,6 +314,7 @@ function maidroid.register_maidroid(product_name, def)
 		local data = {
 			["product_name"] = self.product_name,
 			["manufacturing_number"] = self.manufacturing_number,
+			["nametag"] = self.nametag,
 			["inventory"] = {
 				["main"] = {},
 				["core"] = self.core_name,
@@ -308,10 +342,12 @@ function maidroid.register_maidroid(product_name, def)
 
 	-- on_rightclick is a callback function that is called when a player right-click them.
 	local function on_rightclick(self, clicker)
+		formspec_opened_selves[clicker] = self
+
 		minetest.show_formspec(
 			clicker:get_player_name(),
-			self.inventory_name,
-			self.formspec_string
+			"maidroid:gui",
+			create_formspec_string(self)
 		)
 	end
 
@@ -348,6 +384,7 @@ function maidroid.register_maidroid(product_name, def)
 		makes_footstep_sound         = true,
 		automatic_face_movement_dir  = 90.0,
 		infotext                     = "",
+		nametag                      = "",
 
 		-- extra initial properties
 		pause                        = false,
diff --git a/maidroid/depends.txt b/maidroid/depends.txt
new file mode 100644
index 0000000..331d858
--- /dev/null
+++ b/maidroid/depends.txt
@@ -0,0 +1 @@
+default
\ No newline at end of file