diff --git a/awesome-menu.c b/awesome-menu.c
index b96a41fcf..6be733604 100644
--- a/awesome-menu.c
+++ b/awesome-menu.c
@@ -1241,7 +1241,7 @@ main(int argc, char **argv)
     ssize_t len;
     const char *shell = getenv("SHELL");
     area_t geometry = { 0, 0, 0, 0, NULL, NULL };
-    ScreensInfo *si;
+    screens_info_t *si;
     static struct option long_options[] =
     {
         {"help",    0, NULL, 'h'},
diff --git a/awesome-message.c b/awesome-message.c
index 503345fb3..5283581be 100644
--- a/awesome-message.c
+++ b/awesome-message.c
@@ -128,7 +128,7 @@ main(int argc, char **argv)
     int opt, ret, screen = 0, delay = 0;
     xcb_query_pointer_reply_t *xqp = NULL;
     char *configfile = NULL;
-    ScreensInfo *si;
+    screens_info_t *si;
     static struct option long_options[] =
     {
         {"help",    0, NULL, 'h'},
diff --git a/common/xscreen.c b/common/xscreen.c
index 647f390ac..f8183f835 100644
--- a/common/xscreen.c
+++ b/common/xscreen.c
@@ -32,7 +32,7 @@
  * \return screen number or DefaultScreen of disp on no match
  */
 int
-screen_get_bycoord(ScreensInfo *si, int screen, int x, int y)
+screen_get_bycoord(screens_info_t *si, int screen, int x, int y)
 {
     int i;
 
@@ -63,16 +63,16 @@ screen_xsitoarea(xcb_xinerama_screen_info_t si)
 }
 
 void
-screensinfo_delete(ScreensInfo **si)
+screensinfo_delete(screens_info_t **si)
 {
     p_delete(&(*si)->geometry);
     p_delete(si);
 }
 
-ScreensInfo *
+screens_info_t *
 screensinfo_new(xcb_connection_t *conn)
 {
-    ScreensInfo *si;
+    screens_info_t *si;
     xcb_xinerama_query_screens_reply_t *xsq;
     xcb_xinerama_screen_info_t *xsi;
     int xinerama_screen_number, screen, screen_to_test;
@@ -80,7 +80,7 @@ screensinfo_new(xcb_connection_t *conn)
     bool drop;
     xcb_xinerama_is_active_reply_t *xia = NULL;
 
-    si = p_new(ScreensInfo, 1);
+    si = p_new(screens_info_t, 1);
 
     /* Check for extension before checking for Xinerama */
     if(xcb_get_extension_data(conn, &xcb_xinerama_id)->present)
diff --git a/common/xscreen.h b/common/xscreen.h
index e60436b3f..b5445773c 100644
--- a/common/xscreen.h
+++ b/common/xscreen.h
@@ -29,11 +29,11 @@ typedef struct
     int nscreen;
     bool xinerama_is_active;
     area_t *geometry;
-} ScreensInfo;
+} screens_info_t;
 
-int screen_get_bycoord(ScreensInfo *, int, int, int);
-void screensinfo_delete(ScreensInfo **);
-ScreensInfo * screensinfo_new(xcb_connection_t *);
+int screen_get_bycoord(screens_info_t *, int, int, int);
+void screensinfo_delete(screens_info_t **);
+screens_info_t * screensinfo_new(xcb_connection_t *);
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/structs.h b/structs.h
index 8b2190543..84022f860 100644
--- a/structs.h
+++ b/structs.h
@@ -338,7 +338,7 @@ struct AwesomeConf
     /** Logical screens */
     VirtScreen *screens;
     /** Screens info */
-    ScreensInfo *screens_info;
+    screens_info_t *screens_info;
     /** Rules list */
     rule_t *rules;
     /** Keys bindings list */