diff --git a/lua/entities/gmod_wire_expression2/cl_init.lua b/lua/entities/gmod_wire_expression2/cl_init.lua
index a356dc1a5a..f28a55c743 100644
--- a/lua/entities/gmod_wire_expression2/cl_init.lua
+++ b/lua/entities/gmod_wire_expression2/cl_init.lua
@@ -111,7 +111,7 @@ local function wtfgarry( str )
 end
 
 function ENT:GetGateName()
-    return self:GetNWString("name", self.name)
+    return self:GetInstanceName()
 end
 
 local h_of_lower = 100 -- height of the lower section (the prfbench/percent bar section)
diff --git a/lua/entities/gmod_wire_expression2/init.lua b/lua/entities/gmod_wire_expression2/init.lua
index 8d2999419b..08fd5fb976 100644
--- a/lua/entities/gmod_wire_expression2/init.lua
+++ b/lua/entities/gmod_wire_expression2/init.lua
@@ -88,11 +88,6 @@ function ENT:Initialize()
 	end
 end
 
-function ENT:SetupDataTables()
-	self:NetworkVar("Entity", 0, "InstancePlayer")
-	self:NetworkVar("String", 0, "InstanceName")
-end
-
 function ENT:OnRestore()
 	self:Setup(self.original, self.inc_files, nil, true)
 end
diff --git a/lua/entities/gmod_wire_expression2/shared.lua b/lua/entities/gmod_wire_expression2/shared.lua
index ebc2623115..c79499979b 100644
--- a/lua/entities/gmod_wire_expression2/shared.lua
+++ b/lua/entities/gmod_wire_expression2/shared.lua
@@ -5,9 +5,13 @@ ENT.Author = ""
 ENT.Contact = ""
 ENT.Purpose = ""
 ENT.Instructions = ""
-
 ENT.WireDebugName = "Expression 2"
 
+function ENT:SetupDataTables()
+	self:NetworkVar("Entity", 0, "InstancePlayer")
+	self:NetworkVar("String", 0, "InstanceName")
+end
+
 CreateConVar("wire_expression2_unlimited", "0", {FCVAR_REPLICATED})
 CreateConVar("wire_expression2_quotasoft", "10000", {FCVAR_REPLICATED})
 CreateConVar("wire_expression2_quotahard", "100000", {FCVAR_REPLICATED})
diff --git a/lua/wire/client/text_editor/wire_expression2_editor.lua b/lua/wire/client/text_editor/wire_expression2_editor.lua
index 9874477ac9..5405d48372 100644
--- a/lua/wire/client/text_editor/wire_expression2_editor.lua
+++ b/lua/wire/client/text_editor/wire_expression2_editor.lua
@@ -1442,7 +1442,7 @@ Text here]# ]]
 			if IsValid(ply) and ply == LocalPlayer() or showall then
 				local nick
 				if not ply or not ply:IsValid() then nick = "Unknown" else nick = ply:Nick() end
-				local name = v:GetNWString("name", "generic")
+				local name = v:GetGateName()
 
 				local singleline = string.match( name, "(.-)\n" )
 				if singleline then name = singleline .. "..." end