Lowercase library names to correspond with the new API.

64 files changed, 243 insertions, 243 deletions

diff --git a/configure.ac b/configure.ac
index 39d56cc..022b617 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([libXCB],
+AC_INIT([libxcb],
         0.9,
         [xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([xcb.pc.in])
diff --git a/debian/control b/debian/control
index 804ac0a..6d0909e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding
- This package contains the library files needed to run software using libXCB,
+ This package contains the library files needed to run software using libxcb,
  the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
@@ -34,7 +34,7 @@ Depends: libxcb0 (= ${Source-Version}), x11proto-core-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, development files
  This package contains the header and library files needed to build software
- using libXCB, the X C Binding.
+ using libxcb, the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -54,8 +54,8 @@ Section: libdevel
 Architecture: any
 Depends: libxcb0 (= ${Source-Version})
 Description: X C Binding, debugging symbols
- This package contains the debugging symbols associated with libXCB, the X C
- Binding.  gdb will automatically use these symbols when debugging libXCB.
+ This package contains the debugging symbols associated with libxcb, the X C
+ Binding.  gdb will automatically use these symbols when debugging libxcb.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -76,7 +76,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, composite extension
  This package contains the library files needed to run software using
- libXCBcomposite, the composite extension for the X C Binding.
+ libxcb-composite, the composite extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -98,7 +98,7 @@ Depends: libxcbcomposite0 (= ${Source-Version}), libxcb0-dev, libxcbxfixes0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, composite extension, development files
  This package contains the header and library files needed to build software
- using libXCBcomposite, the composite extension for the X C Binding.
+ using libxcb-composite, the composite extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -119,8 +119,8 @@ Architecture: any
 Depends: libxcbcomposite0 (= ${Source-Version})
 Description: X C Binding, composite extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBcomposite, the composite extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBcomposite.
+ libxcb-composite, the composite extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-composite.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -141,7 +141,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, damage extension
  This package contains the library files needed to run software using
- libXCBdamage, the damage extension for the X C Binding.
+ libxcb-damage, the damage extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -163,7 +163,7 @@ Depends: libxcbdamage0 (= ${Source-Version}), libxcb0-dev, libxcbxfixes0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, damage extension, development files
  This package contains the header and library files needed to build software
- using libXCBdamage, the damage extension for the X C Binding.
+ using libxcb-damage, the damage extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -184,8 +184,8 @@ Architecture: any
 Depends: libxcbdamage0 (= ${Source-Version})
 Description: X C Binding, damage extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBdamage, the damage extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBdamage.
+ libxcb-damage, the damage extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-damage.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -206,7 +206,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, dpms extension
  This package contains the library files needed to run software using
- libXCBdpms, the dpms extension for the X C Binding.
+ libxcb-dpms, the dpms extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -228,7 +228,7 @@ Depends: libxcbdpms0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, dpms extension, development files
  This package contains the header and library files needed to build software
- using libXCBdpms, the dpms extension for the X C Binding.
+ using libxcb-dpms, the dpms extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -249,8 +249,8 @@ Architecture: any
 Depends: libxcbdpms0 (= ${Source-Version})
 Description: X C Binding, dpms extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBdpms, the dpms extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBdpms.
+ libxcb-dpms, the dpms extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-dpms.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -271,7 +271,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, glx extension
  This package contains the library files needed to run software using
- libXCBglx, the glx extension for the X C Binding.
+ libxcb-glx, the glx extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -293,7 +293,7 @@ Depends: libxcbglx0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, glx extension, development files
  This package contains the header and library files needed to build software
- using libXCBglx, the glx extension for the X C Binding.
+ using libxcb-glx, the glx extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -314,8 +314,8 @@ Architecture: any
 Depends: libxcbglx0 (= ${Source-Version})
 Description: X C Binding, glx extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBglx, the glx extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBglx.
+ libxcb-glx, the glx extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-glx.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -336,7 +336,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, randr extension
  This package contains the library files needed to run software using
- libXCBrandr, the randr extension for the X C Binding.
+ libxcb-randr, the randr extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -358,7 +358,7 @@ Depends: libxcbrandr0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, randr extension, development files
  This package contains the header and library files needed to build software
- using libXCBrandr, the randr extension for the X C Binding.
+ using libxcb-randr, the randr extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -379,8 +379,8 @@ Architecture: any
 Depends: libxcbrandr0 (= ${Source-Version})
 Description: X C Binding, randr extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBrandr, the randr extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBrandr.
+ libxcb-randr, the randr extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-randr.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -401,7 +401,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, record extension
  This package contains the library files needed to run software using
- libXCBrecord, the record extension for the X C Binding.
+ libxcb-record, the record extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -423,7 +423,7 @@ Depends: libxcbrecord0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, record extension, development files
  This package contains the header and library files needed to build software
- using libXCBrecord, the record extension for the X C Binding.
+ using libxcb-record, the record extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -444,8 +444,8 @@ Architecture: any
 Depends: libxcbrecord0 (= ${Source-Version})
 Description: X C Binding, record extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBrecord, the record extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBrecord.
+ libxcb-record, the record extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-record.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -466,7 +466,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, render extension
  This package contains the library files needed to run software using
- libXCBrender, the render extension for the X C Binding.
+ libxcb-render, the render extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -488,7 +488,7 @@ Depends: libxcbrender0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, render extension, development files
  This package contains the header and library files needed to build software
- using libXCBrender, the render extension for the X C Binding.
+ using libxcb-render, the render extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -509,8 +509,8 @@ Architecture: any
 Depends: libxcbrender0 (= ${Source-Version})
 Description: X C Binding, render extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBrender, the render extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBrender.
+ libxcb-render, the render extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-render.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -531,7 +531,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, res extension
  This package contains the library files needed to run software using
- libXCBres, the res extension for the X C Binding.
+ libxcb-res, the res extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -553,7 +553,7 @@ Depends: libxcbres0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, res extension, development files
  This package contains the header and library files needed to build software
- using libXCBres, the res extension for the X C Binding.
+ using libxcb-res, the res extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -574,8 +574,8 @@ Architecture: any
 Depends: libxcbres0 (= ${Source-Version})
 Description: X C Binding, res extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBres, the res extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBres.
+ libxcb-res, the res extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-res.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -596,7 +596,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, screensaver extension
  This package contains the library files needed to run software using
- libXCBscreensaver, the screensaver extension for the X C Binding.
+ libxcb-screensaver, the screensaver extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -618,7 +618,7 @@ Depends: libxcbscreensaver0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, screensaver extension, development files
  This package contains the header and library files needed to build software
- using libXCBscreensaver, the screensaver extension for the X C Binding.
+ using libxcb-screensaver, the screensaver extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -639,8 +639,8 @@ Architecture: any
 Depends: libxcbscreensaver0 (= ${Source-Version})
 Description: X C Binding, screensaver extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBscreensaver, the screensaver extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBscreensaver.
+ libxcb-screensaver, the screensaver extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-screensaver.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -661,7 +661,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, shape extension
  This package contains the library files needed to run software using
- libXCBshape, the shape extension for the X C Binding.
+ libxcb-shape, the shape extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -683,7 +683,7 @@ Depends: libxcbshape0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, shape extension, development files
  This package contains the header and library files needed to build software
- using libXCBshape, the shape extension for the X C Binding.
+ using libxcb-shape, the shape extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -704,8 +704,8 @@ Architecture: any
 Depends: libxcbshape0 (= ${Source-Version})
 Description: X C Binding, shape extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBshape, the shape extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBshape.
+ libxcb-shape, the shape extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-shape.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -726,7 +726,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, shm extension
  This package contains the library files needed to run software using
- libXCBshm, the shm extension for the X C Binding.
+ libxcb-shm, the shm extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -748,7 +748,7 @@ Depends: libxcbshm0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, shm extension, development files
  This package contains the header and library files needed to build software
- using libXCBshm, the shm extension for the X C Binding.
+ using libxcb-shm, the shm extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -769,8 +769,8 @@ Architecture: any
 Depends: libxcbshm0 (= ${Source-Version})
 Description: X C Binding, shm extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBshm, the shm extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBshm.
+ libxcb-shm, the shm extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-shm.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -791,7 +791,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, sync extension
  This package contains the library files needed to run software using
- libXCBsync, the sync extension for the X C Binding.
+ libxcb-sync, the sync extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -813,7 +813,7 @@ Depends: libxcbsync0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, sync extension, development files
  This package contains the header and library files needed to build software
- using libXCBsync, the sync extension for the X C Binding.
+ using libxcb-sync, the sync extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -834,8 +834,8 @@ Architecture: any
 Depends: libxcbsync0 (= ${Source-Version})
 Description: X C Binding, sync extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBsync, the sync extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBsync.
+ libxcb-sync, the sync extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-sync.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -856,7 +856,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, xevie extension
  This package contains the library files needed to run software using
- libXCBxevie, the xevie extension for the X C Binding.
+ libxcb-xevie, the xevie extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -878,7 +878,7 @@ Depends: libxcbxevie0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, xevie extension, development files
  This package contains the header and library files needed to build software
- using libXCBxevie, the xevie extension for the X C Binding.
+ using libxcb-xevie, the xevie extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -899,8 +899,8 @@ Architecture: any
 Depends: libxcbxevie0 (= ${Source-Version})
 Description: X C Binding, xevie extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBxevie, the xevie extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBxevie.
+ libxcb-xevie, the xevie extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-xevie.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -921,7 +921,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, xf86dri extension
  This package contains the library files needed to run software using
- libXCBxf86dri, the xf86dri extension for the X C Binding.
+ libxcb-xf86dri, the xf86dri extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -943,7 +943,7 @@ Depends: libxcbxf86dri0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, xf86dri extension, development files
  This package contains the header and library files needed to build software
- using libXCBxf86dri, the xf86dri extension for the X C Binding.
+ using libxcb-xf86dri, the xf86dri extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -964,8 +964,8 @@ Architecture: any
 Depends: libxcbxf86dri0 (= ${Source-Version})
 Description: X C Binding, xf86dri extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBxf86dri, the xf86dri extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBxf86dri.
+ libxcb-xf86dri, the xf86dri extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-xf86dri.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -986,7 +986,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, xfixes extension
  This package contains the library files needed to run software using
- libXCBxfixes, the xfixes extension for the X C Binding.
+ libxcb-xfixes, the xfixes extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1008,7 +1008,7 @@ Depends: libxcbxfixes0 (= ${Source-Version}), libxcb0-dev, libxcbrender0-dev, li
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, xfixes extension, development files
  This package contains the header and library files needed to build software
- using libXCBxfixes, the xfixes extension for the X C Binding.
+ using libxcb-xfixes, the xfixes extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1029,8 +1029,8 @@ Architecture: any
 Depends: libxcbxfixes0 (= ${Source-Version})
 Description: X C Binding, xfixes extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBxfixes, the xfixes extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBxfixes.
+ libxcb-xfixes, the xfixes extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-xfixes.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1051,7 +1051,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, xprint extension
  This package contains the library files needed to run software using
- libXCBxprint, the xprint extension for the X C Binding.
+ libxcb-xprint, the xprint extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1073,7 +1073,7 @@ Depends: libxcbxprint0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, xprint extension, development files
  This package contains the header and library files needed to build software
- using libXCBxprint, the xprint extension for the X C Binding.
+ using libxcb-xprint, the xprint extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1094,8 +1094,8 @@ Architecture: any
 Depends: libxcbxprint0 (= ${Source-Version})
 Description: X C Binding, xprint extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBxprint, the xprint extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBxprint.
+ libxcb-xprint, the xprint extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-xprint.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1116,7 +1116,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, xtest extension
  This package contains the library files needed to run software using
- libXCBxtest, the xtest extension for the X C Binding.
+ libxcb-xtest, the xtest extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1138,7 +1138,7 @@ Depends: libxcbxtest0 (= ${Source-Version}), libxcb0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, xtest extension, development files
  This package contains the header and library files needed to build software
- using libXCBxtest, the xtest extension for the X C Binding.
+ using libxcb-xtest, the xtest extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1159,8 +1159,8 @@ Architecture: any
 Depends: libxcbxtest0 (= ${Source-Version})
 Description: X C Binding, xtest extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBxtest, the xtest extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBxtest.
+ libxcb-xtest, the xtest extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-xtest.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1181,7 +1181,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, xv extension
  This package contains the library files needed to run software using
- libXCBxv, the xv extension for the X C Binding.
+ libxcb-xv, the xv extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1203,7 +1203,7 @@ Depends: libxcbxv0 (= ${Source-Version}), libxcb0-dev, libxcbshm0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, xv extension, development files
  This package contains the header and library files needed to build software
- using libXCBxv, the xv extension for the X C Binding.
+ using libxcb-xv, the xv extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1224,8 +1224,8 @@ Architecture: any
 Depends: libxcbxv0 (= ${Source-Version})
 Description: X C Binding, xv extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBxv, the xv extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBxv.
+ libxcb-xv, the xv extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-xv.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1246,7 +1246,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X C Binding, xvmc extension
  This package contains the library files needed to run software using
- libXCBxvmc, the xvmc extension for the X C Binding.
+ libxcb-xvmc, the xvmc extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1268,7 +1268,7 @@ Depends: libxcbxvmc0 (= ${Source-Version}), libxcb0-dev, libxcbxv0-dev
 Pre-Depends: x11-common (>= 1:1.09)
 Description: X C Binding, xvmc extension, development files
  This package contains the header and library files needed to build software
- using libXCBxvmc, the xvmc extension for the X C Binding.
+ using libxcb-xvmc, the xvmc extension for the X C Binding.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
@@ -1289,8 +1289,8 @@ Architecture: any
 Depends: libxcbxvmc0 (= ${Source-Version})
 Description: X C Binding, xvmc extension, debugging symbols
  This package contains the debugging symbols associated with
- libXCBxvmc, the xvmc extension for the X C Binding.  gdb will
- automatically use these symbols when debugging libXCBxvmc.
+ libxcb-xvmc, the xvmc extension for the X C Binding.  gdb will
+ automatically use these symbols when debugging libxcb-xvmc.
  .
  The XCB library provides an interface to the X Window System protocol,
  designed to replace the Xlib interface.  XCB provides several advantages over
diff --git a/debian/libxcb0-dev.install b/debian/libxcb0-dev.install
index 2f05d6d..61d4a73 100644
--- a/debian/libxcb0-dev.install
+++ b/debian/libxcb0-dev.install
@@ -4,6 +4,6 @@ usr/include/X11/XCB/xcb.h
 usr/include/X11/XCB/xcbext.h
 usr/include/X11/XCB/xcbxlib.h
 usr/include/X11/XCB/xproto.h
-usr/lib/libXCB.a
-usr/lib/libXCB.so
+usr/lib/libxcb.a
+usr/lib/libxcb.so
 usr/lib/pkgconfig/xcb.pc
diff --git a/debian/libxcb0.install b/debian/libxcb0.install
index 1b59f13..4460d67 100644
--- a/debian/libxcb0.install
+++ b/debian/libxcb0.install
@@ -1 +1 @@
-usr/lib/libXCB.so.*
+usr/lib/libxcb.so.*
diff --git a/debian/libxcbcomposite0-dev.install b/debian/libxcbcomposite0-dev.install
index 3e5a587..aa85813 100644
--- a/debian/libxcbcomposite0-dev.install
+++ b/debian/libxcbcomposite0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/composite.h
-usr/lib/libXCBcomposite.a
-usr/lib/libXCBcomposite.so
+usr/lib/libxcb-composite.a
+usr/lib/libxcb-composite.so
 usr/lib/pkgconfig/xcb-composite.pc
diff --git a/debian/libxcbcomposite0.install b/debian/libxcbcomposite0.install
index 78d90e8..7943ef0 100644
--- a/debian/libxcbcomposite0.install
+++ b/debian/libxcbcomposite0.install
@@ -1 +1 @@
-usr/lib/libXCBcomposite.so.*
+usr/lib/libxcb-composite.so.*
diff --git a/debian/libxcbdamage0-dev.install b/debian/libxcbdamage0-dev.install
index 79d8c78..38ae588 100644
--- a/debian/libxcbdamage0-dev.install
+++ b/debian/libxcbdamage0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/damage.h
-usr/lib/libXCBdamage.a
-usr/lib/libXCBdamage.so
+usr/lib/libxcb-damage.a
+usr/lib/libxcb-damage.so
 usr/lib/pkgconfig/xcb-damage.pc
diff --git a/debian/libxcbdamage0.install b/debian/libxcbdamage0.install
index 1a975ad..e33a41e 100644
--- a/debian/libxcbdamage0.install
+++ b/debian/libxcbdamage0.install
@@ -1 +1 @@
-usr/lib/libXCBdamage.so.*
+usr/lib/libxcb-damage.so.*
diff --git a/debian/libxcbdpms0-dev.install b/debian/libxcbdpms0-dev.install
index 24db255..307e55b 100644
--- a/debian/libxcbdpms0-dev.install
+++ b/debian/libxcbdpms0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/dpms.h
-usr/lib/libXCBdpms.a
-usr/lib/libXCBdpms.so
+usr/lib/libxcb-dpms.a
+usr/lib/libxcb-dpms.so
 usr/lib/pkgconfig/xcb-dpms.pc
diff --git a/debian/libxcbdpms0.install b/debian/libxcbdpms0.install
index 6e3b9cf..c78e4e8 100644
--- a/debian/libxcbdpms0.install
+++ b/debian/libxcbdpms0.install
@@ -1 +1 @@
-usr/lib/libXCBdpms.so.*
+usr/lib/libxcb-dpms.so.*
diff --git a/debian/libxcbglx0-dev.install b/debian/libxcbglx0-dev.install
index e6339cb..75d3a80 100644
--- a/debian/libxcbglx0-dev.install
+++ b/debian/libxcbglx0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/glx.h
-usr/lib/libXCBglx.a
-usr/lib/libXCBglx.so
+usr/lib/libxcb-glx.a
+usr/lib/libxcb-glx.so
 usr/lib/pkgconfig/xcb-glx.pc
diff --git a/debian/libxcbglx0.install b/debian/libxcbglx0.install
index 3fbf214..2434177 100644
--- a/debian/libxcbglx0.install
+++ b/debian/libxcbglx0.install
@@ -1 +1 @@
-usr/lib/libXCBglx.so.*
+usr/lib/libxcb-glx.so.*
diff --git a/debian/libxcbrandr0-dev.install b/debian/libxcbrandr0-dev.install
index 75433ca..1fb84df 100644
--- a/debian/libxcbrandr0-dev.install
+++ b/debian/libxcbrandr0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/randr.h
-usr/lib/libXCBrandr.a
-usr/lib/libXCBrandr.so
+usr/lib/libxcb-randr.a
+usr/lib/libxcb-randr.so
 usr/lib/pkgconfig/xcb-randr.pc
diff --git a/debian/libxcbrandr0.install b/debian/libxcbrandr0.install
index ed1577e..42d89d3 100644
--- a/debian/libxcbrandr0.install
+++ b/debian/libxcbrandr0.install
@@ -1 +1 @@
-usr/lib/libXCBrandr.so.*
+usr/lib/libxcb-randr.so.*
diff --git a/debian/libxcbrecord0-dev.install b/debian/libxcbrecord0-dev.install
index 1e434f5..9e05a99 100644
--- a/debian/libxcbrecord0-dev.install
+++ b/debian/libxcbrecord0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/record.h
-usr/lib/libXCBrecord.a
-usr/lib/libXCBrecord.so
+usr/lib/libxcb-record.a
+usr/lib/libxcb-record.so
 usr/lib/pkgconfig/xcb-record.pc
diff --git a/debian/libxcbrecord0.install b/debian/libxcbrecord0.install
index 3db5266..3071c28 100644
--- a/debian/libxcbrecord0.install
+++ b/debian/libxcbrecord0.install
@@ -1 +1 @@
-usr/lib/libXCBrecord.so.*
+usr/lib/libxcb-record.so.*
diff --git a/debian/libxcbrender0-dev.install b/debian/libxcbrender0-dev.install
index d74dbc4..95b11a7 100644
--- a/debian/libxcbrender0-dev.install
+++ b/debian/libxcbrender0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/render.h
-usr/lib/libXCBrender.a
-usr/lib/libXCBrender.so
+usr/lib/libxcb-render.a
+usr/lib/libxcb-render.so
 usr/lib/pkgconfig/xcb-render.pc
diff --git a/debian/libxcbrender0.install b/debian/libxcbrender0.install
index 2de7864..ae85806 100644
--- a/debian/libxcbrender0.install
+++ b/debian/libxcbrender0.install
@@ -1 +1 @@
-usr/lib/libXCBrender.so.*
+usr/lib/libxcb-render.so.*
diff --git a/debian/libxcbres0-dev.install b/debian/libxcbres0-dev.install
index bdbd381..30c7fb6 100644
--- a/debian/libxcbres0-dev.install
+++ b/debian/libxcbres0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/res.h
-usr/lib/libXCBres.a
-usr/lib/libXCBres.so
+usr/lib/libxcb-res.a
+usr/lib/libxcb-res.so
 usr/lib/pkgconfig/xcb-res.pc
diff --git a/debian/libxcbres0.install b/debian/libxcbres0.install
index 086aa0c..d4afa71 100644
--- a/debian/libxcbres0.install
+++ b/debian/libxcbres0.install
@@ -1 +1 @@
-usr/lib/libXCBres.so.*
+usr/lib/libxcb-res.so.*
diff --git a/debian/libxcbscreensaver0-dev.install b/debian/libxcbscreensaver0-dev.install
index 6431650..7a57732 100644
--- a/debian/libxcbscreensaver0-dev.install
+++ b/debian/libxcbscreensaver0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/screensaver.h
-usr/lib/libXCBscreensaver.a
-usr/lib/libXCBscreensaver.so
+usr/lib/libxcb-screensaver.a
+usr/lib/libxcb-screensaver.so
 usr/lib/pkgconfig/xcb-screensaver.pc
diff --git a/debian/libxcbscreensaver0.install b/debian/libxcbscreensaver0.install
index e7f5db0..d4b7442 100644
--- a/debian/libxcbscreensaver0.install
+++ b/debian/libxcbscreensaver0.install
@@ -1 +1 @@
-usr/lib/libXCBscreensaver.so.*
+usr/lib/libxcb-screensaver.so.*
diff --git a/debian/libxcbshape0-dev.install b/debian/libxcbshape0-dev.install
index fe4054a..744d12b 100644
--- a/debian/libxcbshape0-dev.install
+++ b/debian/libxcbshape0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/shape.h
-usr/lib/libXCBshape.a
-usr/lib/libXCBshape.so
+usr/lib/libxcb-shape.a
+usr/lib/libxcb-shape.so
 usr/lib/pkgconfig/xcb-shape.pc
diff --git a/debian/libxcbshape0.install b/debian/libxcbshape0.install
index 1426cb9..ea87b38 100644
--- a/debian/libxcbshape0.install
+++ b/debian/libxcbshape0.install
@@ -1 +1 @@
-usr/lib/libXCBshape.so.*
+usr/lib/libxcb-shape.so.*
diff --git a/debian/libxcbshm0-dev.install b/debian/libxcbshm0-dev.install
index bd15282..74d306a 100644
--- a/debian/libxcbshm0-dev.install
+++ b/debian/libxcbshm0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/shm.h
-usr/lib/libXCBshm.a
-usr/lib/libXCBshm.so
+usr/lib/libxcb-shm.a
+usr/lib/libxcb-shm.so
 usr/lib/pkgconfig/xcb-shm.pc
diff --git a/debian/libxcbshm0.install b/debian/libxcbshm0.install
index 9582c0d..1339c72 100644
--- a/debian/libxcbshm0.install
+++ b/debian/libxcbshm0.install
@@ -1 +1 @@
-usr/lib/libXCBshm.so.*
+usr/lib/libxcb-shm.so.*
diff --git a/debian/libxcbsync0-dev.install b/debian/libxcbsync0-dev.install
index d7fa98e..a1ba73c 100644
--- a/debian/libxcbsync0-dev.install
+++ b/debian/libxcbsync0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/sync.h
-usr/lib/libXCBsync.a
-usr/lib/libXCBsync.so
+usr/lib/libxcb-sync.a
+usr/lib/libxcb-sync.so
 usr/lib/pkgconfig/xcb-sync.pc
diff --git a/debian/libxcbsync0.install b/debian/libxcbsync0.install
index 8aac247..937a4d8 100644
--- a/debian/libxcbsync0.install
+++ b/debian/libxcbsync0.install
@@ -1 +1 @@
-usr/lib/libXCBsync.so.*
+usr/lib/libxcb-sync.so.*
diff --git a/debian/libxcbxevie0-dev.install b/debian/libxcbxevie0-dev.install
index 26174cc..4215629 100644
--- a/debian/libxcbxevie0-dev.install
+++ b/debian/libxcbxevie0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/xevie.h
-usr/lib/libXCBxevie.a
-usr/lib/libXCBxevie.so
+usr/lib/libxcb-xevie.a
+usr/lib/libxcb-xevie.so
 usr/lib/pkgconfig/xcb-xevie.pc
diff --git a/debian/libxcbxevie0.install b/debian/libxcbxevie0.install
index d5ab14d..9ffcbcd 100644
--- a/debian/libxcbxevie0.install
+++ b/debian/libxcbxevie0.install
@@ -1 +1 @@
-usr/lib/libXCBxevie.so.*
+usr/lib/libxcb-xevie.so.*
diff --git a/debian/libxcbxf86dri0-dev.install b/debian/libxcbxf86dri0-dev.install
index dc48c39..1b698af 100644
--- a/debian/libxcbxf86dri0-dev.install
+++ b/debian/libxcbxf86dri0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/xf86dri.h
-usr/lib/libXCBxf86dri.a
-usr/lib/libXCBxf86dri.so
+usr/lib/libxcb-xf86dri.a
+usr/lib/libxcb-xf86dri.so
 usr/lib/pkgconfig/xcb-xf86dri.pc
diff --git a/debian/libxcbxf86dri0.install b/debian/libxcbxf86dri0.install
index dfe4993..72e3797 100644
--- a/debian/libxcbxf86dri0.install
+++ b/debian/libxcbxf86dri0.install
@@ -1 +1 @@
-usr/lib/libXCBxf86dri.so.*
+usr/lib/libxcb-xf86dri.so.*
diff --git a/debian/libxcbxfixes0-dev.install b/debian/libxcbxfixes0-dev.install
index 3aa05a2..0b719ae 100644
--- a/debian/libxcbxfixes0-dev.install
+++ b/debian/libxcbxfixes0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/xfixes.h
-usr/lib/libXCBxfixes.a
-usr/lib/libXCBxfixes.so
+usr/lib/libxcb-xfixes.a
+usr/lib/libxcb-xfixes.so
 usr/lib/pkgconfig/xcb-xfixes.pc
diff --git a/debian/libxcbxfixes0.install b/debian/libxcbxfixes0.install
index 7a2b7dc..6b11b1d 100644
--- a/debian/libxcbxfixes0.install
+++ b/debian/libxcbxfixes0.install
@@ -1 +1 @@
-usr/lib/libXCBxfixes.so.*
+usr/lib/libxcb-xfixes.so.*
diff --git a/debian/libxcbxprint0-dev.install b/debian/libxcbxprint0-dev.install
index a00799f..5ca7b5b 100644
--- a/debian/libxcbxprint0-dev.install
+++ b/debian/libxcbxprint0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/xprint.h
-usr/lib/libXCBxprint.a
-usr/lib/libXCBxprint.so
+usr/lib/libxcb-xprint.a
+usr/lib/libxcb-xprint.so
 usr/lib/pkgconfig/xcb-xprint.pc
diff --git a/debian/libxcbxprint0.install b/debian/libxcbxprint0.install
index 13fdcba..ca3062e 100644
--- a/debian/libxcbxprint0.install
+++ b/debian/libxcbxprint0.install
@@ -1 +1 @@
-usr/lib/libXCBxprint.so.*
+usr/lib/libxcb-xprint.so.*
diff --git a/debian/libxcbxtest0-dev.install b/debian/libxcbxtest0-dev.install
index 9fd44b6..6045fee 100644
--- a/debian/libxcbxtest0-dev.install
+++ b/debian/libxcbxtest0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/xtest.h
-usr/lib/libXCBxtest.a
-usr/lib/libXCBxtest.so
+usr/lib/libxcb-xtest.a
+usr/lib/libxcb-xtest.so
 usr/lib/pkgconfig/xcb-xtest.pc
diff --git a/debian/libxcbxtest0.install b/debian/libxcbxtest0.install
index 96dccd3..f2de6c1 100644
--- a/debian/libxcbxtest0.install
+++ b/debian/libxcbxtest0.install
@@ -1 +1 @@
-usr/lib/libXCBxtest.so.*
+usr/lib/libxcb-xtest.so.*
diff --git a/debian/libxcbxv0-dev.install b/debian/libxcbxv0-dev.install
index 94dafd6..9171e7a 100644
--- a/debian/libxcbxv0-dev.install
+++ b/debian/libxcbxv0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/xv.h
-usr/lib/libXCBxv.a
-usr/lib/libXCBxv.so
+usr/lib/libxcb-xv.a
+usr/lib/libxcb-xv.so
 usr/lib/pkgconfig/xcb-xv.pc
diff --git a/debian/libxcbxv0.install b/debian/libxcbxv0.install
index 4eee0eb..3a159a9 100644
--- a/debian/libxcbxv0.install
+++ b/debian/libxcbxv0.install
@@ -1 +1 @@
-usr/lib/libXCBxv.so.*
+usr/lib/libxcb-xv.so.*
diff --git a/debian/libxcbxvmc0-dev.install b/debian/libxcbxvmc0-dev.install
index 1421fc8..6548706 100644
--- a/debian/libxcbxvmc0-dev.install
+++ b/debian/libxcbxvmc0-dev.install
@@ -1,4 +1,4 @@
 usr/include/X11/XCB/xvmc.h
-usr/lib/libXCBxvmc.a
-usr/lib/libXCBxvmc.so
+usr/lib/libxcb-xvmc.a
+usr/lib/libxcb-xvmc.so
 usr/lib/pkgconfig/xcb-xvmc.pc
diff --git a/debian/libxcbxvmc0.install b/debian/libxcbxvmc0.install
index 7713ee8..a21ec6a 100644
--- a/debian/libxcbxvmc0.install
+++ b/debian/libxcbxvmc0.install
@@ -1 +1 @@
-usr/lib/libXCBxvmc.so.*
+usr/lib/libxcb-xvmc.so.*
diff --git a/src/Makefile.am b/src/Makefile.am
index 0715708..41c6e0e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,23 @@
-lib_LTLIBRARIES = libXCB.la \
-                  libXCBcomposite.la \
-                  libXCBdamage.la \
-                  libXCBdpms.la \
-                  libXCBglx.la \
-                  libXCBrandr.la \
-                  libXCBrecord.la \
-                  libXCBrender.la \
-                  libXCBres.la \
-                  libXCBscreensaver.la \
-                  libXCBshape.la \
-                  libXCBshm.la \
-                  libXCBsync.la \
-                  libXCBxevie.la \
-                  libXCBxf86dri.la \
-                  libXCBxfixes.la \
-                  libXCBxprint.la \
-                  libXCBxtest.la \
-                  libXCBxv.la \
-                  libXCBxvmc.la
+lib_LTLIBRARIES = libxcb.la \
+                  libxcb-composite.la \
+                  libxcb-damage.la \
+                  libxcb-dpms.la \
+                  libxcb-glx.la \
+                  libxcb-randr.la \
+                  libxcb-record.la \
+                  libxcb-render.la \
+                  libxcb-res.la \
+                  libxcb-screensaver.la \
+                  libxcb-shape.la \
+                  libxcb-shm.la \
+                  libxcb-sync.la \
+                  libxcb-xevie.la \
+                  libxcb-xf86dri.la \
+                  libxcb-xfixes.la \
+                  libxcb-xprint.la \
+                  libxcb-xtest.la \
+                  libxcb-xv.la \
+                  libxcb-xvmc.la
 
 EXTHEADERS = \
 		extensions/bigreq.h \
@@ -102,8 +102,8 @@ xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
 noinst_HEADERS = xcbint.h
 
 AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS) $(XDMCP_CFLAGS)
-libXCB_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
-libXCB_la_SOURCES = \
+libxcb_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS) $(XDMCP_LIBS)
+libxcb_la_SOURCES = \
 		xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
 		xcb_list.c xcb_util.c xcb_xlib.c xcb_auth.c \
 		$(COREPROTO) $(ESSENTIAL_EXTENSIONS) c-client.xsl
@@ -115,90 +115,90 @@ libXCB_la_SOURCES = \
 # * If you add an interface, increment current and age and set revision to 0.
 # * If you change or remove an interface, increment current and set revision
 #   and age to 0.
-libXCB_la_LDFLAGS = -version-info 0:0:0
+libxcb_la_LDFLAGS = -version-info 0:0:0
 
 BUILT_SOURCES = $(COREPROTO) $(EXTENSIONS)
 CLEANFILES = $(COREPROTO) $(EXTENSIONS)
 
-XCB_LIBS = libXCB.la
+XCB_LIBS = libxcb.la
 
 # FIXME: find a way to autogenerate this from the XML files.
 
-libXCBcomposite_la_LDFLAGS = -version-info 0:0:0
-libXCBcomposite_la_LIBADD = $(XCB_LIBS)
-libXCBcomposite_la_SOURCES = extensions/composite.c extensions/composite.h
+libxcb_composite_la_LDFLAGS = -version-info 0:0:0
+libxcb_composite_la_LIBADD = $(XCB_LIBS)
+libxcb_composite_la_SOURCES = extensions/composite.c extensions/composite.h
 
-libXCBdamage_la_LDFLAGS = -version-info 0:0:0
-libXCBdamage_la_LIBADD = $(XCB_LIBS)
-libXCBdamage_la_SOURCES = extensions/damage.c extensions/damage.h
+libxcb_damage_la_LDFLAGS = -version-info 0:0:0
+libxcb_damage_la_LIBADD = $(XCB_LIBS)
+libxcb_damage_la_SOURCES = extensions/damage.c extensions/damage.h
 
-libXCBdpms_la_LDFLAGS = -version-info 0:0:0
-libXCBdpms_la_LIBADD = $(XCB_LIBS)
-libXCBdpms_la_SOURCES = extensions/dpms.c extensions/dpms.h
+libxcb_dpms_la_LDFLAGS = -version-info 0:0:0
+libxcb_dpms_la_LIBADD = $(XCB_LIBS)
+libxcb_dpms_la_SOURCES = extensions/dpms.c extensions/dpms.h
 
-libXCBglx_la_LDFLAGS = -version-info 0:0:0
-libXCBglx_la_LIBADD = $(XCB_LIBS)
-libXCBglx_la_SOURCES = extensions/glx.c extensions/glx.h
+libxcb_glx_la_LDFLAGS = -version-info 0:0:0
+libxcb_glx_la_LIBADD = $(XCB_LIBS)
+libxcb_glx_la_SOURCES = extensions/glx.c extensions/glx.h
 
-libXCBrandr_la_LDFLAGS = -version-info 0:0:0
-libXCBrandr_la_LIBADD = $(XCB_LIBS)
-libXCBrandr_la_SOURCES = extensions/randr.c extensions/randr.h
+libxcb_randr_la_LDFLAGS = -version-info 0:0:0
+libxcb_randr_la_LIBADD = $(XCB_LIBS)
+libxcb_randr_la_SOURCES = extensions/randr.c extensions/randr.h
 
-libXCBrecord_la_LDFLAGS = -version-info 0:0:0
-libXCBrecord_la_LIBADD = $(XCB_LIBS)
-libXCBrecord_la_SOURCES = extensions/record.c extensions/record.h
+libxcb_record_la_LDFLAGS = -version-info 0:0:0
+libxcb_record_la_LIBADD = $(XCB_LIBS)
+libxcb_record_la_SOURCES = extensions/record.c extensions/record.h
 
-libXCBrender_la_LDFLAGS = -version-info 0:0:0
-libXCBrender_la_LIBADD = $(XCB_LIBS)
-libXCBrender_la_SOURCES = extensions/render.c extensions/render.h
+libxcb_render_la_LDFLAGS = -version-info 0:0:0
+libxcb_render_la_LIBADD = $(XCB_LIBS)
+libxcb_render_la_SOURCES = extensions/render.c extensions/render.h
 
-libXCBres_la_LDFLAGS = -version-info 0:0:0
-libXCBres_la_LIBADD = $(XCB_LIBS)
-libXCBres_la_SOURCES = extensions/res.c extensions/res.h
+libxcb_res_la_LDFLAGS = -version-info 0:0:0
+libxcb_res_la_LIBADD = $(XCB_LIBS)
+libxcb_res_la_SOURCES = extensions/res.c extensions/res.h
 
-libXCBscreensaver_la_LDFLAGS = -version-info 0:0:0
-libXCBscreensaver_la_LIBADD = $(XCB_LIBS)
-libXCBscreensaver_la_SOURCES = extensions/screensaver.c extensions/screensaver.h
+libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0
+libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
+libxcb_screensaver_la_SOURCES = extensions/screensaver.c extensions/screensaver.h
 
-libXCBshape_la_LDFLAGS = -version-info 0:0:0
-libXCBshape_la_LIBADD = $(XCB_LIBS)
-libXCBshape_la_SOURCES = extensions/shape.c extensions/shape.h
+libxcb_shape_la_LDFLAGS = -version-info 0:0:0
+libxcb_shape_la_LIBADD = $(XCB_LIBS)
+libxcb_shape_la_SOURCES = extensions/shape.c extensions/shape.h
 
-libXCBshm_la_LDFLAGS = -version-info 0:0:0
-libXCBshm_la_LIBADD = $(XCB_LIBS)
-libXCBshm_la_SOURCES = extensions/shm.c extensions/shm.h
+libxcb_shm_la_LDFLAGS = -version-info 0:0:0
+libxcb_shm_la_LIBADD = $(XCB_LIBS)
+libxcb_shm_la_SOURCES = extensions/shm.c extensions/shm.h
 
-libXCBsync_la_LDFLAGS = -version-info 0:0:0
-libXCBsync_la_LIBADD = $(XCB_LIBS)
-libXCBsync_la_SOURCES = extensions/sync.c extensions/sync.h
+libxcb_sync_la_LDFLAGS = -version-info 0:0:0
+libxcb_sync_la_LIBADD = $(XCB_LIBS)
+libxcb_sync_la_SOURCES = extensions/sync.c extensions/sync.h
 
-libXCBxevie_la_LDFLAGS = -version-info 0:0:0
-libXCBxevie_la_LIBADD = $(XCB_LIBS)
-libXCBxevie_la_SOURCES = extensions/xevie.c extensions/xevie.h
+libxcb_xevie_la_LDFLAGS = -version-info 0:0:0
+libxcb_xevie_la_LIBADD = $(XCB_LIBS)
+libxcb_xevie_la_SOURCES = extensions/xevie.c extensions/xevie.h
 
-libXCBxf86dri_la_LDFLAGS = -version-info 0:0:0
-libXCBxf86dri_la_LIBADD = $(XCB_LIBS)
-libXCBxf86dri_la_SOURCES = extensions/xf86dri.c extensions/xf86dri.h
+libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0
+libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
+libxcb_xf86dri_la_SOURCES = extensions/xf86dri.c extensions/xf86dri.h
 
-libXCBxfixes_la_LDFLAGS = -version-info 0:0:0
-libXCBxfixes_la_LIBADD = $(XCB_LIBS)
-libXCBxfixes_la_SOURCES = extensions/xfixes.c extensions/xfixes.h
+libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0
+libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
+libxcb_xfixes_la_SOURCES = extensions/xfixes.c extensions/xfixes.h
 
-libXCBxprint_la_LDFLAGS = -version-info 0:0:0
-libXCBxprint_la_LIBADD = $(XCB_LIBS)
-libXCBxprint_la_SOURCES = extensions/xprint.c extensions/xprint.h
+libxcb_xprint_la_LDFLAGS = -version-info 0:0:0
+libxcb_xprint_la_LIBADD = $(XCB_LIBS)
+libxcb_xprint_la_SOURCES = extensions/xprint.c extensions/xprint.h
 
-libXCBxtest_la_LDFLAGS = -version-info 0:0:0
-libXCBxtest_la_LIBADD = $(XCB_LIBS)
-libXCBxtest_la_SOURCES = extensions/xtest.c extensions/xtest.h
+libxcb_xtest_la_LDFLAGS = -version-info 0:0:0
+libxcb_xtest_la_LIBADD = $(XCB_LIBS)
+libxcb_xtest_la_SOURCES = extensions/xtest.c extensions/xtest.h
 
-libXCBxv_la_LDFLAGS = -version-info 0:0:0
-libXCBxv_la_LIBADD = $(XCB_LIBS)
-libXCBxv_la_SOURCES = extensions/xv.c extensions/xv.h
+libxcb_xv_la_LDFLAGS = -version-info 0:0:0
+libxcb_xv_la_LIBADD = $(XCB_LIBS)
+libxcb_xv_la_SOURCES = extensions/xv.c extensions/xv.h
 
-libXCBxvmc_la_LDFLAGS = -version-info 0:0:0
-libXCBxvmc_la_LIBADD = $(XCB_LIBS)
-libXCBxvmc_la_SOURCES = extensions/xvmc.c extensions/xvmc.h
+libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0
+libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
+libxcb_xvmc_la_SOURCES = extensions/xvmc.c extensions/xvmc.h
 
 $(EXTHEADERS) $(EXTSOURCES): c-client.xsl
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fceaf13..5926d29 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
 EXTRA_DIST = CheckLog.xsl
 AM_MAKEFLAGS = -k
 AM_CFLAGS = -Wall -Werror $(XPROTO_CFLAGS) @CHECK_CFLAGS@ -I$(top_srcdir)/src
-LDADD = @CHECK_LIBS@ $(top_builddir)/src/libXCB.la
+LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxcb.la
 
 if HAVE_CHECK
 TESTS = check_all
diff --git a/xcb-composite.pc.in b/xcb-composite.pc.in
index be04e12..02d49b0 100644
--- a/xcb-composite.pc.in
+++ b/xcb-composite.pc.in
@@ -7,5 +7,5 @@ Name: XCB Composite
 Description: XCB Composite Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-xfixes
-Libs: -L${libdir} -lXCBcomposite
+Libs: -L${libdir} -lxcb-composite
 Cflags: -I${includedir}
diff --git a/xcb-damage.pc.in b/xcb-damage.pc.in
index 2c4fbf1..c4bc599 100644
--- a/xcb-damage.pc.in
+++ b/xcb-damage.pc.in
@@ -7,5 +7,5 @@ Name: XCB Damage
 Description: XCB Damage Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-xfixes
-Libs: -L${libdir} -lXCBdamage
+Libs: -L${libdir} -lxcb-damage
 Cflags: -I${includedir}
diff --git a/xcb-dpms.pc.in b/xcb-dpms.pc.in
index 1940d73..838a054 100644
--- a/xcb-dpms.pc.in
+++ b/xcb-dpms.pc.in
@@ -7,5 +7,5 @@ Name: XCB DPMS
 Description: XCB DPMS Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBdpms
+Libs: -L${libdir} -lxcb-dpms
 Cflags: -I${includedir}
diff --git a/xcb-glx.pc.in b/xcb-glx.pc.in
index 8151fb9..bbd4126 100644
--- a/xcb-glx.pc.in
+++ b/xcb-glx.pc.in
@@ -7,5 +7,5 @@ Name: XCB GLX
 Description: XCB GLX Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBglx
+Libs: -L${libdir} -lxcb-glx
 Cflags: -I${includedir}
diff --git a/xcb-randr.pc.in b/xcb-randr.pc.in
index b9f01b0..ac7f35d 100644
--- a/xcb-randr.pc.in
+++ b/xcb-randr.pc.in
@@ -7,5 +7,5 @@ Name: XCB RandR
 Description: XCB RandR Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBrandr
+Libs: -L${libdir} -lxcb-randr
 Cflags: -I${includedir}
diff --git a/xcb-record.pc.in b/xcb-record.pc.in
index c7d3ac6..689f098 100644
--- a/xcb-record.pc.in
+++ b/xcb-record.pc.in
@@ -7,5 +7,5 @@ Name: XCB Record
 Description: XCB Record Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBrecord
+Libs: -L${libdir} -lxcb-record
 Cflags: -I${includedir}
diff --git a/xcb-render.pc.in b/xcb-render.pc.in
index 5f78bbf..c3b050a 100644
--- a/xcb-render.pc.in
+++ b/xcb-render.pc.in
@@ -7,5 +7,5 @@ Name: XCB Render
 Description: XCB Render Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBrender
+Libs: -L${libdir} -lxcb-render
 Cflags: -I${includedir}
diff --git a/xcb-res.pc.in b/xcb-res.pc.in
index 96e668c..62dbab6 100644
--- a/xcb-res.pc.in
+++ b/xcb-res.pc.in
@@ -7,5 +7,5 @@ Name: XCB Res
 Description: XCB X-Resource Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBres
+Libs: -L${libdir} -lxcb-res
 Cflags: -I${includedir}
diff --git a/xcb-screensaver.pc.in b/xcb-screensaver.pc.in
index a24f49e..ba3f8ec 100644
--- a/xcb-screensaver.pc.in
+++ b/xcb-screensaver.pc.in
@@ -7,5 +7,5 @@ Name: XCB Screensaver
 Description: XCB Screensaver Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBscreensaver
+Libs: -L${libdir} -lxcb-screensaver
 Cflags: -I${includedir}
diff --git a/xcb-shape.pc.in b/xcb-shape.pc.in
index f3f5c54..880204d 100644
--- a/xcb-shape.pc.in
+++ b/xcb-shape.pc.in
@@ -7,5 +7,5 @@ Name: XCB Shape
 Description: XCB Shape Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBshape
+Libs: -L${libdir} -lxcb-shape
 Cflags: -I${includedir}
diff --git a/xcb-shm.pc.in b/xcb-shm.pc.in
index 5b01ba6..9256bf0 100644
--- a/xcb-shm.pc.in
+++ b/xcb-shm.pc.in
@@ -7,5 +7,5 @@ Name: XCB Shm
 Description: XCB Shm Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBshm
+Libs: -L${libdir} -lxcb-shm
 Cflags: -I${includedir}
diff --git a/xcb-sync.pc.in b/xcb-sync.pc.in
index e59c969..ead76d1 100644
--- a/xcb-sync.pc.in
+++ b/xcb-sync.pc.in
@@ -7,5 +7,5 @@ Name: XCB Sync
 Description: XCB Sync Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBsync
+Libs: -L${libdir} -lxcb-sync
 Cflags: -I${includedir}
diff --git a/xcb-xevie.pc.in b/xcb-xevie.pc.in
index 4062f19..0aa3e02 100644
--- a/xcb-xevie.pc.in
+++ b/xcb-xevie.pc.in
@@ -7,5 +7,5 @@ Name: XCB Xevie
 Description: XCB Xevie Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBxevie
+Libs: -L${libdir} -lxcb-xevie
 Cflags: -I${includedir}
diff --git a/xcb-xf86dri.pc.in b/xcb-xf86dri.pc.in
index 1db8a68..f3f2980 100644
--- a/xcb-xf86dri.pc.in
+++ b/xcb-xf86dri.pc.in
@@ -7,5 +7,5 @@ Name: XCB XFree86-DRI
 Description: XCB XFree86-DRI Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBxf86dri
+Libs: -L${libdir} -lxcb-xf86dri
 Cflags: -I${includedir}
diff --git a/xcb-xfixes.pc.in b/xcb-xfixes.pc.in
index c0e3fb6..93eafda 100644
--- a/xcb-xfixes.pc.in
+++ b/xcb-xfixes.pc.in
@@ -7,5 +7,5 @@ Name: XCB XFixes
 Description: XCB XFixes Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-render xcb-shape
-Libs: -L${libdir} -lXCBxfixes
+Libs: -L${libdir} -lxcb-xfixes
 Cflags: -I${includedir}
diff --git a/xcb-xprint.pc.in b/xcb-xprint.pc.in
index 90257a2..b5275d5 100644
--- a/xcb-xprint.pc.in
+++ b/xcb-xprint.pc.in
@@ -7,5 +7,5 @@ Name: XCB Xprint
 Description: XCB Xprint Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBxprint
+Libs: -L${libdir} -lxcb-xprint
 Cflags: -I${includedir}
diff --git a/xcb-xtest.pc.in b/xcb-xtest.pc.in
index 598b4d3..886c4dc 100644
--- a/xcb-xtest.pc.in
+++ b/xcb-xtest.pc.in
@@ -7,5 +7,5 @@ Name: XCB XTEST
 Description: XCB XTEST Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb
-Libs: -L${libdir} -lXCBxtest
+Libs: -L${libdir} -lxcb-xtest
 Cflags: -I${includedir}
diff --git a/xcb-xv.pc.in b/xcb-xv.pc.in
index d23d56d..f447613 100644
--- a/xcb-xv.pc.in
+++ b/xcb-xv.pc.in
@@ -7,5 +7,5 @@ Name: XCB Xv
 Description: XCB Xv Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-shm
-Libs: -L${libdir} -lXCBxv
+Libs: -L${libdir} -lxcb-xv
 Cflags: -I${includedir}
diff --git a/xcb-xvmc.pc.in b/xcb-xvmc.pc.in
index 37ec672..95bf4ef 100644
--- a/xcb-xvmc.pc.in
+++ b/xcb-xvmc.pc.in
@@ -7,5 +7,5 @@ Name: XCB XvMC
 Description: XCB XvMC Extension
 Version: @PACKAGE_VERSION@
 Requires: xcb xcb-xv
-Libs: -L${libdir} -lXCBxvmc
+Libs: -L${libdir} -lxcb-xvmc
 Cflags: -I${includedir}
diff --git a/xcb.pc.in b/xcb.pc.in
index cc4910d..4d6bc30 100644
--- a/xcb.pc.in
+++ b/xcb.pc.in
@@ -8,6 +8,6 @@ Description: X-protocol C Binding
 Version: @PACKAGE_VERSION@
 Requires: xproto
 Requires.private: xau
-Libs: -L${libdir} -lXCB
+Libs: -L${libdir} -lxcb
 Libs.private: @LIBS@
 Cflags: -I${includedir}