diff --git a/lib/awful/titlebar.lua.in b/lib/awful/titlebar.lua.in
index 69031112..dcbd20d7 100644
--- a/lib/awful/titlebar.lua.in
+++ b/lib/awful/titlebar.lua.in
@@ -117,10 +117,10 @@ function update(c, prop)
             if data[c].width then
                 if c.titlebar.position == "top"
                     or c.titlebar.position == "bottom" then
-                    local w = math.min(data[c].width, c:coords().width + 2 * c.border_width)
+                    local w = math.min(data[c].width, c:geometry().width + 2 * c.border_width)
                     c.titlebar:geometry({ width = w })
                 else
-                    local w = math.min(data[c].width, c:coords().height + 2 * c.border_width)
+                    local w = math.min(data[c].width, c:geometry().height + 2 * c.border_width)
                     c.titlebar:geometry({ height = w })
                 end
             end
diff --git a/lib/invaders.lua.in b/lib/invaders.lua.in
index 85ea7fd3..c9a2d8b8 100644
--- a/lib/invaders.lua.in
+++ b/lib/invaders.lua.in
@@ -452,8 +452,8 @@ end
 
 function run(args)
     gamedata.screen = capi.screen[capi.mouse.screen]
-    gamedata.field.x = gamedata.screen.coords.x + math.floor((gamedata.screen.coords.width - gamedata.field.w) / 2)
-    gamedata.field.y = gamedata.screen.coords.y + math.floor((gamedata.screen.coords.height - gamedata.field.h) / 2)
+    gamedata.field.x = gamedata.screen.geometry.x + math.floor((gamedata.screen.geometry.width - gamedata.field.w) / 2)
+    gamedata.field.y = gamedata.screen.geometry.y + math.floor((gamedata.screen.geometry.height - gamedata.field.h) / 2)
 
     if args then
     	if args['x'] then gamedata.field.x = args['x'] end
diff --git a/lib/naughty.lua.in b/lib/naughty.lua.in
index 8a9fe4da..fdf9c248 100644
--- a/lib/naughty.lua.in
+++ b/lib/naughty.lua.in
@@ -87,7 +87,7 @@ notifications = {
 }
 
 local ws = capi.screen[config.screen].workarea
-local ss = capi.screen[config.screen].coords
+local ss = capi.screen[config.screen].geometry
 
 --- Evaluate desired position of the notification by index - internal
 -- @param idx Index of the notification