diff --git a/lib/quake.lua b/lib/quake.lua
index 42faaf9..fdc7ec1 100644
--- a/lib/quake.lua
+++ b/lib/quake.lua
@@ -46,7 +46,7 @@ function QuakeConsole:display()
    local i = 0
    for c in awful.client.cycle(function (c)
 				  -- c.name may be changed!
-				  return c.icon_name == self.name
+				  return c.instance == self.name
 			       end,
 			       nil, self.screen) do
       i = i + 1
@@ -136,13 +136,13 @@ function QuakeConsole:new(config)
    local console = setmetatable(config, { __index = QuakeConsole })
    capi.client.add_signal("manage",
 			  function(c)
-			     if c.icon_name == console.name and c.screen == console.screen then
+			     if c.instance == console.name and c.screen == console.screen then
 				console:display()
 			     end
 			  end)
    capi.client.add_signal("unmanage",
 			  function(c)
-			     if c.icon_name == console.name and c.screen == console.screen then
+			     if c.instance == console.name and c.screen == console.screen then
 				console.visible = false
 			     end
 			  end)