From: Lennart Poettering Date: Mon, 19 Jun 2006 21:53:48 +0000 (+0000) Subject: big s/polyp/pulse/g X-Git-Tag: submit/2.0-panda/20130828.192557~3564 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f44ba092651aa75055e109e04b4164ea92ae7fdc;p=profile%2Fivi%2Fpulseaudio-panda.git big s/polyp/pulse/g git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1033 fefdeb5f-60dc-0310-8127-8f9354f1896f --- diff --git a/LICENSE b/LICENSE index 0ef0951..bc633bd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,13 @@ -All Polypaudio source files are licensed under the GNU Lesser General Public +All PulseAudio source files are licensed under the GNU Lesser General Public License. (see file LGPL for details) However, the server side links to the GPL-only library 'libsamplerate' which practically downgrades the license of the server part to GPL (see file GPL for details), exercising section 3 of the LGPL. -Hence you should treat the client library ('libpolyp') of Polypaudio as being -LGPL licensed and the server part ('libpolypcore') as being GPL licensed. Since -the Polypaudio daemon and the modules link to 'libpolypcore' they are of course +Hence you should treat the client library ('libpulse') of Polypaudio as being +LGPL licensed and the server part ('libpulsecore') as being GPL licensed. Since +the PulseAudio daemon and the modules link to 'libpulsecore' they are of course also GPL licensed. -- Lennart Poettering, April 20th, 2006. diff --git a/Makefile.am b/Makefile.am index c7ea54f..4174a39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,19 +1,19 @@ # $Id$ # -# This file is part of polypaudio. +# This file is part of PulseAudio. # -# polypaudio is free software; you can redistribute it and/or modify +# PulseAudio is free software; you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# polypaudio is distributed in the hope that it will be useful, but +# PulseAudio is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with polypaudio; if not, write to the Free Software +# along with PulseAudio; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. @@ -24,16 +24,21 @@ MAINTAINERCLEANFILES = noinst_DATA = pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = polyplib.pc polyplib-simple.pc polyplib-browse.pc +pkgconfig_DATA = libpulse.pc libpulse-simple.pc + +if HAVE_HOWL +pkgconfig_DATA += \ + libpulse-browse.pc +endif if HAVE_GLIB20 pkgconfig_DATA += \ - polyplib-glib-mainloop.pc + libpulse-glib-mainloop.pc endif if HAVE_GLIB12 pkgconfig_DATA += \ - polyplib-glib12-mainloop.pc + libpulse-glib12-mainloop.pc endif if USE_LYNX @@ -49,11 +54,11 @@ endif homepage: all dist doxygen test -d $$HOME/homepage/private - mkdir -p $$HOME/homepage/private/projects/polypaudio $$HOME/homepage/private/projects/polypaudio/doxygen - cp polypaudio-@PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/polypaudio - cp doc/README.html doc/FAQ.html doc/cli.html doc/daemon.html doc/modules.html doc/style.css $$HOME/homepage/private/projects/polypaudio - cp -a doxygen/html/* $$HOME/homepage/private/projects/polypaudio/doxygen - ln -sf $$HOME/homepage/private/projects/polypaudio/README.html $$HOME/homepage/private/projects/polypaudio/index.html + mkdir -p $$HOME/homepage/private/projects/pulseaudio $$HOME/homepage/private/projects/pulseaudio/doxygen + cp pulseaudio-@PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/pulseaudio + cp doc/README.html doc/FAQ.html doc/cli.html doc/daemon.html doc/modules.html doc/style.css $$HOME/homepage/private/projects/pulseaudio + cp -a doxygen/html/* $$HOME/homepage/private/projects/pulseaudio/doxygen + ln -sf $$HOME/homepage/private/projects/pulseaudio/README.html $$HOME/homepage/private/projects/pulseaudio/index.html #distcleancheck: # @: diff --git a/bootstrap.sh b/bootstrap.sh index ea6758a..1f8b29d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,20 +1,20 @@ #!/bin/bash # $Id$ -# This file is part of polypaudio. +# This file is part of PulseAudio. # -# polypaudio is free software; you can redistribute it and/or modify it +# PulseAudio is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# polypaudio is distributed in the hope that it will be useful, but +# PulseAudio is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with polypaudio; if not, write to the Free Software Foundation, +# along with PulseAudio; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. VERSION=1.9 diff --git a/configure.ac b/configure.ac index 0ccbe4f..4f53034 100644 --- a/configure.ac +++ b/configure.ac @@ -3,20 +3,20 @@ # $Id$ -# This file is part of polypaudio. +# This file is part of PulseAudio. # -# polypaudio is free software; you can redistribute it and/or modify it +# PulseAudio is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# polypaudio is distributed in the hope that it will be useful, but +# PulseAudio is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with polypaudio; if not, write to the Free Software Foundation, +# along with PulseAudio; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. AC_PREREQ(2.57) @@ -25,13 +25,13 @@ m4_define(PA_MAJOR, [0]) m4_define(PA_MINOR, [9]) m4_define(PA_MICRO, [1]) -AC_INIT([polypaudio], PA_MAJOR.PA_MINOR.PA_MICRO,[mzcbylcnhqvb (at) 0pointer (dot) de]) +AC_INIT([pulseaudio], PA_MAJOR.PA_MINOR.PA_MICRO,[mzcbylcnhqvb (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/daemon/main.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign -Wall]) AC_SUBST(PA_MAJORMINOR, "PA_MAJOR.PA_MINOR") -AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/polypaudio/]) +AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/pulseaudio/]) AC_SUBST(PA_API_VERSION, 9) AC_SUBST(PA_PROTOCOL_VERSION, 9) @@ -681,8 +681,8 @@ fi AC_ARG_WITH( [module-dir], - AC_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/polypaudio-${PA_MAJORMINOR}/modules/]), - [modlibexecdir=$withval], [modlibexecdir="${libdir}/polypaudio-${PA_MAJORMINOR}/modules/"]) + AC_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules/]), + [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules/"]) AC_SUBST(modlibexecdir) @@ -695,11 +695,11 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "x1"]) AC_CONFIG_FILES([ Makefile src/Makefile -polyplib.pc -polyplib-simple.pc -polyplib-browse.pc -polyplib-glib-mainloop.pc -polyplib-glib12-mainloop.pc +libpulse.pc +libpulse-simple.pc +libpulse-browse.pc +libpulse-glib-mainloop.pc +libpulse-glib12-mainloop.pc doc/Makefile doc/README.html doc/cli.html @@ -707,7 +707,7 @@ doc/daemon.html doc/modules.html doxygen/Makefile doxygen/doxygen.conf -src/polyp/version.h +src/pulse/version.h doc/FAQ.html ]) AC_OUTPUT diff --git a/doc/FAQ.html.in b/doc/FAQ.html.in index a042dd7..d9550e9 100644 --- a/doc/FAQ.html.in +++ b/doc/FAQ.html.in @@ -2,7 +2,7 @@ -polypaudio: FAQ +pulseaudio: FAQ @@ -57,64 +57,64 @@ reimplement very much code for Polypaudio. It should be easy to implement limited support for libartsc based applications. Noone has done this yet. It is probably a better idea to - run arts on top of Polypaudio (through a polypaudio driver + run arts on top of Polypaudio (through a pulseaudio driver for aRts, which nobody has written yet). Another solution would be to embed Polypaudio in the aRts process.

  • I often hear noises when playing back with Polypaudio, what can I do?

    -

    There are to possible solutions: run polypaudio with argument +

    There are to possible solutions: run pulseaudio with argument --high-priority=1 and make yourself member of the group realtime, or increase the fragment sizes of the audio drivers. The former will allow Polypaudio to activate SCHED_FIFO high priority scheduling (root rights are dropped immediately after this). Keep in mind that this is a potential security hole!

    • -

  • The polypaudio executable is installed SUID root by default. Why this? Isn't this a potential security hole?

    +

  • The pulseaudio executable is installed SUID root by default. Why this? Isn't this a potential security hole?

    Polypaudio activates SCHED_FIFO scheduling if the user passes --high-priority=1. This will only succeed when executed as root, therefore the binary is marked SUID root by -default. Yes, this is a potential security hole. However, polypaudio +default. Yes, this is a potential security hole. However, pulseaudio tries its best to minimize the security threat: immediately after -startup polypaudio drops all capabilities except +startup pulseaudio drops all capabilities except CAP_SYS_NICE (At least on systems that support it, like Linux; see man 7 capabilities for more information). If the calling user is not a member of the group realtime (which is required to have a GID < 1000), root rights are dropped immediately. This means, you can -install polypaudio SUID root, but only a subset of your users (the +install pulseaudio SUID root, but only a subset of your users (the members of the group realtime) may make use of realtime scheduling. Keep in mind that these users might load their own binary -modules into the polypaudio daemon which may freeze the machine. The +modules into the pulseaudio daemon which may freeze the machine. The daemon has a minimal protection against CPU hogging (the daemon is killed after hogging more than 70% CPU for 5 seconds), but this may be circumvented easily by evildoers.

    • -

  • I want to run polypaudio only when it is needed, how do I do this?

    +

  • I want to run pulseaudio only when it is needed, how do I do this?

    Set autospawn = yes in client.conf. That -configuration file may be found either in /etc/polypaudio/ or -in ~/.polypaudio/.

    • +configuration file may be found either in /etc/pulseaudio/ or +in ~/.pulseaudio/.

    -

  • How do I list all polypaudio modules installed?

    +

  • How do I list all pulseaudio modules installed?

    -

    polypaudio --dump-modules

    +

    pulseaudio --dump-modules

    Add -v for terse usage instructions.

    -

  • How do I use polypaudio over the network?

    +

  • How do I use pulseaudio over the network?

    -

    Just set $POLYP_SERVER to the host name of the polypaudio +

    Just set $POLYP_SERVER to the host name of the pulseaudio server. For authentication you need the same auth cookies on all sides. For -that copy ~./polypaudio-cookie to all clients that shall +that copy ~./pulseaudio-cookie to all clients that shall be allowed to connect.

    Alternatively the authorization cookies can be stored in the X11 server.

    • -

  • Is polypaudio capable of providing synchronized audio playback over the network for movie players like mplayer?

    +

  • Is pulseaudio capable of providing synchronized audio playback over the network for movie players like mplayer?

    Yes! Unless your network is congested in some way (i.e. transfer latencies vary strongly) it works perfectly. Drop me an email for experimental patches for MPlayer.

    -

  • What environment variables does polypaudio care about?

    +

  • What environment variables does pulseaudio care about?

    The client honors: POLYP_SINK (default sink to connect to), POLYP_SOURCE (default source to connect to), POLYP_SERVER (default server to connect to, like ESPEAKER), POLYP_BINARY (the binary to start when autospawning a daemon), POLYP_CLIENTCONFIG (path to the client configuration file).

    @@ -126,31 +126,31 @@ be allowed to connect.

    A brilliant guy named Lennart Poettering once wrote a nifty tool for that purpose: bidilink. To -connect to a running polypaudio daemon try using the following commands:

    +connect to a running pulseaudio daemon try using the following commands:

    -
    killall -USR2 polypaudio
-bidilink unix-client:/tmp/polypaudio/cli
    +
    killall -USR2 pulseaudio
+bidilink unix-client:/tmp/pulseaudio/cli

    BTW: Someone should package this great tool for Debian!

    New: There's now a tool pacmd that automates sending SIGUSR2 to the daemon and running a bidilink like tool for you.

    • -

  • How do the polypaudio libraries decide where to connect to?

    +

  • How do the pulseaudio libraries decide where to connect to?

    The following rule applies:

    1. If the the application using the library specifies a server to connect to it is used. If the connection fails, the library fails too.
    2. If the environment variable POLYP_SERVER is defined the library connects to that server. If the connection fails, the library fails too.
    3. If $DISPLAY is set, the library tries to connect to that server and looks for the root window property POYLP_SERVER for the host to connect to. If POLYP_COOKIE is set it is used as authentication cookie.
      4. -
    4. If the client configuration file (~/.polypaudio/client.conf or /etc/polypaudio/client.conf) sets the server address, the library connects to that server. If the connection fails, the library fails too.
      5. -
    5. The library tries to connect to the default local UNIX socket for polypaudio servers. If the connection fails, it proceeds with the next item.
      6. -
    6. The library tries to connect to the default local TCP socket for polypaudio servers. If the connection fails, it proceeds with the next item.
      7. +
    7. If the client configuration file (~/.pulseaudio/client.conf or /etc/pulseaudio/client.conf) sets the server address, the library connects to that server. If the connection fails, the library fails too.
      8. +
    8. The library tries to connect to the default local UNIX socket for pulseaudio servers. If the connection fails, it proceeds with the next item.
      9. +
    9. The library tries to connect to the default local TCP socket for pulseaudio servers. If the connection fails, it proceeds with the next item.
    10. If $DISPLAY is set, the library tries to connect to the default TCP port of that host. If the connection fails, it proceeds with the next item.
    11. The connection fails.
    • -

  • Why the heck does libpolyp link against libX11?

    +

  • Why the heck does libpulse link against libX11?

    The Polypaudio client libraries look for some X11 root window properties for the credentials of the Polypaudio server to access. You may compile Polypaudio without X11 for disabling this feature.

    • diff --git a/doc/Makefile.am b/doc/Makefile.am index a5884ab..a58911a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,19 +1,19 @@ # $Id$ -# This file is part of polypaudio. +# This file is part of PulseAudio. # -# polypaudio is free software; you can redistribute it and/or modify it +# PulseAudio is free software; you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# polypaudio is distributed in the hope that it will be useful, but +# PulseAudio is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with polypaudio; if not, write to the Free Software Foundation, +# along with PulseAudio; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. noinst_DATA = README.html cli.html modules.html daemon.html FAQ.html diff --git a/doc/README.html.in b/doc/README.html.in index f35b2da..2f6ad44 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -3,12 +3,12 @@ -polypaudio @PACKAGE_VERSION@ +pulseaudio @PACKAGE_VERSION@ -

    polypaudio @PACKAGE_VERSION@

    +

    pulseaudio @PACKAGE_VERSION@

    Copyright 2004-2006 Lennart Poettering <@PACKAGE_BUGREPORT@> and Pierre Ossman

    @@ -44,7 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

    News

    Fri Jun 2 2006:

    Version 0.9.1 +href="@PACKAGE_URL@pulseaudio-0.9.1.tar.gz">Version 0.9.1 released; changes include: load modules even when libtool .la files are missing; generate better ALSA device names from module-detect; if an ALSA device doesn't support the @@ -53,7 +53,7 @@ suggests instead; amd64 portability; drop .sh suffix of esdcompat.sh; build system fixes; No API or ABI changes were made

    Fri May 26 2006:

    Version 0.9.0 +href="@PACKAGE_URL@pulseaudio-0.9.0.tar.gz">Version 0.9.0 released; changes include: new module module-volume-restore; new OSS API emulation tool padsp; require valid UTF8 strings everywhere; properly support ALSA channel maps for surround sound; @@ -62,7 +62,7 @@ main loop API for synchronous programs; introduce real shared object versioning; a few API additions; many, many bugfixes

    Fri Apr 28 2006:

    Version 0.8.1 +href="@PACKAGE_URL@pulseaudio-0.8.1.tar.gz">Version 0.8.1 released; changes include: support for specifying the channel map on the command lines of paplay and pacat and as arguments to the driver modules; ALSA hardware mixer compatibility; @@ -70,16 +70,16 @@ fix linking; properly remove PF_UNIX sockets when unloading protocol modules; fix sample cache; many other fixes

    Thu Apr 13 2006:

    Version 0.8 released; -changes include: too many to count - consider reading this blog entry for more information; many, many minor fixes.

    +href="@PACKAGE_URL@pulseaudio-0.8.tar.gz">Version 0.8 released; +changes include: too many to count - consider reading this blog entry for more information; many, many minor fixes.

    Sun Nov 21 2004:

    Version 0.7 released; +href="@PACKAGE_URL@pulseaudio-0.7.tar.gz">Version 0.7 released; changes include: IPv6 support; PID file support; publish credentials in X11 root window (module-x11-publish; new tool pacmd; ESOUND backend; new command load-sample-dir-lazy; many, many minor fixes.

    Thu Oct 28 2004:

    Version 0.6 released; +href="@PACKAGE_URL@pulseaudio-0.6.tar.gz">Version 0.6 released; changes include: TCP wrappers support; don't load the complete sound file into memory when playing back using pa_play_file(); autoload API change; don't load all sound files as FLOAT32; shorten @@ -91,14 +91,14 @@ generation; correctly lock daemon autospawning; print daemon layout to STDERR on SIGHUP; new options for pacat: allow sample type specification.

    Mon Sep 24 2004:

    Version 0.5.1 released; +href="@PACKAGE_URL@pulseaudio-0.5.1.tar.gz">Version 0.5.1 released; changes include: improve esound protocol compatibility; fix autospawning via libesd; make use of POSIX capabilities; allow SCHED_FIFO scheduling only for users in group realtime; minor build system fix.

    Mon Sep 20 2004:

    Version 0.5 released; +href="@PACKAGE_URL@pulseaudio-0.5.tar.gz">Version 0.5 released; changes include: extensive API improvements, new module module-combine for combining multiple sound cards into one, gcc 2.95 compatibility, configuration files, add "lazy" samples, @@ -106,29 +106,29 @@ support for source and network latency measurements, add module-pipe-source, many other fixes and improvements.

    Wed Sep 8 2004:

    Version 0.4 released; +href="@PACKAGE_URL@pulseaudio-0.4.tar.gz">Version 0.4 released; changes include: daemon auto spawning, support for SCHED_FIFO scheduling, three new modules, proper logging, CPU load watchdog, many fixes.

    Fri Aug 27 2004:

    Version 0.3 released; +href="@PACKAGE_URL@pulseaudio-0.3.tar.gz">Version 0.3 released; changes include: support for both glib 2.0 and glib 1.2, future cancellation, API updates, many fixes, relicense client library to LGPL.

    Fri Aug 20 2004:

    Version 0.2 released; +href="@PACKAGE_URL@pulseaudio-0.2.tar.gz">Version 0.2 released; changes include: added sample cache, introspection API, client API documentation, module autoloading, glib support, a module for intercepting X11 bell events, and much more.

    Sat Jul 17 2004:

    Version 0.1 released

    +href="@PACKAGE_URL@pulseaudio-0.1.tar.gz">Version 0.1 released

    Overview

    -

    polypaudio is a networked sound server for Linux and other +

    pulseaudio is a networked sound server for Linux and other Unix like operating systems and Microsoft Windows. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (ESOUND). In addition to the features ESOUND provides -polypaudio has:

    +pulseaudio has:

    -

    A GTK GUI manager application for polypaudio is the A GTK GUI manager application for pulseaudio is the Polypaudio Manager. Other GTK GUI tool for Polypaudio are the Polypaudio Volume @@ -195,10 +195,10 @@ href="http://0pointer.de/lennart/projects/pavucontrol">Polypaudio Volume Control .

    There are output plugins for XMMS, libao +href="http://0pointer.de/lennart/projects/xmms-pulse/">XMMS, libao (merged in libao SVN) and gstreamer +href="http://0pointer.de/lennart/projects/gst-pulse/">gstreamer (merged in gstreamer-plugins CVS), MPlayer (merged in MPlayer CVS) and Xine (merged in Xine CVS). Drivers for @@ -216,68 +216,68 @@ href="modules.html">modules.html, cli.html, daemon.html and FAQ.html.

    -

    There is a Trac based Wiki for Polypaudio available.

    +

    There is a Trac based Wiki for Polypaudio available.

    First Steps

    -

    Simply start the polypaudio daemon with the argument -nC

    +

    Simply start the pulseaudio daemon with the argument -nC

    -
    polypaudio -nC
    +
    pulseaudio -nC

    This will present you a screen like this:

    -
    Welcome to polypaudio! Use "help" for usage information.
+
    Welcome to pulseaudio! Use "help" for usage information.
 >>> 
    
 
 
    Now you can issue CLI commands as described in cli.html. Another way to start
-polypaudio is by specifying a configuration script like that one included in the distribution on the
+pulseaudio is by specifying a configuration script like that one included in the distribution on the
 command line :
    
 
-
    polypaudio -nF polypaudio.pa
    
+
    pulseaudio -nF pulseaudio.pa
    
 
 
    This will load some drivers and protocols automatically.
    
 
-
    The best idea is to configure your daemon in /etc/polypaudio/daemon.conf and /etc/polypaudio/default.pa and to run polypaudio without any arguments.
    
+
    The best idea is to configure your daemon in /etc/pulseaudio/daemon.conf and /etc/pulseaudio/default.pa and to run pulseaudio without any arguments.
    
 
 
    Beware! Unless you pass the option --sysconfdir=/etc to
-configure, the directory /etc/polypaudio/ is really
-/usr/local/etc/polypaudio/.
    
+configure, the directory /etc/pulseaudio/ is really
+/usr/local/etc/pulseaudio/.
    
 
-
    Developing polypaudio Clients
    
+
    Developing pulseaudio Clients
    
 
 
    You may browse the Doxygen generated programing
+href="http://0pointer.de/lennart/projects/pulseaudio/doxygen/">programing
 documentation for the client API. (Run make doxygen to generate this documentation from the source tree)
    
 
-
    Developing polypaudio Modules
    
+
    Developing pulseaudio Modules
    
 
-
    There are several reasons for writing loadable modules for polypaudio:
    
+
    There are several reasons for writing loadable modules for pulseaudio:
    
 
 
 
 
    There is currently no documentation how to write loadable modules
-for polypaudio. Read the source, Luke! If you are interested in
+for pulseaudio. Read the source, Luke! If you are interested in
 writing new modules feel free to contact the author in case you have any
 questions.
    
 
 
    Requirements
    
 
-
    Currently, polypaudio is tested on Linux, FreeBSD, Solaris and Microsoft Windows. It requires an OSS, ALSA, Win32 or Solaris compatible soundcard.
    
+
    Currently, pulseaudio is tested on Linux, FreeBSD, Solaris and Microsoft Windows. It requires an OSS, ALSA, Win32 or Solaris compatible soundcard.
    
 
-
    polypaudio was developed and tested on Debian GNU/Linux
+
    pulseaudio was developed and tested on Debian GNU/Linux
 "testing" from November 2004, it should work on most other Linux
 distributions (and maybe Unix versions) since it uses GNU autoconf and
 GNU libtool for source code configuration and shared library
 management.
    
 
-
    polypaudio needs pulseaudio needs Secret Rabbit Code (aka
 libsamplerate), libsndfile, 
 ./configure inside the distribution directory for configuring
 the source tree. After that you should run make for
 compilation and make install (as root) for installation of
-polypaudio.
    
+pulseaudio.
    
 
 
    Acknowledgements
    
 
@@ -318,25 +318,25 @@ compilation and make install (as root) for installation of
 
 
    The newest release is always available from @PACKAGE_URL@
    
 
-
    The current release is @PACKAGE_VERSION@
    
+
    The current release is @PACKAGE_VERSION@
    
 
-
    Get polypaudio's development sources from the Subversion repository (viewcvs): 
    
+
    Get pulseaudio's development sources from the Subversion repository (viewcvs): 
    
 
-
    svn checkout svn://0pointer.de/polypaudio/trunk polypaudio
    
+
    svn checkout svn://0pointer.de/pulseaudio/trunk pulseaudio
    
 
 
    Community
    
 
-
    If you want to be notified whenever I release a new version of this software use the subscription feature of Freshmeat.
    
+
    If you want to be notified whenever I release a new version of this software use the subscription feature of Freshmeat.
    
 
-
    There is a general discussion mailing list for polypaudio available. In addition, you can subscribe to SVN changes and Trac Tickets.
    
+
    There is a general discussion mailing list for pulseaudio available. In addition, you can subscribe to SVN changes and Trac Tickets.
    
 
-
    Polypaudio is being tracked at CIA.
    
+
    Polypaudio is being tracked at CIA.
    
 
-
    There's a chance to meet the Polypaudio developers on our IRC channel #polypaudio on irc.freenode.org.
    
+
    There's a chance to meet the Polypaudio developers on our IRC channel #pulseaudio on irc.freenode.org.
    
 
-
    There is a Trac based Wiki for Polypaudio available.
    
+
    There is a Trac based Wiki for Polypaudio available.
    
 
-
    Please report bugs to our Trac ticket system.
    
+
    Please report bugs to our Trac ticket system.
    
 
 
    
 
    Lennart Poettering <@PACKAGE_BUGREPORT@>, June 2006
    
diff --git a/doc/cli.html.in b/doc/cli.html.in
index 0db96c3..511f596 100644
--- a/doc/cli.html.in
+++ b/doc/cli.html.in
@@ -2,14 +2,14 @@
 
 
 
-polypaudio: Simple Command Line Language
+pulseaudio: Simple Command Line Language
 
 
 
 
 
    Simple Command Line Language
    
 
-
    polypaudio provides a simple command line language used by
+
    pulseaudio provides a simple command line language used by
 configuration scripts as well as the modules module-cli
 and module-cli-protocol-{unix,tcp}. Empty lines and lines
 beginning with a hashmark (#) are silently ignored. Several
@@ -181,7 +181,7 @@ on the interactive command line.
    
 
 
    Example Configuration Script
    
 
-
    Mark the following script as executable (chmod +x) and run it for a sensible polypaudio configuration.
    
+
    Mark the following script as executable (chmod +x) and run it for a sensible pulseaudio configuration.
    
 
 
     #!/usr/bin/polaudio -nF
diff --git a/doc/daemon.html.in b/doc/daemon.html.in
index a4db0bd..0d91e53 100644
--- a/doc/daemon.html.in
+++ b/doc/daemon.html.in
@@ -2,7 +2,7 @@
 
 
 
-polypaudio: Daemon
+pulseaudio: Daemon
 
 
 
@@ -11,7 +11,7 @@
 
 
    Command Line Arguments
    
 
-The polypaudio daemon accepts several command line arguments:
+The pulseaudio daemon accepts several command line arguments:
 
 
     COMMANDS:
@@ -58,9 +58,9 @@ STARTUP SCRIPT:
 
 
    It is a good idea to run the daemon like this:
    
 
-
    polypaudio -D
    
+
    pulseaudio -D
    
 
-
    This will run /etc/polypaudio/default.pa after startup. This should be a script written in the CLI language described in cli.html. 
    
+
    This will run /etc/pulseaudio/default.pa after startup. This should be a script written in the CLI language described in cli.html. 
    
 
 
    Signals
    
 
diff --git a/doc/modules.html.in b/doc/modules.html.in
index 8547952..f004f08 100644
--- a/doc/modules.html.in
+++ b/doc/modules.html.in
@@ -2,7 +2,7 @@
 
 
 
-polypaudio: Loadable Modules
+pulseaudio: Loadable Modules
 
 
 
@@ -10,7 +10,7 @@
 
 
    Loadable Modules
    
 
-
    The following loadable modules are provided with the polypaudio distribution:
    
+
    The following loadable modules are provided with the pulseaudio distribution:
    
 
 
    Device Drivers
    
 
@@ -157,7 +157,7 @@ will decrease output quality however. (defaults to
 
    module-tunnel-{sink,source}
    
 
 
    Tunnel a remote sink/source to a local "ghost"
-sink/source. Requires a running polypaudio daemon on the remote server
+sink/source. Requires a running pulseaudio daemon on the remote server
 with module-native-protocol-tcp loaded. It's probably a
 better idea to connect to the remote sink/source directly since some
 buffer control is lost through this tunneling.
    
@@ -204,7 +204,7 @@ module see cli.html.
 
    module-cli-protocol-{unix,tcp}
    
 
 
    An implemenation of a simple command line based protocol for
-controlling the polypaudio daemon. If loaded, the user may
+controlling the pulseaudio daemon. If loaded, the user may
 connect with tools like netcat, telnet or
 bidilink to the listening sockets and execute commands the
 same way as with module-cli.
    
@@ -225,7 +225,7 @@ transparent TCP/IP socket. (Both IPv6 and IPv4 - if available)
    
 a numerical binary value. If 1 the socket is bound to the loopback
 device, i.e. not publicly accessible. (defaults to 1)
   listen=(only for -tcp) The IP address to listen on. If specified, supersedes the value specified in loopback=
-  socket=(only for -unix) The UNIX socket name (defaults to /tmp/polypaudio/cli)
+  socket=(only for -unix) The UNIX socket name (defaults to /tmp/pulseaudio/cli)
 
 
 
    module-simple-protocol-{unix,tcp}
    
@@ -254,7 +254,7 @@ about the two possible suffixes of this module.
    
 
    An implemenation of a protocol compatible with the Enlightened Sound
 Daemon (ESOUND, esd). When you load this module you may
-access the polypaudio daemon with tools like esdcat,
+access the pulseaudio daemon with tools like esdcat,
 esdrec or even esdctl. Many applications, such as
 XMMS, include support for this protocol.
    
 
@@ -273,7 +273,7 @@ about the two possible suffixes of this module.
    
 
 
    module-native-protocol-{unix,tcp}
    
 
-
    The native protocol of polypaudio.
    
+
    The native protocol of pulseaudio.
    
 
 
    See module-cli-protocol-{unix,tcp} for more information
 about the two possible suffixes of this module.
    
@@ -293,7 +293,7 @@ about the two possible suffixes of this module.
    
 
    module-http-protocol-tcp
    
 
 
    A proof-of-concept HTTP module, which can be used to introspect
-the current status of the polypaudio daemon using HTTP. Just load this
+the current status of the pulseaudio daemon using HTTP. Just load this
 module and point your browser to http://localhost:4714/. This module takes the same arguments
 as module-cli-protocol-tcp.
    
@@ -347,7 +347,7 @@ already loaded protocol module is used. 
 
 
-  
+  
    
   
    config=The LIRC configuration file
    appname=The application name to pass to LIRC (defaults to polypaudio)
    appname=The application name to pass to LIRC (defaults to pulseaudio)
    
   
    sink=The sink to control
    
 
    
 
@@ -430,7 +430,7 @@ created in the JACK server.
    
 
-  
+  
    
   
    sink_name=The name for the Polypaudio sink. If ommited defaults to jack_out.
    
   
    server_name=The JACK server to connect to. If ommited defaults to the default server.
    client_name=The client name to tell the JACK server. If ommited defaults to polypaudio.
    client_name=The client name to tell the JACK server. If ommited defaults to pulseaudio.
    
   
    channels=Number of channels to register. If ommited defaults to the number of physical playback ports of the JACK server.
    
   
    connect=Takes a boolean value. If enabled (the default) Polypaudio will try to connect its ports to the physicial playback ports of the JACK server
    
 
    
@@ -455,18 +455,18 @@ which is replaced by source_name (with a default of jack_in) f
 
 
    module-esound-compat-spawnfd
    
 
-
    This is a compatibility module for libesd based autospawning of polypaudio. Don't use it directly.
    
+
    This is a compatibility module for libesd based autospawning of pulseaudio. Don't use it directly.
    
 
 
    module-esound-compat-spawnpid
    
 
-
    This is a compatibility module for libesd based autospawning of polypaudio. Don't use it directly.
    
+
    This is a compatibility module for libesd based autospawning of pulseaudio. Don't use it directly.
    
 
 
    module-match
    
 
 
    Adjust the volume of a playback stream automatically based on its name.
    
 
 
-  
+  
    table=The regular expression matching table file to use (defaults to ~/.polypaudio/match.table)
    table=The regular expression matching table file to use (defaults to ~/.pulseaudio/match.table)
    
 
    
 
 
    The table file should contain a regexp and volume on each line, seperated by spaces. An example:
    
@@ -482,7 +482,7 @@ which is replaced by source_name (with a default of jack_in) f
 
    Adjust the volume of a playback stream automatically based on its name.
    
 
 
-  
+  
    table=The table file to use (defaults to ~/.polypaudio/volume.table)
    table=The table file to use (defaults to ~/.pulseaudio/volume.table)
    
 
    
 
 
    In contrast to module-match this module needs no explicit
diff --git a/doc/style.css b/doc/style.css
index a606c08..c5af005 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
- * This file is part of polypaudio.
+ * This file is part of PulseAudio.
  *
- * polypaudio is free software; you can redistribute it and/or modify it
+ * PulseAudio is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * polypaudio is distributed in the hope that it will be useful, but
+ * PulseAudio is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with polypaudio; if not, write to the Free Software Foundation,
+ * along with PulseAudio; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  ***/
 
diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index 8feec73..c4f66d8 100644
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -1,19 +1,19 @@
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
diff --git a/doxygen/doxygen.conf.in b/doxygen/doxygen.conf.in
index f466c9d..8ccf667 100644
--- a/doxygen/doxygen.conf.in
+++ b/doxygen/doxygen.conf.in
@@ -17,7 +17,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = @PACKAGE_NAME@
+PROJECT_NAME           = PulseAudio
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
@@ -417,7 +417,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ../src/polyp/context.h ../src/polyp/stream.h ../src/polyp/polypaudio.h ../src/polyp/sample.h ../src/polyp/def.h ../src/polyp/subscribe.h ../src/polyp/introspect.h ../src/polyp/scache.h ../src/polyp/mainloop-api.h ../src/polyp/glib-mainloop.h ../src/polyp/mainloop.h ../src/polyp/mainloop-signal.h ../src/polyp/error.h ../src/polyp/operation.h ../src/polyp/simple.h ../src/polyp/version.h ../src/polyp/volume.h ../src/polyp/channelmap.h ../src/polyp/thread-mainloop.h ../src/polyp/xmalloc.h ../src/polyp/utf8.h ../src/polyp/util.h ../src/polyp/timeval.h
+INPUT                  = ../src/pulse/context.h ../src/pulse/stream.h ../src/pulse/pulseaudio.h ../src/pulse/sample.h ../src/pulse/def.h ../src/pulse/subscribe.h ../src/pulse/introspect.h ../src/pulse/scache.h ../src/pulse/mainloop-api.h ../src/pulse/glib-mainloop.h ../src/pulse/mainloop.h ../src/pulse/mainloop-signal.h ../src/pulse/error.h ../src/pulse/operation.h ../src/pulse/simple.h ../src/pulse/version.h ../src/pulse/volume.h ../src/pulse/channelmap.h ../src/pulse/thread-mainloop.h ../src/pulse/xmalloc.h ../src/pulse/utf8.h ../src/pulse/util.h ../src/pulse/timeval.h
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/polyplib-browse.pc.in b/libpulse-browse.pc.in
similarity index 57%
rename from polyplib-browse.pc.in
rename to libpulse-browse.pc.in
index 952e28c..7bdedf2 100644
--- a/polyplib-browse.pc.in
+++ b/libpulse-browse.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib-browse
-Description: Polypaudio network browsing API
+Name: libpuls-browse
+Description: PulseAudio Network Browsing API
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp-browse
+Libs: -L${libdir} -lpulse-browse
 Cflags: -D_REENTRANT -I${includedir}
-Requires: polyplib
+Requires: libpulse
diff --git a/polyplib-glib-mainloop.pc.in b/libpulse-glib-mainloop.pc.in
similarity index 50%
rename from polyplib-glib-mainloop.pc.in
rename to libpulse-glib-mainloop.pc.in
index 03338c5..169910b 100644
--- a/polyplib-glib-mainloop.pc.in
+++ b/libpulse-glib-mainloop.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib-glib-mainloop
-Description: GLIB main loop wrapper for polypaudio
+Name: libpulse-glib-mainloop
+Description: GLIB 2.0 Main Loop Wrapper for PulseAudio
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp-mainloop-glib
+Libs: -L${libdir} -lpulse-mainloop-glib
 Cflags: -D_REENTRANT -I${includedir}
-Requires: polyplib glib-2.0
+Requires: libpulse glib-2.0
diff --git a/polyplib-glib12-mainloop.pc.in b/libpulse-glib12-mainloop.pc.in
similarity index 50%
rename from polyplib-glib12-mainloop.pc.in
rename to libpulse-glib12-mainloop.pc.in
index c12a838..f525c37 100644
--- a/polyplib-glib12-mainloop.pc.in
+++ b/libpulse-glib12-mainloop.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib-glib12-mainloop
-Description: GLIB main loop wrapper for polypaudio
+Name: libpulse-glib12-mainloop
+Description: GLIB 1.2 Main Loop Wrapper for PulseAudio
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp-mainloop-glib12
+Libs: -L${libdir} -lpulse-mainloop-glib12
 Cflags: -D_REENTRANT -I${includedir}
-Requires: polyplib glib
+Requires: libpulse glib
diff --git a/polyplib-simple.pc.in b/libpulse-simple.pc.in
similarity index 53%
rename from polyplib-simple.pc.in
rename to libpulse-simple.pc.in
index fa0ca0b..c35e83f 100644
--- a/polyplib-simple.pc.in
+++ b/libpulse-simple.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib-simple
-Description: Simplified synchronous client interface to polypaudio
+Name: libpulse-simple
+Description: Simplified Synchronous Client Interface to PulseAudio
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp-simple
+Libs: -L${libdir} -lpulse-simple
 Cflags: -D_REENTRANT -I${includedir}
-Requires: polyplib
+Requires: libpulse
diff --git a/polyplib.pc.in b/libpulse.pc.in
similarity index 66%
rename from polyplib.pc.in
rename to libpulse.pc.in
index 2d073a9..8d0ffb8 100644
--- a/polyplib.pc.in
+++ b/libpulse.pc.in
@@ -3,9 +3,9 @@ exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: polyplib
-Description: Client interface to polypaudio
+Name: libpulse
+Description: Client Interface to PulseAudio
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpolyp
+Libs: -L${libdir} -lpulse
 Cflags: -D_REENTRANT -I${includedir}
 Requires:
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a2decb..746f85e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,19 +1,19 @@
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
@@ -22,19 +22,19 @@
 #       Extra directories         #
 ###################################
 
-polypincludedir=$(includedir)/polyp
-polypcoreincludedir=$(includedir)/polypcore
-polypconfdir=$(sysconfdir)/polypaudio
+pulseincludedir=$(includedir)/pulse
+pulsecoreincludedir=$(includedir)/pulsecore
+pulseconfdir=$(sysconfdir)/pulse
 
 ###################################
 #            Defines              #
 ###################################
 
-POLYPAUDIO_BINARY=$(bindir)/polypaudio$(EXEEXT)
+POLYPAUDIO_BINARY=$(bindir)/pulseaudio$(EXEEXT)
 if OS_IS_WIN32
 DEFAULT_CONFIG_DIR=%POLYP_ROOT%
 else
-DEFAULT_CONFIG_DIR=$(polypconfdir)
+DEFAULT_CONFIG_DIR=$(pulseconfdir)
 endif
 
 ###################################
@@ -73,7 +73,7 @@ endif
 ###################################
 
 EXTRA_DIST = \
-		polyp/client.conf.in \
+		pulse/client.conf.in \
 		daemon/daemon.conf.in \
 		daemon/default.pa.in \
 		depmod.py \
@@ -81,35 +81,35 @@ EXTRA_DIST = \
 		utils/padsp \
 		modules/module-defs.h.m4
 
-polypconf_DATA = \
+pulseconf_DATA = \
 		default.pa \
 		daemon.conf \
 		client.conf
 
 BUILT_SOURCES = \
-		polyp/version.h
+		pulse/version.h
 
 ###################################
 #          Main daemon            #
 ###################################
 
-bin_PROGRAMS = polypaudio
+bin_PROGRAMS = pulseaudio
 
-polypaudio_SOURCES = \
+pulseaudio_SOURCES = \
 		daemon/caps.h daemon/caps.c \
 		daemon/cmdline.c daemon/cmdline.h \
 		daemon/cpulimit.c daemon/cpulimit.h \
 		daemon/daemon-conf.c daemon/daemon-conf.h \
 		daemon/dumpmodules.c daemon/dumpmodules.h \
 		daemon/main.c \
-		polypcore/gccmacro.h
+		pulsecore/gccmacro.h
 
-polypaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
-polypaudio_CPPFLAGS = $(AM_CPPFLAGS) 
-polypaudio_LDADD = $(AM_LDADD) libpolypcore.la $(LIBLTDL) \
+pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
+pulseaudio_CPPFLAGS = $(AM_CPPFLAGS) 
+pulseaudio_LDADD = $(AM_LDADD) libpulsecore.la $(LIBLTDL) \
 		$(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS)
 # This is needed because automake doesn't properly expand the foreach below
-polypaudio_DEPENDENCIES = libpolypcore.la $(PREOPEN_LIBS)
+pulseaudio_DEPENDENCIES = libpulsecore.la $(PREOPEN_LIBS)
 
 if PREOPEN_MODS
 PREOPEN_LIBS = $(PREOPEN_MODS)
@@ -118,9 +118,9 @@ PREOPEN_LIBS = $(modlibexec_LTLIBRARIES)
 endif
 
 if FORCE_PREOPEN
-polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
+pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
 else
-polypaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
+pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
 endif
 
 ###################################
@@ -147,32 +147,32 @@ endif
 bin_SCRIPTS = esdcompat
 
 pacat_SOURCES = utils/pacat.c
-pacat_LDADD = $(AM_LDADD) libpolyp.la 
+pacat_LDADD = $(AM_LDADD) libpulse.la 
 pacat_CFLAGS = $(AM_CFLAGS) 
 pacat_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 paplay_SOURCES = utils/paplay.c
-paplay_LDADD = $(AM_LDADD) libpolyp.la $(LIBSNDFILE_LIBS)
+paplay_LDADD = $(AM_LDADD) libpulse.la $(LIBSNDFILE_LIBS)
 paplay_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
 paplay_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 pactl_SOURCES = utils/pactl.c
-pactl_LDADD = $(AM_LDADD) libpolyp.la $(LIBSNDFILE_LIBS)
+pactl_LDADD = $(AM_LDADD) libpulse.la $(LIBSNDFILE_LIBS)
 pactl_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
 pactl_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
-pacmd_SOURCES = utils/pacmd.c polypcore/pid.c polypcore/pid.h
+pacmd_SOURCES = utils/pacmd.c pulsecore/pid.c pulsecore/pid.h
 pacmd_CFLAGS = $(AM_CFLAGS)
-pacmd_LDADD = $(AM_LDADD) libpolyp.la
+pacmd_LDADD = $(AM_LDADD) libpulse.la
 pacmd_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 pax11publish_SOURCES = utils/pax11publish.c
 pax11publish_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
-pax11publish_LDADD = $(AM_LDADD) libpolyp.la $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
+pax11publish_LDADD = $(AM_LDADD) libpulse.la $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
 pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 pabrowse_SOURCES = utils/pabrowse.c
-pabrowse_LDADD = $(AM_LDADD) libpolyp.la libpolyp-browse.la
+pabrowse_LDADD = $(AM_LDADD) libpulse.la libpulse-browse.la
 pabrowse_CFLAGS = $(AM_CFLAGS)
 pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
@@ -212,81 +212,81 @@ endif
 
 mainloop_test_SOURCES = tests/mainloop-test.c
 mainloop_test_CFLAGS = $(AM_CFLAGS)
-mainloop_test_LDADD = $(AM_LDADD) libpolyp.la
+mainloop_test_LDADD = $(AM_LDADD) libpulse.la
 mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 thread_mainloop_test_SOURCES = tests/thread-mainloop-test.c
 thread_mainloop_test_CFLAGS = $(AM_CFLAGS)
-thread_mainloop_test_LDADD = $(AM_LDADD) libpolyp.la
+thread_mainloop_test_LDADD = $(AM_LDADD) libpulse.la
 thread_mainloop_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 utf8_test_SOURCES = tests/utf8-test.c
 utf8_test_CFLAGS = $(AM_CFLAGS)
-utf8_test_LDADD = $(AM_LDADD) libpolypcore.la
+utf8_test_LDADD = $(AM_LDADD) libpulsecore.la
 utf8_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 mcalign_test_SOURCES = tests/mcalign-test.c
 mcalign_test_CFLAGS = $(AM_CFLAGS)
-mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
+mcalign_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore.la
 mcalign_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 pacat_simple_SOURCES = tests/pacat-simple.c
-pacat_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la
+pacat_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la
 pacat_simple_CFLAGS = $(AM_CFLAGS)
 pacat_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 parec_simple_SOURCES = tests/parec-simple.c
-parec_simple_LDADD = $(AM_LDADD) libpolyp.la libpolyp-simple.la
+parec_simple_LDADD = $(AM_LDADD) libpulse.la libpulse-simple.la
 parec_simple_CFLAGS = $(AM_CFLAGS)
 parec_simple_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 strlist_test_SOURCES = tests/strlist-test.c
 strlist_test_CFLAGS = $(AM_CFLAGS)
-strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la libstrlist.la
+strlist_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore.la libstrlist.la
 strlist_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 voltest_SOURCES = tests/voltest.c
 voltest_CFLAGS = $(AM_CFLAGS)
-voltest_LDADD = $(AM_LDADD) libpolyp.la
+voltest_LDADD = $(AM_LDADD) libpulse.la
 voltest_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 channelmap_test_SOURCES = tests/channelmap-test.c
 channelmap_test_CFLAGS = $(AM_CFLAGS)
-channelmap_test_LDADD = $(AM_LDADD) libpolyp.la
+channelmap_test_LDADD = $(AM_LDADD) libpulse.la
 channelmap_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 cpulimit_test_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
 cpulimit_test_CFLAGS = $(AM_CFLAGS)
-cpulimit_test_LDADD = $(AM_LDADD) libpolypcore.la
+cpulimit_test_LDADD = $(AM_LDADD) libpulsecore.la
 cpulimit_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 cpulimit_test2_SOURCES = tests/cpulimit-test.c daemon/cpulimit.c daemon/cpulimit.h
 cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2
-cpulimit_test2_LDADD = $(AM_LDADD) libpolypcore.la
+cpulimit_test2_LDADD = $(AM_LDADD) libpulsecore.la
 cpulimit_test2_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES)
 mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP
-mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpolyp-mainloop-glib.la
+mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpulse-mainloop-glib.la
 mainloop_test_glib_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 mainloop_test_glib12_SOURCES = $(mainloop_test_SOURCES)
 mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MAIN_LOOP
-mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12.la
+mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpulse-mainloop-glib12.la
 mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 memblockq_test_SOURCES = tests/memblockq-test.c
 memblockq_test_CFLAGS = $(AM_CFLAGS)
-memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
+memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpulsecore.la
 memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 sync_playback_SOURCES = tests/sync-playback.c
-sync_playback_LDADD = $(AM_LDADD) libpolyp.la
+sync_playback_LDADD = $(AM_LDADD) libpulse.la
 sync_playback_CFLAGS = $(AM_CFLAGS) 
 sync_playback_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
 interpol_test_SOURCES = tests/interpol-test.c
-interpol_test_LDADD = $(AM_LDADD) libpolyp.la
+interpol_test_LDADD = $(AM_LDADD) libpulse.la
 interpol_test_CFLAGS = $(AM_CFLAGS) 
 interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 
@@ -294,170 +294,170 @@ interpol_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
 #         Client library          #
 ###################################
 
-polypinclude_HEADERS = \
-		polyp/cdecl.h \
-		polyp/channelmap.h \
-		polyp/context.h \
-		polyp/def.h \
-		polyp/error.h \
-		polyp/introspect.h \
-		polyp/mainloop.h \
-		polyp/mainloop-api.h \
-		polyp/mainloop-signal.h \
-		polyp/operation.h \
-		polyp/polypaudio.h \
-		polyp/sample.h \
-		polyp/scache.h \
-		polyp/simple.h \
-		polyp/stream.h \
-		polyp/subscribe.h \
-		polyp/thread-mainloop.h \
-		polyp/timeval.h \
-		polyp/utf8.h \
-		polyp/util.h \
-		polyp/version.h \
-		polyp/volume.h \
-		polyp/xmalloc.h
+pulseinclude_HEADERS = \
+		pulse/cdecl.h \
+		pulse/channelmap.h \
+		pulse/context.h \
+		pulse/def.h \
+		pulse/error.h \
+		pulse/introspect.h \
+		pulse/mainloop.h \
+		pulse/mainloop-api.h \
+		pulse/mainloop-signal.h \
+		pulse/operation.h \
+		pulse/pulseaudio.h \
+		pulse/sample.h \
+		pulse/scache.h \
+		pulse/simple.h \
+		pulse/stream.h \
+		pulse/subscribe.h \
+		pulse/thread-mainloop.h \
+		pulse/timeval.h \
+		pulse/utf8.h \
+		pulse/util.h \
+		pulse/version.h \
+		pulse/volume.h \
+		pulse/xmalloc.h
 
 if HAVE_HOWL
-polypinclude_HEADERS += \
-		polyp/browser.h
+pulseinclude_HEADERS += \
+		pulse/browser.h
 endif
 
 if HAVE_GLIB20
-polypinclude_HEADERS += \
-		polyp/glib-mainloop.h
+pulseinclude_HEADERS += \
+		pulse/glib-mainloop.h
 else
 if HAVE_GLIB12
-polypinclude_HEADERS += \
-		polyp/glib-mainloop.h
+pulseinclude_HEADERS += \
+		pulse/glib-mainloop.h
 endif
 endif
 
 lib_LTLIBRARIES = \
-		libpolyp.la \
-		libpolyp-simple.la
+		libpulse.la \
+		libpulse-simple.la
 
 if HAVE_HOWL
 lib_LTLIBRARIES += \
-		libpolyp-browse.la
+		libpulse-browse.la
 endif
 
 if HAVE_GLIB20
 lib_LTLIBRARIES += \
-		libpolyp-mainloop-glib.la
+		libpulse-mainloop-glib.la
 endif
 
 if HAVE_GLIB12
 lib_LTLIBRARIES += \
-		libpolyp-mainloop-glib12.la
+		libpulse-mainloop-glib12.la
 endif
 
 # Public interface
-libpolyp_la_SOURCES = \
-		polyp/cdecl.h \
-		polyp/channelmap.c polyp/channelmap.h \
-		polyp/client-conf.c polyp/client-conf.h \
-		polyp/context.c polyp/context.h \
-		polyp/def.h \
-		polyp/error.c polyp/error.h \
-		polyp/internal.h \
-		polyp/introspect.c polyp/introspect.h \
-		polyp/mainloop.c polyp/mainloop.h \
-		polyp/mainloop-api.c polyp/mainloop-api.h \
-		polyp/mainloop-signal.c polyp/mainloop-signal.h \
-		polyp/operation.c polyp/operation.h \
-		polyp/polypaudio.h \
-		polyp/sample.c polyp/sample.h \
-		polyp/scache.c polyp/scache.h \
-		polyp/stream.c polyp/stream.h \
-		polyp/subscribe.c polyp/subscribe.h \
-		polyp/thread-mainloop.c polyp/thread-mainloop.h \
-		polyp/timeval.c polyp/timeval.h \
-		polyp/utf8.c polyp/utf8.h \
-		polyp/util.c polyp/util.h \
-		polyp/volume.c polyp/volume.h \
-		polyp/xmalloc.c polyp/xmalloc.h
-
-# Internal stuff that is shared with libpolypcore
-libpolyp_la_SOURCES += \
-		polypcore/authkey.c polypcore/authkey.h \
-		polypcore/conf-parser.c polypcore/conf-parser.h \
-		polypcore/core-util.c polypcore/core-util.h \
-		polypcore/dynarray.c polypcore/dynarray.h \
-		polypcore/gccmacro.h \
-		polypcore/hashmap.c polypcore/hashmap.h \
-		polypcore/idxset.c polypcore/idxset.h \
-		polypcore/inet_ntop.c polypcore/inet_ntop.h \
-		polypcore/iochannel.c polypcore/iochannel.h \
-		polypcore/llist.h \
-		polypcore/log.c polypcore/log.h \
-		polypcore/mcalign.c polypcore/mcalign.h \
-		polypcore/memblock.c polypcore/memblock.h \
-		polypcore/memblockq.c polypcore/memblockq.h \
-		polypcore/memchunk.c polypcore/memchunk.h \
-		polypcore/native-common.h \
-		polypcore/packet.c polypcore/packet.h \
-		polypcore/parseaddr.c polypcore/parseaddr.h \
-		polypcore/pdispatch.c polypcore/pdispatch.h \
-		polypcore/pipe.c polypcore/pipe.h \
-		polypcore/poll.c polypcore/poll.h \
-		polypcore/pstream.c polypcore/pstream.h \
-		polypcore/pstream-util.c polypcore/pstream-util.h \
-		polypcore/queue.c polypcore/queue.h \
-		polypcore/random.c polypcore/random.h \
-		polypcore/socket-client.c polypcore/socket-client.h \
-		polypcore/socket-util.c polypcore/socket-util.h \
-		polypcore/strbuf.c polypcore/strbuf.h \
-		polypcore/strlist.c polypcore/strlist.h \
-		polypcore/tagstruct.c polypcore/tagstruct.h \
-		polypcore/core-error.c polypcore/core-error.h \
-		polypcore/winsock.h
+libpulse_la_SOURCES = \
+		pulse/cdecl.h \
+		pulse/channelmap.c pulse/channelmap.h \
+		pulse/client-conf.c pulse/client-conf.h \
+		pulse/context.c pulse/context.h \
+		pulse/def.h \
+		pulse/error.c pulse/error.h \
+		pulse/internal.h \
+		pulse/introspect.c pulse/introspect.h \
+		pulse/mainloop.c pulse/mainloop.h \
+		pulse/mainloop-api.c pulse/mainloop-api.h \
+		pulse/mainloop-signal.c pulse/mainloop-signal.h \
+		pulse/operation.c pulse/operation.h \
+		pulse/pulseaudio.h \
+		pulse/sample.c pulse/sample.h \
+		pulse/scache.c pulse/scache.h \
+		pulse/stream.c pulse/stream.h \
+		pulse/subscribe.c pulse/subscribe.h \
+		pulse/thread-mainloop.c pulse/thread-mainloop.h \
+		pulse/timeval.c pulse/timeval.h \
+		pulse/utf8.c pulse/utf8.h \
+		pulse/util.c pulse/util.h \
+		pulse/volume.c pulse/volume.h \
+		pulse/xmalloc.c pulse/xmalloc.h
+
+# Internal stuff that is shared with libpulsecore
+libpulse_la_SOURCES += \
+		pulsecore/authkey.c pulsecore/authkey.h \
+		pulsecore/conf-parser.c pulsecore/conf-parser.h \
+		pulsecore/core-util.c pulsecore/core-util.h \
+		pulsecore/dynarray.c pulsecore/dynarray.h \
+		pulsecore/gccmacro.h \
+		pulsecore/hashmap.c pulsecore/hashmap.h \
+		pulsecore/idxset.c pulsecore/idxset.h \
+		pulsecore/inet_ntop.c pulsecore/inet_ntop.h \
+		pulsecore/iochannel.c pulsecore/iochannel.h \
+		pulsecore/llist.h \
+		pulsecore/log.c pulsecore/log.h \
+		pulsecore/mcalign.c pulsecore/mcalign.h \
+		pulsecore/memblock.c pulsecore/memblock.h \
+		pulsecore/memblockq.c pulsecore/memblockq.h \
+		pulsecore/memchunk.c pulsecore/memchunk.h \
+		pulsecore/native-common.h \
+		pulsecore/packet.c pulsecore/packet.h \
+		pulsecore/parseaddr.c pulsecore/parseaddr.h \
+		pulsecore/pdispatch.c pulsecore/pdispatch.h \
+		pulsecore/pipe.c pulsecore/pipe.h \
+		pulsecore/poll.c pulsecore/poll.h \
+		pulsecore/pstream.c pulsecore/pstream.h \
+		pulsecore/pstream-util.c pulsecore/pstream-util.h \
+		pulsecore/queue.c pulsecore/queue.h \
+		pulsecore/random.c pulsecore/random.h \
+		pulsecore/socket-client.c pulsecore/socket-client.h \
+		pulsecore/socket-util.c pulsecore/socket-util.h \
+		pulsecore/strbuf.c pulsecore/strbuf.h \
+		pulsecore/strlist.c pulsecore/strlist.h \
+		pulsecore/tagstruct.c pulsecore/tagstruct.h \
+		pulsecore/core-error.c pulsecore/core-error.h \
+		pulsecore/winsock.h
 
 if OS_IS_WIN32
-libpolyp_la_SOURCES += \
-		polypcore/dllmain.c 
+libpulse_la_SOURCES += \
+		pulsecore/dllmain.c 
 endif
 
 if HAVE_X11
-libpolyp_la_SOURCES += \
-		polyp/client-conf-x11.c polyp/client-conf-x11.h \
-		polypcore/x11prop.c polypcore/x11prop.h
+libpulse_la_SOURCES += \
+		pulse/client-conf-x11.c pulse/client-conf-x11.h \
+		pulsecore/x11prop.c pulsecore/x11prop.h
 endif
 
-libpolyp_la_CFLAGS = $(AM_CFLAGS)
-libpolyp_la_LDFLAGS = -version-info $(LIBPOLYP_VERSION_INFO)
-libpolyp_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
+libpulse_la_CFLAGS = $(AM_CFLAGS)
+libpulse_la_LDFLAGS = -version-info $(LIBPOLYP_VERSION_INFO)
+libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
 
 if HAVE_X11
-libpolyp_la_CFLAGS += $(X_CFLAGS)
-libpolyp_la_LDFLAGS += $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
+libpulse_la_CFLAGS += $(X_CFLAGS)
+libpulse_la_LDFLAGS += $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
 endif
 
 if HAVE_LIBASYNCNS
-libpolyp_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
-libpolyp_la_LIBADD += $(LIBASYNCNS_LIBS)
+libpulse_la_CFLAGS += $(LIBASYNCNS_CFLAGS)
+libpulse_la_LIBADD += $(LIBASYNCNS_LIBS)
 endif
 
-libpolyp_simple_la_SOURCES = polyp/simple.c polyp/simple.h 
-libpolyp_simple_la_CFLAGS = $(AM_CFLAGS)
-libpolyp_simple_la_LIBADD = $(AM_LIBADD) libpolyp.la
-libpolyp_simple_la_LDFLAGS = -version-info $(LIBPOLYP_SIMPLE_VERSION_INFO)
+libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h 
+libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
+libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la
+libpulse_simple_la_LDFLAGS = -version-info $(LIBPOLYP_SIMPLE_VERSION_INFO)
 
-libpolyp_browse_la_SOURCES = polyp/browser.c polyp/browser.h 
-libpolyp_browse_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
-libpolyp_browse_la_LIBADD = $(AM_LIBADD) libpolyp.la $(HOWL_LIBS)
-libpolyp_browse_la_LDFLAGS = -version-info $(LIBPOLYP_BROWSE_VERSION_INFO)
+libpulse_browse_la_SOURCES = pulse/browser.c pulse/browser.h 
+libpulse_browse_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
+libpulse_browse_la_LIBADD = $(AM_LIBADD) libpulse.la $(HOWL_LIBS)
+libpulse_browse_la_LDFLAGS = -version-info $(LIBPOLYP_BROWSE_VERSION_INFO)
 
-libpolyp_mainloop_glib_la_SOURCES = polyp/glib-mainloop.h polyp/glib-mainloop.c
-libpolyp_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
-libpolyp_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpolyp.la $(GLIB20_LIBS)
-libpolyp_mainloop_glib_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
+libpulse_mainloop_glib_la_SOURCES = pulse/glib-mainloop.h pulse/glib-mainloop.c
+libpulse_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+libpulse_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB20_LIBS)
+libpulse_mainloop_glib_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
 
-libpolyp_mainloop_glib12_la_SOURCES = polyp/glib-mainloop.h polyp/glib12-mainloop.c
-libpolyp_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
-libpolyp_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpolyp.la $(GLIB12_LIBS)
-libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
+libpulse_mainloop_glib12_la_SOURCES = pulse/glib-mainloop.h pulse/glib12-mainloop.c
+libpulse_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
+libpulse_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB12_LIBS)
+libpulse_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
 
 ###################################
 #         OSS emulation           #
@@ -465,164 +465,164 @@ libpolyp_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VER
 
 if HAVE_OSS
 
-lib_LTLIBRARIES += libpolypdsp.la
+lib_LTLIBRARIES += libpulsedsp.la
 
 bin_SCRIPTS += utils/padsp
 
 endif
 
-libpolypdsp_la_SOURCES = utils/padsp.c
-libpolypdsp_la_CFLAGS = $(AM_CFLAGS)
-libpolypdsp_la_LIBADD = $(AM_LIBADD) libpolyp.la
-libpolypdsp_la_LDFLAGS = -avoid-version
+libpulsedsp_la_SOURCES = utils/padsp.c
+libpulsedsp_la_CFLAGS = $(AM_CFLAGS)
+libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la
+libpulsedsp_la_LDFLAGS = -avoid-version
 
 ###################################
 #      Daemon core library        #
 ###################################
 
-polypcoreinclude_HEADERS = \
-		polypcore/autoload.h \
-		polypcore/cli-command.h \
-		polypcore/cli-text.h \
-		polypcore/client.h \
-		polypcore/core.h \
-		polypcore/core-def.h \
-		polypcore/core-scache.h \
-		polypcore/core-subscribe.h \
-		polypcore/conf-parser.h \
-		polypcore/core-util.h \
-		polypcore/dynarray.h \
-		polypcore/g711.h \
-		polypcore/hashmap.h \
-		polypcore/idxset.h \
-		polypcore/log.h \
-		polypcore/mcalign.h \
-		polypcore/memblock.h \
-		polypcore/memblockq.h \
-		polypcore/memchunk.h \
-		polypcore/modargs.h \
-		polypcore/modinfo.h \
-		polypcore/module.h \
-		polypcore/namereg.h \
-		polypcore/pid.h \
-		polypcore/play-memchunk.h \
-		polypcore/props.h \
-		polypcore/queue.h \
-		polypcore/random.h \
-		polypcore/resampler.h \
-		polypcore/sample-util.h \
-		polypcore/sconv.h \
-		polypcore/sink.h \
-		polypcore/sink-input.h \
-		polypcore/sioman.h \
-		polypcore/sound-file.h \
-		polypcore/sound-file-stream.h \
-		polypcore/source.h \
-		polypcore/source-output.h \
-		polypcore/strbuf.h \
-		polypcore/tokenizer.h
-
-lib_LTLIBRARIES += libpolypcore.la
+pulsecoreinclude_HEADERS = \
+		pulsecore/autoload.h \
+		pulsecore/cli-command.h \
+		pulsecore/cli-text.h \
+		pulsecore/client.h \
+		pulsecore/core.h \
+		pulsecore/core-def.h \
+		pulsecore/core-scache.h \
+		pulsecore/core-subscribe.h \
+		pulsecore/conf-parser.h \
+		pulsecore/core-util.h \
+		pulsecore/dynarray.h \
+		pulsecore/g711.h \
+		pulsecore/hashmap.h \
+		pulsecore/idxset.h \
+		pulsecore/log.h \
+		pulsecore/mcalign.h \
+		pulsecore/memblock.h \
+		pulsecore/memblockq.h \
+		pulsecore/memchunk.h \
+		pulsecore/modargs.h \
+		pulsecore/modinfo.h \
+		pulsecore/module.h \
+		pulsecore/namereg.h \
+		pulsecore/pid.h \
+		pulsecore/play-memchunk.h \
+		pulsecore/props.h \
+		pulsecore/queue.h \
+		pulsecore/random.h \
+		pulsecore/resampler.h \
+		pulsecore/sample-util.h \
+		pulsecore/sconv.h \
+		pulsecore/sink.h \
+		pulsecore/sink-input.h \
+		pulsecore/sioman.h \
+		pulsecore/sound-file.h \
+		pulsecore/sound-file-stream.h \
+		pulsecore/source.h \
+		pulsecore/source-output.h \
+		pulsecore/strbuf.h \
+		pulsecore/tokenizer.h
+
+lib_LTLIBRARIES += libpulsecore.la
 
 # Some public stuff is used even in the core.
-libpolypcore_la_SOURCES = \
-		polyp/channelmap.c polyp/channelmap.h \
-		polyp/error.c polyp/error.h \
-		polyp/mainloop.c polyp/mainloop.h \
-		polyp/mainloop-api.c polyp/mainloop-api.h \
-		polyp/mainloop-signal.c polyp/mainloop-signal.h \
-		polyp/sample.c polyp/sample.h \
-		polyp/timeval.c polyp/timeval.h \
-		polyp/utf8.c polyp/utf8.h \
-		polyp/util.c polyp/util.h \
-		polyp/volume.c polyp/volume.h \
-		polyp/xmalloc.c polyp/xmalloc.h
-
-# Pure core stuff (some are shared in libpolyp though).
-libpolypcore_la_SOURCES += \
-		polypcore/autoload.c polypcore/autoload.h \
-		polypcore/cli-command.c polypcore/cli-command.h \
-		polypcore/cli-text.c polypcore/cli-text.h \
-		polypcore/client.c polypcore/client.h \
-		polypcore/conf-parser.c polypcore/conf-parser.h \
-		polypcore/core.c polypcore/core.h \
-		polypcore/core-scache.c polypcore/core-scache.h \
-		polypcore/core-subscribe.c polypcore/core-subscribe.h \
-		polypcore/core-util.c polypcore/core-util.h \
-		polypcore/dynarray.c polypcore/dynarray.h \
-		polypcore/endianmacros.h \
-		polypcore/g711.c polypcore/g711.h \
-		polypcore/hashmap.c polypcore/hashmap.h \
-		polypcore/idxset.c polypcore/idxset.h \
-		polypcore/log.c polypcore/log.h \
-		polypcore/mcalign.c polypcore/mcalign.h \
-		polypcore/memblock.c polypcore/memblock.h \
-		polypcore/memblockq.c polypcore/memblockq.h \
-		polypcore/memchunk.c polypcore/memchunk.h \
-		polypcore/modargs.c polypcore/modargs.h \
-		polypcore/modinfo.c polypcore/modinfo.h \
-		polypcore/module.c polypcore/module.h \
-		polypcore/namereg.c polypcore/namereg.h \
-		polypcore/pid.c polypcore/pid.h \
-		polypcore/pipe.c polypcore/pipe.h \
-		polypcore/play-memchunk.c polypcore/play-memchunk.h \
-		polypcore/poll.c polypcore/poll.h \
-		polypcore/props.c polypcore/props.h \
-		polypcore/queue.c polypcore/queue.h \
-		polypcore/random.c polypcore/random.h \
-		polypcore/resampler.c polypcore/resampler.h \
-		polypcore/sample-util.c polypcore/sample-util.h \
-		polypcore/sconv.c polypcore/sconv.h \
-		polypcore/sconv-s16be.c polypcore/sconv-s16be.h \
-		polypcore/sconv-s16le.c polypcore/sconv-s16le.h \
-		polypcore/sink.c polypcore/sink.h \
-		polypcore/sink-input.c polypcore/sink-input.h \
-		polypcore/sioman.c polypcore/sioman.h \
-		polypcore/sound-file.c polypcore/sound-file.h \
-		polypcore/sound-file-stream.c polypcore/sound-file-stream.h \
-		polypcore/source.c polypcore/source.h \
-		polypcore/source-output.c polypcore/source-output.h \
-		polypcore/strbuf.c polypcore/strbuf.h \
-		polypcore/tokenizer.c polypcore/tokenizer.h \
-		polypcore/winsock.h \
-		polypcore/core-error.c polypcore/core-error.h
+libpulsecore_la_SOURCES = \
+		pulse/channelmap.c pulse/channelmap.h \
+		pulse/error.c pulse/error.h \
+		pulse/mainloop.c pulse/mainloop.h \
+		pulse/mainloop-api.c pulse/mainloop-api.h \
+		pulse/mainloop-signal.c pulse/mainloop-signal.h \
+		pulse/sample.c pulse/sample.h \
+		pulse/timeval.c pulse/timeval.h \
+		pulse/utf8.c pulse/utf8.h \
+		pulse/util.c pulse/util.h \
+		pulse/volume.c pulse/volume.h \
+		pulse/xmalloc.c pulse/xmalloc.h
+
+# Pure core stuff (some are shared in libpulse though).
+libpulsecore_la_SOURCES += \
+		pulsecore/autoload.c pulsecore/autoload.h \
+		pulsecore/cli-command.c pulsecore/cli-command.h \
+		pulsecore/cli-text.c pulsecore/cli-text.h \
+		pulsecore/client.c pulsecore/client.h \
+		pulsecore/conf-parser.c pulsecore/conf-parser.h \
+		pulsecore/core.c pulsecore/core.h \
+		pulsecore/core-scache.c pulsecore/core-scache.h \
+		pulsecore/core-subscribe.c pulsecore/core-subscribe.h \
+		pulsecore/core-util.c pulsecore/core-util.h \
+		pulsecore/dynarray.c pulsecore/dynarray.h \
+		pulsecore/endianmacros.h \
+		pulsecore/g711.c pulsecore/g711.h \
+		pulsecore/hashmap.c pulsecore/hashmap.h \
+		pulsecore/idxset.c pulsecore/idxset.h \
+		pulsecore/log.c pulsecore/log.h \
+		pulsecore/mcalign.c pulsecore/mcalign.h \
+		pulsecore/memblock.c pulsecore/memblock.h \
+		pulsecore/memblockq.c pulsecore/memblockq.h \
+		pulsecore/memchunk.c pulsecore/memchunk.h \
+		pulsecore/modargs.c pulsecore/modargs.h \
+		pulsecore/modinfo.c pulsecore/modinfo.h \
+		pulsecore/module.c pulsecore/module.h \
+		pulsecore/namereg.c pulsecore/namereg.h \
+		pulsecore/pid.c pulsecore/pid.h \
+		pulsecore/pipe.c pulsecore/pipe.h \
+		pulsecore/play-memchunk.c pulsecore/play-memchunk.h \
+		pulsecore/poll.c pulsecore/poll.h \
+		pulsecore/props.c pulsecore/props.h \
+		pulsecore/queue.c pulsecore/queue.h \
+		pulsecore/random.c pulsecore/random.h \
+		pulsecore/resampler.c pulsecore/resampler.h \
+		pulsecore/sample-util.c pulsecore/sample-util.h \
+		pulsecore/sconv.c pulsecore/sconv.h \
+		pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \
+		pulsecore/sconv-s16le.c pulsecore/sconv-s16le.h \
+		pulsecore/sink.c pulsecore/sink.h \
+		pulsecore/sink-input.c pulsecore/sink-input.h \
+		pulsecore/sioman.c pulsecore/sioman.h \
+		pulsecore/sound-file.c pulsecore/sound-file.h \
+		pulsecore/sound-file-stream.c pulsecore/sound-file-stream.h \
+		pulsecore/source.c pulsecore/source.h \
+		pulsecore/source-output.c pulsecore/source-output.h \
+		pulsecore/strbuf.c pulsecore/strbuf.h \
+		pulsecore/tokenizer.c pulsecore/tokenizer.h \
+		pulsecore/winsock.h \
+		pulsecore/core-error.c pulsecore/core-error.h
 
 if OS_IS_WIN32
-libpolypcore_la_SOURCES += \
-		polypcore/dllmain.c 
+libpulsecore_la_SOURCES += \
+		pulsecore/dllmain.c 
 endif
 
-libpolypcore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
-libpolypcore_la_LDFLAGS = -version-info $(LIBPOLYPCORE_VERSION_INFO)
-libpolypcore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV)
+libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
+libpulsecore_la_LDFLAGS = -version-info $(LIBPOLYPCORE_VERSION_INFO)
+libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV)
 
 ###################################
 #   Plug-in support libraries     #
 ###################################
 
-polypcoreinclude_HEADERS += \
-		polypcore/socket-util.h \
-		polypcore/iochannel.h \
-		polypcore/socket-server.h \
-		polypcore/socket-client.h \
-		polypcore/parseaddr.h \
-		polypcore/packet.h \
-		polypcore/pstream.h \
-		polypcore/ioline.h \
-		polypcore/cli.h \
-		polypcore/protocol-cli.h \
-		polypcore/tagstruct.h \
-		polypcore/pstream-util.h \
-		polypcore/pdispatch.h \
-		polypcore/authkey.h \
-		polypcore/authkey-prop.h \
-		polypcore/strlist.h \
-		polypcore/protocol-simple.h \
-		polypcore/esound.h \
-		polypcore/protocol-esound.h \
-		polypcore/native-common.h \
-		polypcore/protocol-native.h \
-		polypcore/protocol-http.h
+pulsecoreinclude_HEADERS += \
+		pulsecore/socket-util.h \
+		pulsecore/iochannel.h \
+		pulsecore/socket-server.h \
+		pulsecore/socket-client.h \
+		pulsecore/parseaddr.h \
+		pulsecore/packet.h \
+		pulsecore/pstream.h \
+		pulsecore/ioline.h \
+		pulsecore/cli.h \
+		pulsecore/protocol-cli.h \
+		pulsecore/tagstruct.h \
+		pulsecore/pstream-util.h \
+		pulsecore/pdispatch.h \
+		pulsecore/authkey.h \
+		pulsecore/authkey-prop.h \
+		pulsecore/strlist.h \
+		pulsecore/protocol-simple.h \
+		pulsecore/esound.h \
+		pulsecore/protocol-esound.h \
+		pulsecore/native-common.h \
+		pulsecore/protocol-native.h \
+		pulsecore/protocol-http.h
 
 ### Warning! Due to an obscure bug in libtool/automake it is required
 ### that the libraries in modlibexec_LTLIBRARIES are specified in-order,
@@ -658,114 +658,114 @@ modlibexec_LTLIBRARIES += \
 endif
 
 if HAVE_X11
-polypcoreinclude_HEADERS += \
-		polypcore/x11wrap.h \
-		polypcore/x11prop.h
+pulsecoreinclude_HEADERS += \
+		pulsecore/x11wrap.h \
+		pulsecore/x11prop.h
 
 modlibexec_LTLIBRARIES += \
 		libx11wrap.la \
 		libx11prop.la
 endif
 
-libprotocol_simple_la_SOURCES = polypcore/protocol-simple.c polypcore/protocol-simple.h
+libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h
 libprotocol_simple_la_LDFLAGS = -avoid-version
-libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-server.la libiochannel.la
+libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-server.la libiochannel.la
 
 libsocket_server_la_SOURCES = \
-		polypcore/inet_ntop.c polypcore/inet_ntop.h \
-		polypcore/inet_pton.c polypcore/inet_pton.h \
-		polypcore/socket-server.c polypcore/socket-server.h
+		pulsecore/inet_ntop.c pulsecore/inet_ntop.h \
+		pulsecore/inet_pton.c pulsecore/inet_pton.h \
+		pulsecore/socket-server.c pulsecore/socket-server.h
 libsocket_server_la_LDFLAGS = -avoid-version
-libsocket_server_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS)
+libsocket_server_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-util.la $(LIBWRAP_LIBS) $(WINSOCK_LIBS)
 
-libsocket_client_la_SOURCES = polypcore/socket-client.c polypcore/socket-client.h
+libsocket_client_la_SOURCES = pulsecore/socket-client.c pulsecore/socket-client.h
 libsocket_client_la_LDFLAGS = -avoid-version
-libsocket_client_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-util.la libparseaddr.la $(LIBASYNCNS_LIBS) $(WINSOCK_LIBS)
+libsocket_client_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-util.la libparseaddr.la $(LIBASYNCNS_LIBS) $(WINSOCK_LIBS)
 libsocket_client_la_CFLAGS = $(AM_CFLAGS) $(LIBASYNCNS_CFLAGS)
 
-libparseaddr_la_SOURCES = polypcore/parseaddr.c polypcore/parseaddr.h
+libparseaddr_la_SOURCES = pulsecore/parseaddr.c pulsecore/parseaddr.h
 libparseaddr_la_LDFLAGS = -avoid-version
-libparseaddr_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+libparseaddr_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
-libpstream_la_SOURCES = polypcore/pstream.c polypcore/pstream.h
+libpstream_la_SOURCES = pulsecore/pstream.c pulsecore/pstream.h
 libpstream_la_LDFLAGS = -avoid-version
-libpstream_la_LIBADD = $(AM_LIBADD) libpolypcore.la libpacket.la libiochannel.la $(WINSOCK_LIBS)
+libpstream_la_LIBADD = $(AM_LIBADD) libpulsecore.la libpacket.la libiochannel.la $(WINSOCK_LIBS)
 
-libpstream_util_la_SOURCES = polypcore/pstream-util.c polypcore/pstream-util.h
+libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h
 libpstream_util_la_LDFLAGS = -avoid-version
 libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
 
-libpdispatch_la_SOURCES = polypcore/pdispatch.c polypcore/pdispatch.h
+libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h
 libpdispatch_la_LDFLAGS = -avoid-version
-libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpolypcore.la
+libpdispatch_la_LIBADD = $(AM_LIBADD) libtagstruct.la libpulsecore.la
 
-libiochannel_la_SOURCES = polypcore/iochannel.c polypcore/iochannel.h
+libiochannel_la_SOURCES = pulsecore/iochannel.c pulsecore/iochannel.h
 libiochannel_la_LDFLAGS = -avoid-version
-libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpolypcore.la $(WINSOCK_LIBS)
+libiochannel_la_LIBADD = $(AM_LIBADD) libsocket-util.la libpulsecore.la $(WINSOCK_LIBS)
 
-libpacket_la_SOURCES = polypcore/packet.c polypcore/packet.h
+libpacket_la_SOURCES = pulsecore/packet.c pulsecore/packet.h
 libpacket_la_LDFLAGS = -avoid-version
-libpacket_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+libpacket_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
-libioline_la_SOURCES = polypcore/ioline.c polypcore/ioline.h
+libioline_la_SOURCES = pulsecore/ioline.c pulsecore/ioline.h
 libioline_la_LDFLAGS = -avoid-version
-libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpolypcore.la
+libioline_la_LIBADD = $(AM_LIBADD) libiochannel.la libpulsecore.la
 
-libcli_la_SOURCES = polypcore/cli.c polypcore/cli.h
+libcli_la_SOURCES = pulsecore/cli.c pulsecore/cli.h
 libcli_la_CPPFLAGS = $(AM_CPPFLAGS)
 libcli_la_LDFLAGS = -avoid-version
-libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpolypcore.la
+libcli_la_LIBADD = $(AM_LIBADD) libiochannel.la libioline.la libpulsecore.la
 
-libstrlist_la_SOURCES = polypcore/strlist.c polypcore/strlist.h
+libstrlist_la_SOURCES = pulsecore/strlist.c pulsecore/strlist.h
 libstrlist_la_LDFLAGS = -avoid-version
-libstrlist_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+libstrlist_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
-libprotocol_cli_la_SOURCES = polypcore/protocol-cli.c polypcore/protocol-cli.h
+libprotocol_cli_la_SOURCES = pulsecore/protocol-cli.c pulsecore/protocol-cli.h
 libprotocol_cli_la_LDFLAGS = -avoid-version
-libprotocol_cli_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libcli.la libpolypcore.la
+libprotocol_cli_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libcli.la libpulsecore.la
 
-libprotocol_http_la_SOURCES = polypcore/protocol-http.c polypcore/protocol-http.h
+libprotocol_http_la_SOURCES = pulsecore/protocol-http.c pulsecore/protocol-http.h
 libprotocol_http_la_LDFLAGS = -avoid-version
-libprotocol_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpolypcore.la libiochannel.la
+libprotocol_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpulsecore.la libiochannel.la
 
-libprotocol_native_la_SOURCES = polypcore/protocol-native.c polypcore/protocol-native.h polypcore/native-common.h
+libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h
 libprotocol_native_la_LDFLAGS = -avoid-version
-libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libstrlist.la libpolypcore.la libiochannel.la
+libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libstrlist.la libpulsecore.la libiochannel.la
 
-libtagstruct_la_SOURCES = polypcore/tagstruct.c polypcore/tagstruct.h
+libtagstruct_la_SOURCES = pulsecore/tagstruct.c pulsecore/tagstruct.h
 libtagstruct_la_LDFLAGS = -avoid-version
-libtagstruct_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(WINSOCK_LIBS)
+libtagstruct_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(WINSOCK_LIBS)
 
-libprotocol_esound_la_SOURCES = polypcore/protocol-esound.c polypcore/protocol-esound.h polypcore/esound.h
+libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h
 libprotocol_esound_la_LDFLAGS = -avoid-version
-libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpolypcore.la
+libprotocol_esound_la_LIBADD = $(AM_LIBADD) libsocket-server.la libiochannel.la libauthkey.la libpulsecore.la
 
-libauthkey_la_SOURCES = polypcore/authkey.c polypcore/authkey.h
+libauthkey_la_SOURCES = pulsecore/authkey.c pulsecore/authkey.h
 libauthkey_la_LDFLAGS = -avoid-version
-libauthkey_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+libauthkey_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
-libauthkey_prop_la_SOURCES = polypcore/authkey-prop.c polypcore/authkey-prop.h
+libauthkey_prop_la_SOURCES = pulsecore/authkey-prop.c pulsecore/authkey-prop.h
 libauthkey_prop_la_LDFLAGS = -avoid-version
-libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 libsocket_util_la_SOURCES = \
-		polypcore/inet_ntop.c polypcor/inet_ntop.h \
-		polypcore/socket-util.c polypcore/socket-util.h
+		pulsecore/inet_ntop.c pulsecor/inet_ntop.h \
+		pulsecore/socket-util.c pulsecore/socket-util.h
 libsocket_util_la_LDFLAGS = -avoid-version
-libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) libpolypcore.la
+libsocket_util_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) libpulsecore.la
 
 librtp_la_SOURCES = modules/rtp/rtp.c modules/rtp/rtp.h modules/rtp/sdp.c modules/rtp/sdp.h modules/rtp/sap.c modules/rtp/sap.h 
 librtp_la_LDFLAGS = -avoid-version
-librtp_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+librtp_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 # X11
 
-libx11wrap_la_SOURCES = polypcore/x11wrap.c polypcore/x11wrap.h
+libx11wrap_la_SOURCES = pulsecore/x11wrap.c pulsecore/x11wrap.h
 libx11wrap_la_LDFLAGS = -avoid-version
 libx11wrap_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
-libx11wrap_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libpolypcore.la
+libx11wrap_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libpulsecore.la
 
-libx11prop_la_SOURCES = polypcore/x11prop.c polypcore/x11prop.h
+libx11prop_la_SOURCES = pulsecore/x11prop.c pulsecore/x11prop.h
 libx11prop_la_LDFLAGS = -avoid-version
 libx11prop_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
 libx11prop_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS)
@@ -932,127 +932,127 @@ $(SYMDEF_FILES): modules/module-defs.h.m4
 module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_simple_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
 module_simple_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_simple_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la
+module_simple_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-simple.la libsocket-server.la
 
 module_simple_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_simple_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_SIMPLE $(AM_CFLAGS)
 module_simple_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_simple_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-simple.la libsocket-server.la libsocket-util.la
+module_simple_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-simple.la libsocket-server.la libsocket-util.la
 
 # CLI protocol
 
 module_cli_la_SOURCES = modules/module-cli.c
 module_cli_la_LDFLAGS = -module -avoid-version
-module_cli_la_LIBADD = $(AM_LIBADD) libcli.la libiochannel.la libpolypcore.la
+module_cli_la_LIBADD = $(AM_LIBADD) libcli.la libiochannel.la libpulsecore.la
 
 module_cli_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_cli_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
 module_cli_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_cli_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la
+module_cli_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-cli.la libsocket-server.la
 
 module_cli_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_cli_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_CLI $(AM_CFLAGS)
 module_cli_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_cli_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-cli.la libsocket-server.la libsocket-util.la
+module_cli_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-cli.la libsocket-server.la libsocket-util.la
 
 # HTTP protocol
 
 module_http_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_http_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
 module_http_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_http_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la
+module_http_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-http.la libsocket-server.la
 
 module_http_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_http_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_HTTP $(AM_CFLAGS)
 module_http_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-http.la libsocket-server.la libsocket-util.la
+module_http_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-http.la libsocket-server.la libsocket-util.la
 
 # Native protocol
 
 module_native_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_native_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
 module_native_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_native_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la
+module_native_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-native.la libsocket-server.la
 
 module_native_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_native_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_NATIVE $(AM_CFLAGS)
 module_native_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_native_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la
+module_native_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-native.la libsocket-server.la libsocket-util.la
 
 module_native_protocol_fd_la_SOURCES = modules/module-native-protocol-fd.c
 module_native_protocol_fd_la_CFLAGS = $(AM_CFLAGS)
 module_native_protocol_fd_la_LDFLAGS = -module -avoid-version
-module_native_protocol_fd_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-native.la libsocket-server.la libsocket-util.la libiochannel.la
+module_native_protocol_fd_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-native.la libsocket-server.la libsocket-util.la libiochannel.la
 
 # EsounD protocol
 
 module_esound_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c
 module_esound_protocol_tcp_la_CFLAGS = -DUSE_TCP_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
 module_esound_protocol_tcp_la_LDFLAGS = -module -avoid-version
-module_esound_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la
+module_esound_protocol_tcp_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-esound.la libsocket-server.la
 
 module_esound_protocol_unix_la_SOURCES = modules/module-protocol-stub.c
 module_esound_protocol_unix_la_CFLAGS = -DUSE_UNIX_SOCKETS -DUSE_PROTOCOL_ESOUND $(AM_CFLAGS)
 module_esound_protocol_unix_la_LDFLAGS = -module -avoid-version
-module_esound_protocol_unix_la_LIBADD = $(AM_LIBADD) libpolypcore.la libprotocol-esound.la libsocket-server.la libsocket-util.la
+module_esound_protocol_unix_la_LIBADD = $(AM_LIBADD) libpulsecore.la libprotocol-esound.la libsocket-server.la libsocket-util.la
 
 module_esound_compat_spawnfd_la_SOURCES = modules/module-esound-compat-spawnfd.c
 module_esound_compat_spawnfd_la_LDFLAGS = -module -avoid-version
-module_esound_compat_spawnfd_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_esound_compat_spawnfd_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_esound_compat_spawnpid_la_SOURCES = modules/module-esound-compat-spawnpid.c
 module_esound_compat_spawnpid_la_LDFLAGS = -module -avoid-version
-module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_esound_compat_spawnpid_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_esound_sink_la_SOURCES = modules/module-esound-sink.c
 module_esound_sink_la_LDFLAGS = -module -avoid-version
-module_esound_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la libsocket-client.la libauthkey.la
+module_esound_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la libsocket-client.la libauthkey.la
 
 # Pipes
 
 module_pipe_sink_la_SOURCES = modules/module-pipe-sink.c
 module_pipe_sink_la_LDFLAGS = -module -avoid-version
-module_pipe_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la
+module_pipe_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la
 
 module_pipe_source_la_SOURCES = modules/module-pipe-source.c
 module_pipe_source_la_LDFLAGS = -module -avoid-version
-module_pipe_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libiochannel.la
+module_pipe_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la
 
 # Fake sources/sinks
 
 module_sine_la_SOURCES = modules/module-sine.c
 module_sine_la_LDFLAGS = -module -avoid-version
-module_sine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_sine_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_null_sink_la_SOURCES = modules/module-null-sink.c
 module_null_sink_la_LDFLAGS = -module -avoid-version
-module_null_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_null_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 # Couplings
 
 module_combine_la_SOURCES = modules/module-combine.c
 module_combine_la_LDFLAGS = -module -avoid-version
-module_combine_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_combine_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_match_la_SOURCES = modules/module-match.c
 module_match_la_LDFLAGS = -module -avoid-version
-module_match_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_match_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 
 module_tunnel_sink_la_SOURCES = modules/module-tunnel.c
 module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS)
 module_tunnel_sink_la_LDFLAGS = -module -avoid-version
-module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
+module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
 
 module_tunnel_source_la_SOURCES = modules/module-tunnel.c
 module_tunnel_source_la_LDFLAGS = -module -avoid-version
-module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
+module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la
 
 # X11
 
 module_x11_bell_la_SOURCES = modules/module-x11-bell.c
 module_x11_bell_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
 module_x11_bell_la_LDFLAGS = -module -avoid-version
-module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libpolypcore.la
+module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libpulsecore.la
 
 module_x11_publish_la_SOURCES = modules/module-x11-publish.c
 module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS)
@@ -1063,7 +1063,7 @@ module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EX
 
 liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h
 liboss_util_la_LDFLAGS = -avoid-version
-liboss_util_la_LIBADD = libpolypcore.la
+liboss_util_la_LIBADD = libpulsecore.la
 
 module_oss_la_SOURCES = modules/module-oss.c
 module_oss_la_LDFLAGS = -module -avoid-version
@@ -1071,23 +1071,23 @@ module_oss_la_LIBADD = $(AM_LIBADD) libiochannel.la liboss-util.la
 
 module_oss_mmap_la_SOURCES = modules/module-oss-mmap.c
 module_oss_mmap_la_LDFLAGS = -module -avoid-version
-module_oss_mmap_la_LIBADD = $(AM_LIBADD) liboss-util.la libpolypcore.la
+module_oss_mmap_la_LIBADD = $(AM_LIBADD) liboss-util.la libpulsecore.la
 
 # ALSA
 
 libalsa_util_la_SOURCES = modules/alsa-util.c modules/alsa-util.h
 libalsa_util_la_LDFLAGS = -avoid-version
-libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpolypcore.la
+libalsa_util_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libpulsecore.la
 libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
 module_alsa_sink_la_SOURCES = modules/module-alsa-sink.c
 module_alsa_sink_la_LDFLAGS = -module -avoid-version
-module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpolypcore.la
+module_alsa_sink_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore.la
 module_alsa_sink_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
 module_alsa_source_la_SOURCES = modules/module-alsa-source.c
 module_alsa_source_la_LDFLAGS = -module -avoid-version
-module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpolypcore.la
+module_alsa_source_la_LIBADD = $(AM_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la libpulsecore.la
 module_alsa_source_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS)
 
 # Solaris
@@ -1100,75 +1100,75 @@ module_solaris_la_LIBADD = $(AM_LIBADD) libiochannel.la
 
 libhowl_wrap_la_SOURCES = modules/howl-wrap.c modules/howl-wrap.h
 libhowl_wrap_la_LDFLAGS = -avoid-version
-libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libpolypcore.la
+libhowl_wrap_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libpulsecore.la
 libhowl_wrap_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
 
 module_zeroconf_publish_la_SOURCES = modules/module-zeroconf-publish.c
 module_zeroconf_publish_la_LDFLAGS = -module -avoid-version
-module_zeroconf_publish_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libhowl-wrap.la libpolypcore.la
+module_zeroconf_publish_la_LIBADD = $(AM_LIBADD) $(HOWL_LIBS) libhowl-wrap.la libpulsecore.la
 module_zeroconf_publish_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
 
 # LIRC
 
 module_lirc_la_SOURCES = modules/module-lirc.c
 module_lirc_la_LDFLAGS = -module -avoid-version
-module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS) libpolypcore.la
+module_lirc_la_LIBADD = $(AM_LIBADD) $(LIRC_LIBS) libpulsecore.la
 module_lirc_la_CFLAGS = $(AM_CFLAGS) $(LIRC_CFLAGS)
 
 # Linux evdev
 
 module_mmkbd_evdev_la_SOURCES = modules/module-mmkbd-evdev.c
 module_mmkbd_evdev_la_LDFLAGS = -module -avoid-version
-module_mmkbd_evdev_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_mmkbd_evdev_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 module_mmkbd_evdev_la_CFLAGS = $(AM_CFLAGS)
 
 # Windows waveout
 
 module_waveout_la_SOURCES = modules/module-waveout.c
 module_waveout_la_LDFLAGS = -module -avoid-version
-module_waveout_la_LIBADD = $(AM_LIBADD) libpolypcore.la -lwinmm
+module_waveout_la_LIBADD = $(AM_LIBADD) libpulsecore.la -lwinmm
 module_waveout_la_CFLAGS = $(AM_CFLAGS)
 
 # Hardware autodetection module
 module_detect_la_SOURCES = modules/module-detect.c
 module_detect_la_LDFLAGS = -module -avoid-version
-module_detect_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_detect_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 module_detect_la_CFLAGS = $(AM_CFLAGS)
 
 # Volume restore module
 module_volume_restore_la_SOURCES = modules/module-volume-restore.c
 module_volume_restore_la_LDFLAGS = -module -avoid-version
-module_volume_restore_la_LIBADD = $(AM_LIBADD) libpolypcore.la
+module_volume_restore_la_LIBADD = $(AM_LIBADD) libpulsecore.la
 module_volume_restore_la_CFLAGS = $(AM_CFLAGS)
 
 # RTP modules
 module_rtp_send_la_SOURCES = modules/rtp/module-rtp-send.c
 module_rtp_send_la_LDFLAGS = -module -avoid-version
-module_rtp_send_la_LIBADD = $(AM_LIBADD) libpolypcore.la librtp.la
+module_rtp_send_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la
 module_rtp_send_la_CFLAGS = $(AM_CFLAGS)
 
 module_rtp_recv_la_SOURCES = modules/rtp/module-rtp-recv.c
 module_rtp_recv_la_LDFLAGS = -module -avoid-version
-module_rtp_recv_la_LIBADD = $(AM_LIBADD) libpolypcore.la librtp.la
+module_rtp_recv_la_LIBADD = $(AM_LIBADD) libpulsecore.la librtp.la
 module_rtp_recv_la_CFLAGS = $(AM_CFLAGS)
 
 # JACK
 
 module_jack_sink_la_SOURCES = modules/module-jack-sink.c
 module_jack_sink_la_LDFLAGS = -module -avoid-version
-module_jack_sink_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(JACK_LIBS)
+module_jack_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(JACK_LIBS)
 module_jack_sink_la_CFLAGS = $(AM_LIBADD) $(JACK_CFLAGS)
 
 module_jack_source_la_SOURCES = modules/module-jack-source.c
 module_jack_source_la_LDFLAGS = -module -avoid-version
-module_jack_source_la_LIBADD = $(AM_LIBADD) libpolypcore.la $(JACK_LIBS)
+module_jack_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(JACK_LIBS)
 module_jack_source_la_CFLAGS = $(AM_LIBADD) $(JACK_CFLAGS)
 
 ###################################
 #        Some minor stuff         #
 ###################################
 
-suid: polypaudio
+suid: pulse
 	chown root $<
 	chmod u+s $<
 
@@ -1179,7 +1179,7 @@ esdcompat: daemon/esdcompat.in Makefile
 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
 
-client.conf: polyp/client.conf.in Makefile
+client.conf: pulse/client.conf.in Makefile
 	sed -e 's,@POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
 
 if OS_IS_WIN32    
@@ -1195,11 +1195,11 @@ daemon.conf: daemon/daemon.conf.in Makefile
 		-e 's,@DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
 
 install-exec-hook:
-	chown root $(DESTDIR)$(bindir)/polypaudio ; true
-	chmod u+s $(DESTDIR)$(bindir)/polypaudio
+	chown root $(DESTDIR)$(bindir)/pulseaudio ; true
+	chmod u+s $(DESTDIR)$(bindir)/pulseaudio
 	ln -sf pacat $(DESTDIR)$(bindir)/parec
 	rm -f $(DESTDIR)$(modlibexecdir)/*.a
-	rm -f $(DESTDIR)$(libdir)/libpolypdsp.a
-	rm -f $(DESTDIR)$(libdir)/libpolypdsp.la
+	rm -f $(DESTDIR)$(libdir)/libpulsedsp.a
+	rm -f $(DESTDIR)$(libdir)/libpulsedsp.la
 
 .PHONY: utils/padsp
diff --git a/src/daemon/Makefile b/src/daemon/Makefile
index cd2a5c9..c110232 120000
--- a/src/daemon/Makefile
+++ b/src/daemon/Makefile
@@ -1 +1 @@
-../polyp/Makefile
\ No newline at end of file
+../pulse/Makefile
\ No newline at end of file
diff --git a/src/daemon/caps.c b/src/daemon/caps.c
index 5e24da8..dc74bc7 100644
--- a/src/daemon/caps.c
+++ b/src/daemon/caps.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,9 +32,9 @@
 #include 
 #endif
 
-#include 
+#include 
 
-#include 
+#include 
 
 #include "caps.h"
 
diff --git a/src/daemon/caps.h b/src/daemon/caps.h
index 3bb861d..8a61828 100644
--- a/src/daemon/caps.h
+++ b/src/daemon/caps.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index b71be2e..a106dc0 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,10 +30,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "cmdline.h"
 
diff --git a/src/daemon/cmdline.h b/src/daemon/cmdline.h
index e2eaf0d..25453e5 100644
--- a/src/daemon/cmdline.h
+++ b/src/daemon/cmdline.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/daemon/cpulimit.c b/src/daemon/cpulimit.c
index d537b9d..a8c9d3f 100644
--- a/src/daemon/cpulimit.c
+++ b/src/daemon/cpulimit.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -23,11 +23,11 @@
 #include 
 #endif
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "cpulimit.h"
 
diff --git a/src/daemon/cpulimit.h b/src/daemon/cpulimit.h
index f3c5534..21bdd17 100644
--- a/src/daemon/cpulimit.h
+++ b/src/daemon/cpulimit.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
-/* This kills the polypaudio process if it eats more than 70% of the
+/* This kills the pulseaudio process if it eats more than 70% of the
  * CPU time. This is build around setrlimit() and SIGXCPU. It is handy
  * in case of using SCHED_FIFO which may freeze the whole machine  */
 
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 2d8d955..fd83f28 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,19 +29,19 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "daemon-conf.h"
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32
-#  define DEFAULT_CONFIG_DIR "/etc/polypaudio"
+#  define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
 # else
 #  define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
 # endif
@@ -54,9 +54,9 @@
 #endif
 
 #define DEFAULT_SCRIPT_FILE DEFAULT_CONFIG_DIR PATH_SEP "default.pa"
-#define DEFAULT_SCRIPT_FILE_USER ".polypaudio" PATH_SEP "default.pa"
+#define DEFAULT_SCRIPT_FILE_USER ".pulseaudio" PATH_SEP "default.pa"
 #define DEFAULT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "daemon.conf"
-#define DEFAULT_CONFIG_FILE_USER ".polypaudio" PATH_SEP "daemon.conf"
+#define DEFAULT_CONFIG_FILE_USER ".pulseaudio" PATH_SEP "daemon.conf"
 
 #define ENV_SCRIPT_FILE "POLYP_SCRIPT"
 #define ENV_CONFIG_FILE "POLYP_CONFIG"
diff --git a/src/daemon/daemon-conf.h b/src/daemon/daemon-conf.h
index d513141..dd5d7fb 100644
--- a/src/daemon/daemon-conf.h
+++ b/src/daemon/daemon-conf.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 /* The actual command to execute */
 typedef enum pa_daemon_conf_cmd {
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index d537301..30bf3ca 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -1,23 +1,23 @@
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-## Configuration file for the polypaudio daemon. Default values are
+## Configuration file for the pulseaudio daemon. Default values are
 ## commented out.  Use either ; or # for commenting
 
 # Extra verbositiy
@@ -69,9 +69,9 @@
 ## hand it has the worst quality of all.
 ; resample-method = sinc-fastest
 
-## Create a PID file in /tmp/polypaudio-$USER/pid. Of this is enabled
-## you may use commands like "polypaudio --kill" or "polypaudio
-## --check". If you are planning to start more than one polypaudio
+## Create a PID file in /tmp/pulseaudio-$USER/pid. Of this is enabled
+## you may use commands like "pulseaudio --kill" or "pulseaudio
+## --check". If you are planning to start more than one pulseaudio
 ## process per user, you better disable this option since it
 ## effectively disables multiple instances.
 ; use-pid-file = 1
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index cba0172..623cd11 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -1,20 +1,20 @@
 #!@POLYPAUDIO_BINARY@ -nF 
 
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify it
+# PulseAudio is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with polypaudio; if not, write to the Free Software Foundation,
+# along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 
diff --git a/src/daemon/default.pa.win32 b/src/daemon/default.pa.win32
index 3478ada..d5a1e18 100644
--- a/src/daemon/default.pa.win32
+++ b/src/daemon/default.pa.win32
@@ -1,18 +1,18 @@
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify it
+# PulseAudio is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with polypaudio; if not, write to the Free Software Foundation,
+# along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 
diff --git a/src/daemon/dumpmodules.c b/src/daemon/dumpmodules.c
index d56bb79..06734ea 100644
--- a/src/daemon/dumpmodules.c
+++ b/src/daemon/dumpmodules.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,9 +29,9 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
+#include 
 
 #include "dumpmodules.h"
 
diff --git a/src/daemon/dumpmodules.h b/src/daemon/dumpmodules.h
index 968d2de..05cd86e 100644
--- a/src/daemon/dumpmodules.h
+++ b/src/daemon/dumpmodules.h
@@ -4,20 +4,20 @@
 /* $Id*/
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/daemon/esdcompat.in b/src/daemon/esdcompat.in
index 76023f5..673f8c8 100755
--- a/src/daemon/esdcompat.in
+++ b/src/daemon/esdcompat.in
@@ -2,20 +2,20 @@
 
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 16cc0f5..5e7330a 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -48,24 +48,24 @@
 #include 
 #endif
 
-#include "../polypcore/winsock.h"
+#include "../pulsecore/winsock.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "cmdline.h"
 #include "cpulimit.h"
@@ -199,7 +199,7 @@ int main(int argc, char *argv[]) {
 
     pa_random_seed();
     
-    pa_log_set_ident("polypaudio");
+    pa_log_set_ident("pulseaudio");
     
     conf = pa_daemon_conf_new();
     
diff --git a/src/depmod.py b/src/depmod.py
index 7bb223b..a20bc7c 100755
--- a/src/depmod.py
+++ b/src/depmod.py
@@ -1,20 +1,20 @@
 #!/usr/bin/python
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
diff --git a/src/modules/Makefile b/src/modules/Makefile
index cd2a5c9..c110232 120000
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -1 +1 @@
-../polyp/Makefile
\ No newline at end of file
+../pulse/Makefile
\ No newline at end of file
diff --git a/src/modules/alsa-util.c b/src/modules/alsa-util.c
index fafcac4..04a2d84 100644
--- a/src/modules/alsa-util.c
+++ b/src/modules/alsa-util.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
+#include 
 
 #include "alsa-util.h"
 
diff --git a/src/modules/alsa-util.h b/src/modules/alsa-util.h
index 83d1481..215844b 100644
--- a/src/modules/alsa-util.h
+++ b/src/modules/alsa-util.h
@@ -4,30 +4,30 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
+#include 
 
 struct pa_alsa_fdlist;
 
diff --git a/src/modules/howl-wrap.c b/src/modules/howl-wrap.c
index 467ab9e..e56fca3 100644
--- a/src/modules/howl-wrap.c
+++ b/src/modules/howl-wrap.c
@@ -1,30 +1,30 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "howl-wrap.h"
 
diff --git a/src/modules/howl-wrap.h b/src/modules/howl-wrap.h
index a4b2649..506c0b6 100644
--- a/src/modules/howl-wrap.h
+++ b/src/modules/howl-wrap.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
+#include 
 
 typedef struct pa_howl_wrapper pa_howl_wrapper;
 
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 620047b..d49b340 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,16 +34,16 @@
 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "alsa-util.h"
 #include "module-alsa-sink-symdef.h"
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 0999c65..c4e8689 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,17 +34,17 @@
 
 #include 
 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "alsa-util.h"
 #include "module-alsa-source-symdef.h"
diff --git a/src/modules/module-cli.c b/src/modules/module-cli.c
index ce50a46..2eef5c4 100644
--- a/src/modules/module-cli.c
+++ b/src/modules/module-cli.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,12 +27,12 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-cli-symdef.h"
 
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 037cbaf..4e3dd55 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,18 +26,18 @@
 #include 
 #include 
 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-combine-symdef.h"
 
diff --git a/src/modules/module-defs.h.m4 b/src/modules/module-defs.h.m4
index 8f10d65..c961412 100644
--- a/src/modules/module-defs.h.m4
+++ b/src/modules/module-defs.h.m4
@@ -8,8 +8,8 @@ define(`gen_symbol', `#define $1 'module_name`_LTX_$1')dnl
 #ifndef incmacro
 #define incmacro
 
-#include 
-#include 
+#include 
+#include 
 
 gen_symbol(pa__init)
 gen_symbol(pa__done)
diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c
index 3512e31..3e4d2bf 100644
--- a/src/modules/module-detect.c
+++ b/src/modules/module-detect.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,13 +33,13 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-detect-symdef.h"
 
diff --git a/src/modules/module-esound-compat-spawnfd.c b/src/modules/module-esound-compat-spawnfd.c
index 861e257..c4bc342 100644
--- a/src/modules/module-esound-compat-spawnfd.c
+++ b/src/modules/module-esound-compat-spawnfd.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-esound-compat-spawnfd-symdef.h"
 
diff --git a/src/modules/module-esound-compat-spawnpid.c b/src/modules/module-esound-compat-spawnpid.c
index 7b47bb0..3108baf 100644
--- a/src/modules/module-esound-compat-spawnpid.c
+++ b/src/modules/module-esound-compat-spawnpid.c
@@ -1,19 +1,19 @@
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-esound-compat-spawnpid-symdef.h"
 
diff --git a/src/modules/module-esound-sink.c b/src/modules/module-esound-sink.c
index 53a9411..75a47b0 100644
--- a/src/modules/module-esound-sink.c
+++ b/src/modules/module-esound-sink.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,18 +33,18 @@
 #include 
 #include 
 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-esound-sink-symdef.h"
 
diff --git a/src/modules/module-jack-sink.c b/src/modules/module-jack-sink.c
index fc2bfc4..c6a161f 100644
--- a/src/modules/module-jack-sink.c
+++ b/src/modules/module-jack-sink.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,16 +36,16 @@
 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-jack-sink-symdef.h"
 
@@ -261,7 +261,7 @@ int pa__init(pa_core *c, pa_module*m) {
     }
         
     server_name = pa_modargs_get_value(ma, "server_name", NULL);
-    client_name = pa_modargs_get_value(ma, "client_name", "polypaudio");
+    client_name = pa_modargs_get_value(ma, "client_name", "pulseaudio");
 
     u = pa_xnew0(struct userdata, 1);
     m->userdata = u;
diff --git a/src/modules/module-jack-source.c b/src/modules/module-jack-source.c
index ca9560a..6f31f6c 100644
--- a/src/modules/module-jack-source.c
+++ b/src/modules/module-jack-source.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,16 +36,16 @@
 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-jack-source-symdef.h"
 
@@ -259,7 +259,7 @@ int pa__init(pa_core *c, pa_module*m) {
     }
         
     server_name = pa_modargs_get_value(ma, "server_name", NULL);
-    client_name = pa_modargs_get_value(ma, "client_name", "polypaudio");
+    client_name = pa_modargs_get_value(ma, "client_name", "pulseaudio");
 
     u = pa_xnew0(struct userdata, 1);
     m->userdata = u;
diff --git a/src/modules/module-lirc.c b/src/modules/module-lirc.c
index 009c2e4..a93a3b9 100644
--- a/src/modules/module-lirc.c
+++ b/src/modules/module-lirc.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,13 +30,13 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-lirc-symdef.h"
 
@@ -203,7 +203,7 @@ int pa__init(pa_core *c, pa_module*m) {
     u->lirc_fd = -1;
     u->mute_toggle_save = 0;
 
-    if ((u->lirc_fd = lirc_init((char*) pa_modargs_get_value(ma, "appname", "polypaudio"), 1)) < 0) {
+    if ((u->lirc_fd = lirc_init((char*) pa_modargs_get_value(ma, "appname", "pulseaudio"), 1)) < 0) {
         pa_log(__FILE__": lirc_init() failed.");
         goto fail;
     }
diff --git a/src/modules/module-match.c b/src/modules/module-match.c
index 02d75e7..ddeda73 100644
--- a/src/modules/module-match.c
+++ b/src/modules/module-match.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,16 +32,16 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-match-symdef.h"
 
@@ -53,11 +53,11 @@ PA_MODULE_VERSION(PACKAGE_VERSION)
 #define WHITESPACE "\n\r \t"
 
 #ifndef DEFAULT_CONFIG_DIR
-#define DEFAULT_CONFIG_DIR "/etc/polypaudio"
+#define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
 #endif
 
 #define DEFAULT_MATCH_TABLE_FILE DEFAULT_CONFIG_DIR"/match.table"
-#define DEFAULT_MATCH_TABLE_FILE_USER ".polypaudio/match.table"
+#define DEFAULT_MATCH_TABLE_FILE_USER ".pulseaudio/match.table"
 
 static const char* const valid_modargs[] = {
     "table",
diff --git a/src/modules/module-mmkbd-evdev.c b/src/modules/module-mmkbd-evdev.c
index ee2c6bf..ddbf16d2 100644
--- a/src/modules/module-mmkbd-evdev.c
+++ b/src/modules/module-mmkbd-evdev.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,15 +33,15 @@
 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-mmkbd-evdev-symdef.h"
 
diff --git a/src/modules/module-native-protocol-fd.c b/src/modules/module-native-protocol-fd.c
index e3caf55..9e1cac0 100644
--- a/src/modules/module-native-protocol-fd.c
+++ b/src/modules/module-native-protocol-fd.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,11 +27,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-native-protocol-fd-symdef.h"
 
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index a1555e6..8cfce8f 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,15 +33,15 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-null-sink-symdef.h"
 
diff --git a/src/modules/module-oss-mmap.c b/src/modules/module-oss-mmap.c
index 5cf6228..fcc89c8 100644
--- a/src/modules/module-oss-mmap.c
+++ b/src/modules/module-oss-mmap.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,17 +36,17 @@
 #include 
 #include 
 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "oss-util.h"
 #include "module-oss-mmap-symdef.h"
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 8872467..5a80661 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,17 +35,17 @@
 #include 
 #include 
 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "oss-util.h"
 #include "module-oss-symdef.h"
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 01598e3..4878a1a 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,15 +33,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-pipe-sink-symdef.h"
 
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index be2a28d..f2f214c 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,15 +33,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-pipe-source-symdef.h"
 
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index 2b4f303..2072876 100644
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -40,18 +40,18 @@
 #include 
 #endif
 
-#include "../polypcore/winsock.h"
+#include "../pulsecore/winsock.h"
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #ifdef USE_TCP_SOCKETS
 #define SOCKET_DESCRIPTION "(TCP sockets)"
@@ -62,10 +62,10 @@
 #endif
 
 #if defined(USE_PROTOCOL_SIMPLE)
-  #include 
+  #include 
   #define protocol_new pa_protocol_simple_new
   #define protocol_free pa_protocol_simple_free
-  #define TCPWRAP_SERVICE "polypaudio-simple"
+  #define TCPWRAP_SERVICE "pulseaudio-simple"
   #define IPV4_PORT 4711
   #define UNIX_SOCKET "simple"
   #define MODULE_ARGUMENTS "rate", "format", "channels", "sink", "source", "playback", "record",
@@ -77,10 +77,10 @@
   PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE("rate= format= channels= sink= source= playback= record= "SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_CLI)
-  #include  
+  #include  
   #define protocol_new pa_protocol_cli_new
   #define protocol_free pa_protocol_cli_free
-  #define TCPWRAP_SERVICE "polypaudio-cli"
+  #define TCPWRAP_SERVICE "pulseaudio-cli"
   #define IPV4_PORT 4712
   #define UNIX_SOCKET "cli"
   #define MODULE_ARGUMENTS 
@@ -92,10 +92,10 @@
   PA_MODULE_DESCRIPTION("Command line interface protocol "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE(SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_HTTP)
-  #include 
+  #include 
   #define protocol_new pa_protocol_http_new
   #define protocol_free pa_protocol_http_free
-  #define TCPWRAP_SERVICE "polypaudio-http"
+  #define TCPWRAP_SERVICE "pulseaudio-http"
   #define IPV4_PORT 4714
   #define UNIX_SOCKET "http"
   #define MODULE_ARGUMENTS 
@@ -107,10 +107,10 @@
   PA_MODULE_DESCRIPTION("HTTP "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE(SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_NATIVE)
-  #include 
+  #include 
   #define protocol_new pa_protocol_native_new
   #define protocol_free pa_protocol_native_free
-  #define TCPWRAP_SERVICE "polypaudio-native"
+  #define TCPWRAP_SERVICE "pulseaudio-native"
   #define IPV4_PORT PA_NATIVE_DEFAULT_PORT
   #define UNIX_SOCKET PA_NATIVE_DEFAULT_UNIX_SOCKET
   #define MODULE_ARGUMENTS_COMMON "cookie", "auth-anonymous",
@@ -131,8 +131,8 @@
   PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION)
   PA_MODULE_USAGE("auth-anonymous= cookie= "AUTH_USAGE SOCKET_USAGE)
 #elif defined(USE_PROTOCOL_ESOUND)
-  #include 
-  #include 
+  #include 
+  #include 
   #define protocol_new pa_protocol_esound_new
   #define protocol_free pa_protocol_esound_free
   #define TCPWRAP_SERVICE "esound"
diff --git a/src/modules/module-sine.c b/src/modules/module-sine.c
index 15b6c8a..f4392b9 100644
--- a/src/modules/module-sine.c
+++ b/src/modules/module-sine.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,13 +27,13 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-sine-symdef.h"
 
diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index 8670bb3..12c4a3f 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -40,18 +40,18 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-solaris-symdef.h"
 
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index bf1fafb..bf2627a 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,24 +31,24 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #ifdef TUNNEL_SINK
 #include "module-tunnel-sink-symdef.h"
diff --git a/src/modules/module-volume-restore.c b/src/modules/module-volume-restore.c
index 435f0c9..ede2fcf 100644
--- a/src/modules/module-volume-restore.c
+++ b/src/modules/module-volume-restore.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,17 +32,17 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-volume-restore-symdef.h"
 
@@ -53,7 +53,7 @@ PA_MODULE_VERSION(PACKAGE_VERSION)
 
 #define WHITESPACE "\n\r \t"
 
-#define DEFAULT_VOLUME_TABLE_FILE ".polypaudio/volume.table"
+#define DEFAULT_VOLUME_TABLE_FILE ".pulseaudio/volume.table"
 
 static const char* const valid_modargs[] = {
     "table",
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index ce9ea84..2bd4905 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,17 +27,17 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-waveout-symdef.h"
 
diff --git a/src/modules/module-x11-bell.c b/src/modules/module-x11-bell.c
index 2b891bc..7ac5f55 100644
--- a/src/modules/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,15 +31,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-x11-bell-symdef.h"
 
diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c
index 70d7503..9916303 100644
--- a/src/modules/module-x11-publish.c
+++ b/src/modules/module-x11-publish.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,23 +32,23 @@
 #include 
 #include 
 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-x11-publish-symdef.h"
 
diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
index c07c95f..14cbef4 100644
--- a/src/modules/module-zeroconf-publish.c
+++ b/src/modules/module-zeroconf-publish.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,20 +29,20 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
-#include "../polypcore/endianmacros.h"
+#include "../pulsecore/endianmacros.h"
 
 #include "howl-wrap.h"
 
@@ -53,9 +53,9 @@ PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Publisher")
 PA_MODULE_VERSION(PACKAGE_VERSION)
 PA_MODULE_USAGE("port=")
 
-#define SERVICE_NAME_SINK "_polypaudio-sink._tcp"
-#define SERVICE_NAME_SOURCE "_polypaudio-source._tcp"
-#define SERVICE_NAME_SERVER "_polypaudio-server._tcp"
+#define SERVICE_NAME_SINK "_pulseaudio-sink._tcp"
+#define SERVICE_NAME_SOURCE "_pulseaudio-source._tcp"
+#define SERVICE_NAME_SERVER "_pulseaudio-server._tcp"
 
 static const char* const valid_modargs[] = {
     "port",
diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index ff337a5..f4cc45d 100644
--- a/src/modules/oss-util.c
+++ b/src/modules/oss-util.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,9 +34,9 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "oss-util.h"
 
diff --git a/src/modules/oss-util.h b/src/modules/oss-util.h
index c652d2a..12855f4 100644
--- a/src/modules/oss-util.h
+++ b/src/modules/oss-util.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 int pa_oss_open(const char *device, int *mode, int* pcaps);
 int pa_oss_auto_format(int fd, pa_sample_spec *ss);
diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
index c448502..932da84 100644
--- a/src/modules/rtp/module-rtp-recv.c
+++ b/src/modules/rtp/module-rtp-recv.c
@@ -1,19 +1,19 @@
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,20 +31,20 @@
 #include 
 #include 
 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-rtp-recv-symdef.h"
 
diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index 4359d00..00da64d 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,20 +32,20 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "module-rtp-send-symdef.h"
 
diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
index 52a1819..ee037d4 100644
--- a/src/modules/rtp/rtp.c
+++ b/src/modules/rtp/rtp.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,8 +36,8 @@
 #include 
 #endif
 
-#include 
-#include 
+#include 
+#include 
 
 #include "rtp.h"
 
diff --git a/src/modules/rtp/rtp.h b/src/modules/rtp/rtp.h
index 49da155..35fbbd3 100644
--- a/src/modules/rtp/rtp.h
+++ b/src/modules/rtp/rtp.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,8 +25,8 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 typedef struct pa_rtp_context {
     int fd;
diff --git a/src/modules/rtp/sap.c b/src/modules/rtp/sap.c
index 134bab0..3814a1c 100644
--- a/src/modules/rtp/sap.c
+++ b/src/modules/rtp/sap.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -38,11 +38,11 @@
 #include 
 #endif
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "sap.h"
 #include "sdp.h"
diff --git a/src/modules/rtp/sap.h b/src/modules/rtp/sap.h
index b11b1dd..987403e 100644
--- a/src/modules/rtp/sap.h
+++ b/src/modules/rtp/sap.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,8 +25,8 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 typedef struct pa_sap_context {
     int fd;
diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
index 5ec5090..cada636 100644
--- a/src/modules/rtp/sdp.c
+++ b/src/modules/rtp/sdp.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,10 +31,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "sdp.h"
 #include "rtp.h"
diff --git a/src/modules/rtp/sdp.h b/src/modules/rtp/sdp.h
index 2aa1805..b95ca63 100644
--- a/src/modules/rtp/sdp.h
+++ b/src/modules/rtp/sdp.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #define PA_SDP_HEADER "v=0\n"
 
diff --git a/src/polypcore/Makefile b/src/polypcore/Makefile
deleted file mode 120000
index cd2a5c9..0000000
--- a/src/polypcore/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../polyp/Makefile
\ No newline at end of file
diff --git a/src/polyp/Makefile b/src/pulse/Makefile
similarity index 100%
rename from src/polyp/Makefile
rename to src/pulse/Makefile
diff --git a/src/polyp/browser.c b/src/pulse/browser.c
similarity index 94%
rename from src/polyp/browser.c
rename to src/pulse/browser.c
index 69760d8..d063465 100644
--- a/src/polyp/browser.c
+++ b/src/pulse/browser.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -22,16 +22,16 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "browser.h"
 
-#define SERVICE_NAME_SINK "_polypaudio-sink._tcp."
-#define SERVICE_NAME_SOURCE "_polypaudio-source._tcp."
-#define SERVICE_NAME_SERVER "_polypaudio-server._tcp."
+#define SERVICE_NAME_SINK "_pulseaudio-sink._tcp."
+#define SERVICE_NAME_SOURCE "_pulseaudio-source._tcp."
+#define SERVICE_NAME_SERVER "_pulseaudio-server._tcp."
 
 struct pa_browser {
     int ref;
diff --git a/src/polyp/browser.h b/src/pulse/browser.h
similarity index 83%
rename from src/polyp/browser.h
rename to src/pulse/browser.h
index 1ff58d8..2d20c6c 100644
--- a/src/polyp/browser.h
+++ b/src/pulse/browser.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 PA_C_DECL_BEGIN
 
diff --git a/src/polyp/cdecl.h b/src/pulse/cdecl.h
similarity index 82%
rename from src/polyp/cdecl.h
rename to src/pulse/cdecl.h
index d51ae02..6ac9668 100644
--- a/src/polyp/cdecl.h
+++ b/src/pulse/cdecl.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polyp/channelmap.c b/src/pulse/channelmap.c
similarity index 97%
rename from src/polyp/channelmap.c
rename to src/pulse/channelmap.c
index 653331b..a4f1337 100644
--- a/src/polyp/channelmap.c
+++ b/src/pulse/channelmap.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,8 +28,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "channelmap.h"
 
diff --git a/src/polyp/channelmap.h b/src/pulse/channelmap.h
similarity index 96%
rename from src/polyp/channelmap.h
rename to src/pulse/channelmap.h
index 645a8a3..8a39ade 100644
--- a/src/polyp/channelmap.h
+++ b/src/pulse/channelmap.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 /** \page channelmap Channel Maps
  *
diff --git a/src/polyp/client-conf-x11.c b/src/pulse/client-conf-x11.c
similarity index 85%
rename from src/polyp/client-conf-x11.c
rename to src/pulse/client-conf-x11.c
index fb67df2..7eea5ae 100644
--- a/src/polyp/client-conf-x11.c
+++ b/src/pulse/client-conf-x11.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-13071
   USA.
 ***/
@@ -29,11 +29,11 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "client-conf-x11.h"
 
diff --git a/src/polyp/client-conf-x11.h b/src/pulse/client-conf-x11.h
similarity index 78%
rename from src/polyp/client-conf-x11.h
rename to src/pulse/client-conf-x11.h
index 6445922..02e808b 100644
--- a/src/polyp/client-conf-x11.h
+++ b/src/pulse/client-conf-x11.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polyp/client-conf.c b/src/pulse/client-conf.c
similarity index 90%
rename from src/polyp/client-conf.c
rename to src/pulse/client-conf.c
index e1934ce..752d013 100644
--- a/src/polyp/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,19 +29,19 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "client-conf.h"
 
 #ifndef DEFAULT_CONFIG_DIR
 # ifndef OS_IS_WIN32
-#  define DEFAULT_CONFIG_DIR "/etc/polypaudio"
+#  define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
 # else
 #  define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
 # endif
@@ -54,7 +54,7 @@
 #endif
 
 #define DEFAULT_CLIENT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "client.conf"
-#define DEFAULT_CLIENT_CONFIG_FILE_USER ".polypaudio" PATH_SEP "client.conf"
+#define DEFAULT_CLIENT_CONFIG_FILE_USER ".pulseaudio" PATH_SEP "client.conf"
 
 #define ENV_CLIENT_CONFIG_FILE "POLYP_CLIENTCONFIG"
 #define ENV_DEFAULT_SINK "POLYP_SINK"
diff --git a/src/polyp/client-conf.h b/src/pulse/client-conf.h
similarity index 82%
rename from src/polyp/client-conf.h
rename to src/pulse/client-conf.h
index de3efae..9d45af4 100644
--- a/src/polyp/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
-/* A structure containing configuration data for polypaudio clients. */
+/* A structure containing configuration data for pulseaudio clients. */
 
 typedef struct pa_client_conf {
     char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;
diff --git a/src/polyp/client.conf.in b/src/pulse/client.conf.in
similarity index 69%
rename from src/polyp/client.conf.in
rename to src/pulse/client.conf.in
index fbf645a..d881c44 100644
--- a/src/polyp/client.conf.in
+++ b/src/pulse/client.conf.in
@@ -1,29 +1,29 @@
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-## Configuration file for polypaudio clients. Default values are
+## Configuration file for pulseaudio clients. Default values are
 ## commented out.  Use either ; or # for commenting
 
-## Path to the polypaudio daemon to run when autospawning.
+## Path to the pulseaudio daemon to run when autospawning.
 ; daemon-binary = @POLYPAUDIO_BINARY@
 
-## Extra arguments to pass to the polypaudio daemon
+## Extra arguments to pass to the pulseaudio daemon
 ; extra-arguments = --log-target=syslog --exit-idle-time=5
 
 ## The default sink to connect to
diff --git a/src/polyp/context.c b/src/pulse/context.c
similarity index 97%
rename from src/polyp/context.c
rename to src/pulse/context.c
index 68fb4bf..648024c 100644
--- a/src/polyp/context.c
+++ b/src/pulse/context.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -45,21 +45,21 @@
 #include 
 #endif
 
-#include "../polypcore/winsock.h"
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include "../pulsecore/winsock.h"
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "internal.h"
 
diff --git a/src/polyp/context.h b/src/pulse/context.h
similarity index 92%
rename from src/polyp/context.h
rename to src/pulse/context.h
index 04e2af4..65d70e8 100644
--- a/src/polyp/context.h
+++ b/src/pulse/context.h
@@ -4,35 +4,35 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 /** \page async Asynchronous API
  *
  * \section overv_sec Overview
  *
- * The asynchronous API is the native interface to the polypaudio library.
+ * The asynchronous API is the native interface to the pulseaudio library.
  * It allows full access to all available functions. This also means that
  * it is rather complex and can take some time to fully master.
  *
@@ -52,10 +52,10 @@
  *
  * To actually be able to use these functions, an implementation needs to 
  * be coupled to the abstraction. There are three of these shipped with
- * polypaudio, but any other can be used with a minimal ammount of work,
+ * pulseaudio, but any other can be used with a minimal ammount of work,
  * provided it supports the three basic events listed above.
  *
- * The implementations shipped with polypaudio are:
+ * The implementations shipped with pulseaudio are:
  *
  * \li \subpage mainloop - A minimal but fast implementation based on poll().
  * \li \subpage threaded_mainloop - A special version of the previous
@@ -71,7 +71,7 @@
  *
  * \section refcnt_sec Reference Counting
  *
- * Almost all objects in polypaudio are reference counted. What that means
+ * Almost all objects in pulseaudio are reference counted. What that means
  * is that you rarely malloc() or free() any objects. Instead you increase
  * and decrease their reference counts. Whenever an object's reference
  * count reaches zero, that object gets destroy and any resources it uses
@@ -89,7 +89,7 @@
  *
  * \section context_sec Context
  *
- * A context is the basic object for a connection to a polypaudio server.
+ * A context is the basic object for a connection to a pulseaudio server.
  * It multiplexes commands, data streams and events through a single
  * channel.
  *
@@ -142,7 +142,7 @@
 
 /** \file
  * Connection contexts for asynchrononous communication with a
- * server. A pa_context object wraps a connection to a polypaudio
+ * server. A pa_context object wraps a connection to a pulseaudio
  * server using its native protocol. */
 
 /** \example pacat.c
diff --git a/src/polyp/def.h b/src/pulse/def.h
similarity index 98%
rename from src/polyp/def.h
rename to src/pulse/def.h
index 5799716..3a17f43 100644
--- a/src/polyp/def.h
+++ b/src/pulse/def.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,8 +26,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 /** \file
  * Global definitions */
@@ -66,7 +66,7 @@ typedef enum pa_operation_state {
 
 /** Some special flags for contexts. \since 0.8 */
 typedef enum pa_context_flags {
-    PA_CONTEXT_NOAUTOSPAWN = 1 /**< Disabled autospawning of the polypaudio daemon if required */
+    PA_CONTEXT_NOAUTOSPAWN = 1 /**< Disabled autospawning of the pulseaudio daemon if required */
 } pa_context_flags_t;
 
 /** The direction of a pa_stream object */ 
diff --git a/src/polyp/error.c b/src/pulse/error.c
similarity index 84%
rename from src/polyp/error.c
rename to src/pulse/error.c
index 27da7ea..7bd31ea 100644
--- a/src/polyp/error.c
+++ b/src/pulse/error.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,10 +28,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "error.h"
 
diff --git a/src/polyp/error.h b/src/pulse/error.h
similarity index 76%
rename from src/polyp/error.h
rename to src/pulse/error.h
index 9856c1a..bfce023 100644
--- a/src/polyp/error.h
+++ b/src/pulse/error.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
-#include 
+#include 
 
 /** \file
  * Error management */
diff --git a/src/polyp/glib-mainloop.c b/src/pulse/glib-mainloop.c
similarity index 97%
rename from src/polyp/glib-mainloop.c
rename to src/pulse/glib-mainloop.c
index d5fce76..25848ec 100644
--- a/src/polyp/glib-mainloop.c
+++ b/src/pulse/glib-mainloop.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,11 +25,11 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "glib.h"
 #include "glib-mainloop.h"
diff --git a/src/polyp/glib-mainloop.h b/src/pulse/glib-mainloop.h
similarity index 85%
rename from src/polyp/glib-mainloop.h
rename to src/pulse/glib-mainloop.h
index ce885e1..75de1cc 100644
--- a/src/polyp/glib-mainloop.h
+++ b/src/pulse/glib-mainloop.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 /** \page glib-mainloop GLIB Main Loop Bindings
  *
diff --git a/src/polyp/glib12-mainloop.c b/src/pulse/glib12-mainloop.c
similarity index 97%
rename from src/polyp/glib12-mainloop.c
rename to src/pulse/glib12-mainloop.c
index dfd6ff2..ebaf87f 100644
--- a/src/polyp/glib12-mainloop.c
+++ b/src/pulse/glib12-mainloop.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,11 +25,11 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "glib-mainloop.h"
 
diff --git a/src/polyp/internal.h b/src/pulse/internal.h
similarity index 89%
rename from src/polyp/internal.h
rename to src/pulse/internal.h
index e659553..96028d8 100644
--- a/src/polyp/internal.h
+++ b/src/pulse/internal.h
@@ -4,40 +4,40 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "client-conf.h"
 
diff --git a/src/polyp/introspect.c b/src/pulse/introspect.c
similarity index 99%
rename from src/polyp/introspect.c
rename to src/pulse/introspect.c
index 9d00266..ed40c53 100644
--- a/src/polyp/introspect.c
+++ b/src/pulse/introspect.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,10 +25,10 @@
 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "internal.h"
 
diff --git a/src/polyp/introspect.h b/src/pulse/introspect.h
similarity index 98%
rename from src/polyp/introspect.h
rename to src/pulse/introspect.h
index 9a0edb7..8fe218b 100644
--- a/src/polyp/introspect.h
+++ b/src/pulse/introspect.h
@@ -4,31 +4,31 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 /** \page introspect Server Query and Control
  *
@@ -266,11 +266,11 @@ typedef struct pa_server_info {
     const char *user_name;              /**< User name of the daemon process */
     const char *host_name;              /**< Host name the daemon is running on */
     const char *server_version;         /**< Version string of the daemon */
-    const char *server_name;            /**< Server package name (usually "polypaudio") */
+    const char *server_name;            /**< Server package name (usually "pulseaudio") */
     pa_sample_spec sample_spec;         /**< Default sample specification */
     const char *default_sink_name;      /**< Name of default sink. \since 0.4 */
     const char *default_source_name;    /**< Name of default sink. \since 0.4*/
-    uint32_t cookie;                    /**< A random cookie for identifying this instance of polypaudio. \since 0.8 */
+    uint32_t cookie;                    /**< A random cookie for identifying this instance of pulseaudio. \since 0.8 */
 } pa_server_info;
 
 /** Callback prototype for pa_context_get_server_info() */
diff --git a/src/polyp/mainloop-api.c b/src/pulse/mainloop-api.c
similarity index 84%
rename from src/polyp/mainloop-api.c
rename to src/pulse/mainloop-api.c
index f29598d..2e20b44 100644
--- a/src/polyp/mainloop-api.c
+++ b/src/pulse/mainloop-api.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,9 +26,9 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
+#include 
 
 #include "mainloop-api.h"
 
diff --git a/src/polyp/mainloop-api.h b/src/pulse/mainloop-api.h
similarity index 89%
rename from src/polyp/mainloop-api.h
rename to src/pulse/mainloop-api.h
index 12d74aa..a732b21 100644
--- a/src/polyp/mainloop-api.h
+++ b/src/pulse/mainloop-api.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,17 +25,17 @@
 #include 
 #include 
 
-#include 
+#include 
 
 /** \file
  * 
- * Main loop abstraction layer. Both the polypaudio core and the
- * polypaudio client library use a main loop abstraction layer. Due to
- * this it is possible to embed polypaudio into other
+ * Main loop abstraction layer. Both the pulseaudio core and the
+ * pulseaudio client library use a main loop abstraction layer. Due to
+ * this it is possible to embed pulseaudio into other
  * applications easily. Two main loop implemenations are
  * currently available:
  * \li A minimal implementation based on the C library's poll() function (See \ref mainloop.h)
- * \li A wrapper around the GLIB main loop. Use this to embed polypaudio into your GLIB/GTK+/GNOME programs (See \ref glib-mainloop.h)
+ * \li A wrapper around the GLIB main loop. Use this to embed pulseaudio into your GLIB/GTK+/GNOME programs (See \ref glib-mainloop.h)
  *
  * The structure pa_mainloop_api is used as vtable for the main loop abstraction.
  *
diff --git a/src/polyp/mainloop-signal.c b/src/pulse/mainloop-signal.c
similarity index 92%
rename from src/polyp/mainloop-signal.c
rename to src/pulse/mainloop-signal.c
index 9270281..c3cf362 100644
--- a/src/polyp/mainloop-signal.c
+++ b/src/pulse/mainloop-signal.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,12 +36,12 @@
 #include 
 #endif
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "mainloop-signal.h"
 
diff --git a/src/polyp/mainloop-signal.h b/src/pulse/mainloop-signal.h
similarity index 87%
rename from src/polyp/mainloop-signal.h
rename to src/pulse/mainloop-signal.h
index 20e9798..0721c1f 100644
--- a/src/polyp/mainloop-signal.h
+++ b/src/pulse/mainloop-signal.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 PA_C_DECL_BEGIN
 
diff --git a/src/polyp/mainloop.c b/src/pulse/mainloop.c
similarity index 97%
rename from src/polyp/mainloop.c
rename to src/pulse/mainloop.c
index 61d8b48..32f1a84 100644
--- a/src/polyp/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,22 +35,22 @@
 #ifdef HAVE_SYS_POLL_H
 #include 
 #else
-#include "../polypcore/poll.h"
+#include "../pulsecore/poll.h"
 #endif
 
-#include "../polypcore/winsock.h"
+#include "../pulsecore/winsock.h"
 
 #ifndef HAVE_PIPE
-#include "../polypcore/pipe.h"
+#include "../pulsecore/pipe.h"
 #endif
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "mainloop.h"
 
diff --git a/src/polyp/mainloop.h b/src/pulse/mainloop.h
similarity index 94%
rename from src/polyp/mainloop.h
rename to src/pulse/mainloop.h
index 4681912..8abd8fe 100644
--- a/src/polyp/mainloop.h
+++ b/src/pulse/mainloop.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 PA_C_DECL_BEGIN
 
diff --git a/src/polyp/operation.c b/src/pulse/operation.c
similarity index 90%
rename from src/polyp/operation.c
rename to src/pulse/operation.c
index 5af9ec0..24ddf69 100644
--- a/src/polyp/operation.c
+++ b/src/pulse/operation.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,7 +25,7 @@
 
 #include 
 
-#include 
+#include 
 
 #include "internal.h"
 #include "operation.h"
diff --git a/src/polyp/operation.h b/src/pulse/operation.h
similarity index 81%
rename from src/polyp/operation.h
rename to src/pulse/operation.h
index 2fbac2e..b544e08 100644
--- a/src/polyp/operation.h
+++ b/src/pulse/operation.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 /** \file
  * Asynchronous operations */
diff --git a/src/polyp/polypaudio.h b/src/pulse/polypaudio.h
similarity index 67%
rename from src/polyp/polypaudio.h
rename to src/pulse/polypaudio.h
index c172315..5bbd4cc 100644
--- a/src/polyp/polypaudio.h
+++ b/src/pulse/polypaudio.h
@@ -1,50 +1,50 @@
-#ifndef foopolypaudiohfoo
-#define foopolypaudiohfoo
+#ifndef foopulseaudiohfoo
+#define foopulseaudiohfoo
 
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 /** \file
- * Include all polyplib header files at once. The following
+ * Include all pulselib header files at once. The following
  * files are included: \ref mainloop-api.h, \ref sample.h, \ref def.h,
  * \ref context.h, \ref stream.h, \ref introspect.h, \ref subscribe.h,
  * \ref scache.h, \ref version.h, \ref error.h, \ref channelmap.h,
@@ -56,7 +56,7 @@
  *
  * \section intro_sec Introduction
  * 
- * This document describes the client API for the polypaudio sound
+ * This document describes the client API for the pulseaudio sound
  * server. The API comes in two flavours to accomodate different styles
  * of applications and different needs in complexity:
  * 
@@ -78,7 +78,7 @@
  *
  * Use this if you develop your programs in asynchronous, event loop
  * based style or if you want to use the advanced features of the
- * polypaudio API. A guide can be found in \subpage async.
+ * pulseaudio API. A guide can be found in \subpage async.
  *
  * By using the built-in threaded main loop, it is possible to acheive a
  * pseudo-synchronous API, which can be useful in synchronous applications
@@ -87,7 +87,7 @@
  *
  * \section thread_sec Threads
  *
- * The polypaudio client libraries are not designed to be used in a
+ * The pulseaudio client libraries are not designed to be used in a
  * heavily threaded environment. They are however designed to be reentrant
  * safe.
  *
@@ -102,14 +102,14 @@
  *
  * \section pkgconfig pkg-config
  *
- * The polypaudio libraries provide pkg-config snippets for the different
+ * The pulseaudio libraries provide pkg-config snippets for the different
  * modules:
  *
- * \li polyplib - The asynchronous API and the internal main loop
+ * \li pulselib - The asynchronous API and the internal main loop
  *                implementation.
- * \li polyplib-glib12-mainloop - GLIB 1.2 main loop bindings.
- * \li polyplib-glib-mainloop - GLIB 2.x main loop bindings.
- * \li polyplib-simple - The simple polypaudio API.
+ * \li pulselib-glib12-mainloop - GLIB 1.2 main loop bindings.
+ * \li pulselib-glib-mainloop - GLIB 2.x main loop bindings.
+ * \li pulselib-simple - The simple pulseaudio API.
  */
 
 #endif
diff --git a/src/polyp/sample.c b/src/pulse/sample.c
similarity index 95%
rename from src/polyp/sample.c
rename to src/pulse/sample.c
index 9c3b9f9..2e055bf 100644
--- a/src/polyp/sample.c
+++ b/src/pulse/sample.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polyp/sample.h b/src/pulse/sample.h
similarity index 96%
rename from src/polyp/sample.h
rename to src/pulse/sample.h
index 2a9a72f..848fd16 100644
--- a/src/polyp/sample.h
+++ b/src/pulse/sample.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 /** \page sample Sample Format Specifications
  *
diff --git a/src/polyp/scache.c b/src/pulse/scache.c
similarity index 93%
rename from src/polyp/scache.c
rename to src/pulse/scache.c
index 22d8a54..5d29c5b 100644
--- a/src/polyp/scache.c
+++ b/src/pulse/scache.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "internal.h"
 
diff --git a/src/polyp/scache.h b/src/pulse/scache.h
similarity index 91%
rename from src/polyp/scache.h
rename to src/pulse/scache.h
index 9189067..e32703d 100644
--- a/src/polyp/scache.h
+++ b/src/pulse/scache.h
@@ -4,29 +4,29 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 /** \page scache Sample Cache
  *
diff --git a/src/polyp/simple.c b/src/pulse/simple.c
similarity index 96%
rename from src/polyp/simple.c
rename to src/pulse/simple.c
index 9c2c908..a41881b 100644
--- a/src/polyp/simple.c
+++ b/src/pulse/simple.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,12 +28,12 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "simple.h"
 
diff --git a/src/polyp/simple.h b/src/pulse/simple.h
similarity index 93%
rename from src/polyp/simple.h
rename to src/pulse/simple.h
index b97e844..0438d31 100644
--- a/src/polyp/simple.h
+++ b/src/pulse/simple.h
@@ -4,30 +4,30 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 /** \page simple Simple API
  *
diff --git a/src/polyp/stream.c b/src/pulse/stream.c
similarity index 99%
rename from src/polyp/stream.c
rename to src/pulse/stream.c
index 8927805..c8fc09d 100644
--- a/src/polyp/stream.c
+++ b/src/pulse/stream.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,13 +28,13 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "internal.h"
 
diff --git a/src/polyp/stream.h b/src/pulse/stream.h
similarity index 98%
rename from src/polyp/stream.h
rename to src/pulse/stream.h
index d1f558a..d117ce4 100644
--- a/src/polyp/stream.h
+++ b/src/pulse/stream.h
@@ -4,32 +4,32 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 /** \page streams Audio Streams
  *
diff --git a/src/polyp/subscribe.c b/src/pulse/subscribe.c
similarity index 88%
rename from src/polyp/subscribe.c
rename to src/pulse/subscribe.c
index 21f5f7a..c1d8891 100644
--- a/src/polyp/subscribe.c
+++ b/src/pulse/subscribe.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,8 +26,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "internal.h"
 
diff --git a/src/polyp/subscribe.h b/src/pulse/subscribe.h
similarity index 85%
rename from src/polyp/subscribe.h
rename to src/pulse/subscribe.h
index d8326e1..adbea68 100644
--- a/src/polyp/subscribe.h
+++ b/src/pulse/subscribe.h
@@ -4,29 +4,29 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 /** \page subscribe Event Subscription
  *
diff --git a/src/polyp/thread-mainloop.c b/src/pulse/thread-mainloop.c
similarity index 96%
rename from src/polyp/thread-mainloop.c
rename to src/pulse/thread-mainloop.c
index d036a23..34f0f25 100644
--- a/src/polyp/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,7 +30,7 @@
 #ifdef HAVE_SYS_POLL_H
 #include 
 #else
-#include "../polypcore/poll.h"
+#include "../pulsecore/poll.h"
 #endif
 
 #ifdef HAVE_PTHREAD
@@ -41,10 +41,10 @@
 #include 
 #endif
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "mainloop.h"
 #include "thread-mainloop.h"
diff --git a/src/polyp/thread-mainloop.h b/src/pulse/thread-mainloop.h
similarity index 97%
rename from src/polyp/thread-mainloop.h
rename to src/pulse/thread-mainloop.h
index 81e8d67..fb216c5 100644
--- a/src/polyp/thread-mainloop.h
+++ b/src/pulse/thread-mainloop.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 PA_C_DECL_BEGIN
 
diff --git a/src/polyp/timeval.c b/src/pulse/timeval.c
similarity index 92%
rename from src/polyp/timeval.c
rename to src/pulse/timeval.c
index 6043d7f..1128523 100644
--- a/src/polyp/timeval.c
+++ b/src/pulse/timeval.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,7 +31,7 @@
 #include 
 #endif
 
-#include "../polypcore/winsock.h"
+#include "../pulsecore/winsock.h"
 
 #include "timeval.h"
 
diff --git a/src/polyp/timeval.h b/src/pulse/timeval.h
similarity index 83%
rename from src/polyp/timeval.h
rename to src/pulse/timeval.h
index 9990d4c..e2dbbad 100644
--- a/src/polyp/timeval.h
+++ b/src/pulse/timeval.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 /** \file
  * Utility functions for handling timeval calculations */
diff --git a/src/polyp/utf8.c b/src/pulse/utf8.c
similarity index 100%
rename from src/polyp/utf8.c
rename to src/pulse/utf8.c
diff --git a/src/polyp/utf8.h b/src/pulse/utf8.h
similarity index 83%
rename from src/polyp/utf8.h
rename to src/pulse/utf8.h
index 55b8d2e..2eac724 100644
--- a/src/polyp/utf8.h
+++ b/src/pulse/utf8.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 /** \file
  * UTF8 Validation functions
diff --git a/src/polyp/util.c b/src/pulse/util.c
similarity index 92%
rename from src/polyp/util.c
rename to src/pulse/util.c
index 842b9e7..338607c 100644
--- a/src/polyp/util.c
+++ b/src/pulse/util.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -49,11 +49,11 @@
 #include 
 #endif
 
-#include "../polypcore/winsock.h"
+#include "../pulsecore/winsock.h"
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "util.h"
 
diff --git a/src/polyp/util.h b/src/pulse/util.h
similarity index 85%
rename from src/polyp/util.h
rename to src/pulse/util.h
index cd8aab0..5c03b0a 100644
--- a/src/polyp/util.h
+++ b/src/pulse/util.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
+#include 
 
 /** \file
  * Assorted utility functions */
diff --git a/src/polyp/version.h.in b/src/pulse/version.h.in
similarity index 77%
rename from src/polyp/version.h.in
rename to src/pulse/version.h.in
index de7b9c1..6c5492e 100644
--- a/src/polyp/version.h.in
+++ b/src/pulse/version.h.in
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 /* WARNING: Make sure to edit the real source file version.h.in! */
 
-#include 
+#include 
 
 /** \file
  * Define header version */
@@ -39,12 +39,12 @@ it. */
 /** Return the version of the library the current application is linked to. */
 const char* pa_get_library_version(void);
 
-/** The current API version. Version 6 relates to polypaudio
+/** The current API version. Version 6 relates to pulseaudio
  * 0.6. Prior versions (i.e. Polypaudio 0.5.1 and older) have
  * PA_API_VERSION undefined.  */
 #define PA_API_VERSION @PA_API_VERSION@
 
-/** The current protocol version. Version 8 relates to polypaudio 0.8.
+/** The current protocol version. Version 8 relates to pulseaudio 0.8.
  * \since 0.8 */
 #define PA_PROTOCOL_VERSION @PA_PROTOCOL_VERSION@
 
diff --git a/src/polyp/volume.c b/src/pulse/volume.c
similarity index 94%
rename from src/polyp/volume.c
rename to src/pulse/volume.c
index f10463c..530814e 100644
--- a/src/polyp/volume.c
+++ b/src/pulse/volume.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polyp/volume.h b/src/pulse/volume.h
similarity index 95%
rename from src/polyp/volume.h
rename to src/pulse/volume.h
index 0da5f54..d403a09 100644
--- a/src/polyp/volume.h
+++ b/src/pulse/volume.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 /** \page volume Volume Control
  *
diff --git a/src/polyp/xmalloc.c b/src/pulse/xmalloc.c
similarity index 89%
rename from src/polyp/xmalloc.c
rename to src/pulse/xmalloc.c
index 7f71a5e..46871ae 100644
--- a/src/polyp/xmalloc.c
+++ b/src/pulse/xmalloc.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,8 +29,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "xmalloc.h"
 
diff --git a/src/polyp/xmalloc.h b/src/pulse/xmalloc.h
similarity index 89%
rename from src/polyp/xmalloc.h
rename to src/pulse/xmalloc.h
index 49b6d7b..126c495 100644
--- a/src/polyp/xmalloc.h
+++ b/src/pulse/xmalloc.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 /** \file
  * Memory allocation functions.
diff --git a/src/pulsecore/Makefile b/src/pulsecore/Makefile
new file mode 120000
index 0000000..c110232
--- /dev/null
+++ b/src/pulsecore/Makefile
@@ -0,0 +1 @@
+../pulse/Makefile
\ No newline at end of file
diff --git a/src/polypcore/authkey-prop.c b/src/pulsecore/authkey-prop.c
similarity index 85%
rename from src/polypcore/authkey-prop.c
rename to src/pulsecore/authkey-prop.c
index 6172d43..7eda1e4 100644
--- a/src/polypcore/authkey-prop.c
+++ b/src/pulsecore/authkey-prop.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -22,10 +22,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "authkey-prop.h"
 
diff --git a/src/polypcore/authkey-prop.h b/src/pulsecore/authkey-prop.h
similarity index 84%
rename from src/polypcore/authkey-prop.h
rename to src/pulsecore/authkey-prop.h
index 63fde5d..b1da28b 100644
--- a/src/polypcore/authkey-prop.h
+++ b/src/pulsecore/authkey-prop.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 /* The authkey-prop uses a central property to store a previously
  * loaded cookie in memory. Useful for sharing the same cookie between
diff --git a/src/polypcore/authkey.c b/src/pulsecore/authkey.c
similarity index 93%
rename from src/polypcore/authkey.c
rename to src/pulsecore/authkey.c
index 54f4dd8..064209d 100644
--- a/src/polypcore/authkey.c
+++ b/src/pulsecore/authkey.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,11 +35,11 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "authkey.h"
 
diff --git a/src/polypcore/authkey.h b/src/pulsecore/authkey.h
similarity index 78%
rename from src/polypcore/authkey.h
rename to src/pulsecore/authkey.h
index 81b1a57..cc8a565 100644
--- a/src/polypcore/authkey.h
+++ b/src/pulsecore/authkey.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/autoload.c b/src/pulsecore/autoload.c
similarity index 91%
rename from src/polypcore/autoload.c
rename to src/pulsecore/autoload.c
index 386de21..f686909 100644
--- a/src/polypcore/autoload.c
+++ b/src/pulsecore/autoload.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,14 +27,14 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "autoload.h"
 
diff --git a/src/polypcore/autoload.h b/src/pulsecore/autoload.h
similarity index 88%
rename from src/polypcore/autoload.h
rename to src/pulsecore/autoload.h
index a8931fc..65bdd6d 100644
--- a/src/polypcore/autoload.h
+++ b/src/pulsecore/autoload.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 /* Using the autoloading facility, modules by be loaded on-demand and
  * synchronously. The user may register a "ghost sink" or "ghost
diff --git a/src/polypcore/cli-command.c b/src/pulsecore/cli-command.c
similarity index 97%
rename from src/polypcore/cli-command.c
rename to src/pulsecore/cli-command.c
index e25e464..4ba3e0a 100644
--- a/src/polypcore/cli-command.c
+++ b/src/pulsecore/cli-command.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,27 +29,27 @@
 #include 
 #include 
 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "cli-command.h"
 
diff --git a/src/polypcore/cli-command.h b/src/pulsecore/cli-command.h
similarity index 81%
rename from src/polypcore/cli-command.h
rename to src/pulsecore/cli-command.h
index e7c70ec..c56c3ca 100644
--- a/src/polypcore/cli-command.h
+++ b/src/pulsecore/cli-command.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 /* Execute a single CLI command. Write the results to the string
  * buffer *buf. If *fail is non-zero the function will return -1 when
diff --git a/src/polypcore/cli-text.c b/src/pulsecore/cli-text.c
similarity index 95%
rename from src/polypcore/cli-text.c
rename to src/pulsecore/cli-text.c
index 09ccaa0..eecf68f 100644
--- a/src/polypcore/cli-text.c
+++ b/src/pulsecore/cli-text.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,19 +26,19 @@
 #include 
 #include 
 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "cli-text.h"
 
diff --git a/src/polypcore/cli-text.h b/src/pulsecore/cli-text.h
similarity index 81%
rename from src/polypcore/cli-text.h
rename to src/pulsecore/cli-text.h
index a8f4000..cd3acde 100644
--- a/src/polypcore/cli-text.h
+++ b/src/pulsecore/cli-text.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 /* Some functions to generate pretty formatted listings of
  * entities. The returned strings have to be freed manually. */
diff --git a/src/polypcore/cli.c b/src/pulsecore/cli.c
similarity index 81%
rename from src/polypcore/cli.c
rename to src/pulsecore/cli.c
index 683d29e..fbfa500 100644
--- a/src/polypcore/cli.c
+++ b/src/pulsecore/cli.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,21 +28,21 @@
 #include 
 #include 
 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "cli.h"
 
@@ -84,7 +84,7 @@ pa_cli* pa_cli_new(pa_core *core, pa_iochannel *io, pa_module *m) {
     c->client->owner = m;
     
     pa_ioline_set_callback(c->line, line_callback, c);
-    pa_ioline_puts(c->line, "Welcome to polypaudio! Use \"help\" for usage information.\n"PROMPT);
+    pa_ioline_puts(c->line, "Welcome to pulseaudio! Use \"help\" for usage information.\n"PROMPT);
 
     c->fail = c->kill_requested = c->defer_kill = 0;
     
diff --git a/src/polypcore/cli.h b/src/pulsecore/cli.h
similarity index 76%
rename from src/polypcore/cli.h
rename to src/pulsecore/cli.h
index 12ffd84..639fa95 100644
--- a/src/polypcore/cli.h
+++ b/src/pulsecore/cli.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_cli pa_cli;
 
diff --git a/src/polypcore/client.c b/src/pulsecore/client.c
similarity index 87%
rename from src/polypcore/client.c
rename to src/pulsecore/client.c
index 4ece07a..bf2b13d 100644
--- a/src/polypcore/client.c
+++ b/src/pulsecore/client.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,10 +28,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "client.h"
 
diff --git a/src/polypcore/client.h b/src/pulsecore/client.h
similarity index 83%
rename from src/polypcore/client.h
rename to src/pulsecore/client.h
index f6ff935..1e72baf 100644
--- a/src/polypcore/client.h
+++ b/src/pulsecore/client.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 /* Every connection to the server should have a pa_client
  * attached. That way the user may generate a listing of all connected
diff --git a/src/polypcore/conf-parser.c b/src/pulsecore/conf-parser.c
similarity index 92%
rename from src/polypcore/conf-parser.c
rename to src/pulsecore/conf-parser.c
index d59bc55..cc471ff 100644
--- a/src/polypcore/conf-parser.c
+++ b/src/pulsecore/conf-parser.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "conf-parser.h"
 
diff --git a/src/polypcore/conf-parser.h b/src/pulsecore/conf-parser.h
similarity index 89%
rename from src/polypcore/conf-parser.h
rename to src/pulsecore/conf-parser.h
index 2dca3bc..9c1a697 100644
--- a/src/polypcore/conf-parser.h
+++ b/src/pulsecore/conf-parser.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/core-def.h b/src/pulsecore/core-def.h
similarity index 75%
rename from src/polypcore/core-def.h
rename to src/pulsecore/core-def.h
index 89cc47f..718499d 100644
--- a/src/polypcore/core-def.h
+++ b/src/pulsecore/core-def.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/core-error.c b/src/pulsecore/core-error.c
similarity index 91%
rename from src/polypcore/core-error.c
rename to src/pulsecore/core-error.c
index f2240a9..e42070d 100644
--- a/src/polypcore/core-error.c
+++ b/src/pulsecore/core-error.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,11 +36,11 @@
 #include 
 #endif
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "core-error.h"
 
@@ -68,7 +68,7 @@ static void inittls(void) {
     HANDLE mutex;
     char name[64];
 
-    sprintf(name, "polypaudio%d", (int)GetCurrentProcessId());
+    sprintf(name, "pulseaudio%d", (int)GetCurrentProcessId());
 
     mutex = CreateMutex(NULL, FALSE, name);
     if (!mutex) {
diff --git a/src/polypcore/core-error.h b/src/pulsecore/core-error.h
similarity index 79%
rename from src/polypcore/core-error.h
rename to src/pulsecore/core-error.h
index 17595c9..32da8bf 100644
--- a/src/polypcore/core-error.h
+++ b/src/pulsecore/core-error.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
-#include 
+#include 
 
 /** \file
  * Error management */
diff --git a/src/polypcore/core-scache.c b/src/pulsecore/core-scache.c
similarity index 93%
rename from src/polypcore/core-scache.c
rename to src/pulsecore/core-scache.c
index b44a7e1..377dd56 100644
--- a/src/polypcore/core-scache.c
+++ b/src/pulsecore/core-scache.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -41,22 +41,22 @@
 #include 
 #endif
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "core-scache.h"
 
diff --git a/src/polypcore/core-scache.h b/src/pulsecore/core-scache.h
similarity index 84%
rename from src/polypcore/core-scache.h
rename to src/pulsecore/core-scache.h
index 9ca05f8..d01aae9 100644
--- a/src/polypcore/core-scache.h
+++ b/src/pulsecore/core-scache.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #define PA_SCACHE_ENTRY_SIZE_MAX (1024*1024*2)
 
diff --git a/src/polypcore/core-subscribe.c b/src/pulsecore/core-subscribe.c
similarity index 95%
rename from src/polypcore/core-subscribe.c
rename to src/pulsecore/core-subscribe.c
index 52babb7..e865256 100644
--- a/src/polypcore/core-subscribe.c
+++ b/src/pulsecore/core-subscribe.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "core-subscribe.h"
 
diff --git a/src/polypcore/core-subscribe.h b/src/pulsecore/core-subscribe.h
similarity index 79%
rename from src/polypcore/core-subscribe.h
rename to src/pulsecore/core-subscribe.h
index 7c85695..c246703 100644
--- a/src/polypcore/core-subscribe.h
+++ b/src/pulsecore/core-subscribe.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,8 +25,8 @@
 typedef struct pa_subscription pa_subscription;
 typedef struct pa_subscription_event pa_subscription_event;
 
-#include 
-#include 
+#include 
+#include 
 
 pa_subscription* pa_subscription_new(pa_core *c, pa_subscription_mask_t m,  void (*callback)(pa_core *c, pa_subscription_event_type_t t, uint32_t index, void *userdata), void *userdata);
 void pa_subscription_free(pa_subscription*s);
diff --git a/src/polypcore/core-util.c b/src/pulsecore/core-util.c
similarity index 97%
rename from src/polypcore/core-util.c
rename to src/pulsecore/core-util.c
index dfa41f5..8e3587e 100644
--- a/src/polypcore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -69,20 +69,20 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "core-util.h"
 
 #ifndef OS_IS_WIN32
-#define PA_RUNTIME_PATH_PREFIX "/tmp/polypaudio-"
+#define PA_RUNTIME_PATH_PREFIX "/tmp/pulseaudio-"
 #define PATH_SEP '/'
 #else
-#define PA_RUNTIME_PATH_PREFIX "%TEMP%\\polypaudio-"
+#define PA_RUNTIME_PATH_PREFIX "%TEMP%\\pulseaudio-"
 #define PATH_SEP '\\'
 #endif
 
@@ -961,7 +961,7 @@ int pa_endswith(const char *s, const char *sfx) {
     return l1 >= l2 && strcmp(s+l1-l2, sfx) == 0;
 }
 
-/* if fn is null return the polypaudio run time path in s (/tmp/polypaudio)
+/* if fn is null return the pulseaudio run time path in s (/tmp/pulseaudio)
  * if fn is non-null and starts with / return fn in s
  * otherwise append fn to the run time path and return it in s */
 char *pa_runtime_path(const char *fn, char *s, size_t l) {
diff --git a/src/polypcore/core-util.h b/src/pulsecore/core-util.h
similarity index 90%
rename from src/polypcore/core-util.h
rename to src/pulsecore/core-util.h
index 989f8c1..0012afc 100644
--- a/src/polypcore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,7 +27,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 struct timeval;
 
diff --git a/src/polypcore/core.c b/src/pulsecore/core.c
similarity index 86%
rename from src/polypcore/core.c
rename to src/pulsecore/core.c
index 09d023d..7c780ea 100644
--- a/src/polypcore/core.c
+++ b/src/pulsecore/core.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,19 +28,19 @@
 #include 
 #include 
 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "core.h"
 
diff --git a/src/polypcore/core.h b/src/pulsecore/core.h
similarity index 76%
rename from src/polypcore/core.h
rename to src/pulsecore/core.h
index a323ae8..627d423 100644
--- a/src/polypcore/core.h
+++ b/src/pulsecore/core.h
@@ -4,42 +4,42 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 typedef struct pa_core pa_core;
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
-/* The core structure of polypaudio. Every polypaudio daemon contains
+/* The core structure of pulseaudio. Every pulseaudio daemon contains
  * exactly one of these. It is used for storing kind of global
  * variables for the daemon. */
 
 struct pa_core {
     /* A random value which may be used to identify this instance of
-     * polypaudio. Not cryptographically secure in any way. */
+     * pulseaudio. Not cryptographically secure in any way. */
     uint32_t cookie;
     
     pa_mainloop_api *mainloop;
diff --git a/src/polypcore/dllmain.c b/src/pulsecore/dllmain.c
similarity index 83%
rename from src/polypcore/dllmain.c
rename to src/pulsecore/dllmain.c
index 95473b0..b86bf04 100644
--- a/src/polypcore/dllmain.c
+++ b/src/pulsecore/dllmain.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/dynarray.c b/src/pulsecore/dynarray.c
similarity index 89%
rename from src/polypcore/dynarray.c
rename to src/pulsecore/dynarray.c
index 234c2c0..d1ab116 100644
--- a/src/polypcore/dynarray.c
+++ b/src/pulsecore/dynarray.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,7 +27,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "dynarray.h"
 
diff --git a/src/polypcore/dynarray.h b/src/pulsecore/dynarray.h
similarity index 86%
rename from src/polypcore/dynarray.h
rename to src/pulsecore/dynarray.h
index 9b1601b..4ddb526 100644
--- a/src/polypcore/dynarray.h
+++ b/src/pulsecore/dynarray.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/endianmacros.h b/src/pulsecore/endianmacros.h
similarity index 91%
rename from src/polypcore/endianmacros.h
rename to src/pulsecore/endianmacros.h
index 3ab1826..65db3fe 100644
--- a/src/polypcore/endianmacros.h
+++ b/src/pulsecore/endianmacros.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/esound.h b/src/pulsecore/esound.h
similarity index 97%
rename from src/polypcore/esound.h
rename to src/pulsecore/esound.h
index 9c507ef..9d44f65 100644
--- a/src/polypcore/esound.h
+++ b/src/pulsecore/esound.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/g711.c b/src/pulsecore/g711.c
similarity index 100%
rename from src/polypcore/g711.c
rename to src/pulsecore/g711.c
diff --git a/src/polypcore/g711.h b/src/pulsecore/g711.h
similarity index 100%
rename from src/polypcore/g711.h
rename to src/pulsecore/g711.h
diff --git a/src/polypcore/gccmacro.h b/src/pulsecore/gccmacro.h
similarity index 85%
rename from src/polypcore/gccmacro.h
rename to src/pulsecore/gccmacro.h
index 9e212f2..2ab999d 100644
--- a/src/polypcore/gccmacro.h
+++ b/src/pulsecore/gccmacro.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/hashmap.c b/src/pulsecore/hashmap.c
similarity index 93%
rename from src/polypcore/hashmap.c
rename to src/pulsecore/hashmap.c
index adc322f..2cddba1 100644
--- a/src/polypcore/hashmap.c
+++ b/src/pulsecore/hashmap.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,10 +27,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "hashmap.h"
 
diff --git a/src/polypcore/hashmap.h b/src/pulsecore/hashmap.h
similarity index 89%
rename from src/polypcore/hashmap.h
rename to src/pulsecore/hashmap.h
index 14f8270..3f62adb 100644
--- a/src/polypcore/hashmap.h
+++ b/src/pulsecore/hashmap.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/idxset.c b/src/pulsecore/idxset.c
similarity index 97%
rename from src/polypcore/idxset.c
rename to src/pulsecore/idxset.c
index bde5c27..ddce623 100644
--- a/src/polypcore/idxset.c
+++ b/src/pulsecore/idxset.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "idxset.h"
 
diff --git a/src/polypcore/idxset.h b/src/pulsecore/idxset.h
similarity index 94%
rename from src/polypcore/idxset.h
rename to src/pulsecore/idxset.h
index 17ae16c..3d0bc75 100644
--- a/src/polypcore/idxset.h
+++ b/src/pulsecore/idxset.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/inet_ntop.c b/src/pulsecore/inet_ntop.c
similarity index 90%
rename from src/polypcore/inet_ntop.c
rename to src/pulsecore/inet_ntop.c
index a25c3c9..483c3e2 100644
--- a/src/polypcore/inet_ntop.c
+++ b/src/pulsecore/inet_ntop.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/inet_ntop.h b/src/pulsecore/inet_ntop.h
similarity index 100%
rename from src/polypcore/inet_ntop.h
rename to src/pulsecore/inet_ntop.h
diff --git a/src/polypcore/inet_pton.c b/src/pulsecore/inet_pton.c
similarity index 84%
rename from src/polypcore/inet_pton.c
rename to src/pulsecore/inet_pton.c
index 17860f6..7b6bbc3 100644
--- a/src/polypcore/inet_pton.c
+++ b/src/pulsecore/inet_pton.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/inet_pton.h b/src/pulsecore/inet_pton.h
similarity index 100%
rename from src/polypcore/inet_pton.h
rename to src/pulsecore/inet_pton.h
diff --git a/src/polypcore/iochannel.c b/src/pulsecore/iochannel.c
similarity index 96%
rename from src/polypcore/iochannel.c
rename to src/pulsecore/iochannel.c
index 106c413..8a19094 100644
--- a/src/polypcore/iochannel.c
+++ b/src/pulsecore/iochannel.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -38,12 +38,12 @@
 
 #include "winsock.h"
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "iochannel.h"
 
diff --git a/src/polypcore/iochannel.h b/src/pulsecore/iochannel.h
similarity index 92%
rename from src/polypcore/iochannel.h
rename to src/pulsecore/iochannel.h
index fe7cc0c..64cf331 100644
--- a/src/polypcore/iochannel.h
+++ b/src/pulsecore/iochannel.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
+#include 
 
 /* A wrapper around UNIX file descriptors for attaching them to the a
    main event loop. Everytime new data may be read or be written to
diff --git a/src/polypcore/ioline.c b/src/pulsecore/ioline.c
similarity index 96%
rename from src/polypcore/ioline.c
rename to src/pulsecore/ioline.c
index b908f96..9c9900f 100644
--- a/src/polypcore/ioline.c
+++ b/src/pulsecore/ioline.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,10 +29,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "ioline.h"
 
diff --git a/src/polypcore/ioline.h b/src/pulsecore/ioline.h
similarity index 83%
rename from src/polypcore/ioline.h
rename to src/pulsecore/ioline.h
index 77bf876..e736e2b 100644
--- a/src/polypcore/ioline.h
+++ b/src/pulsecore/ioline.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 /* An ioline wraps an iochannel for line based communication. A
  * callback function is called whenever a new line has been recieved
diff --git a/src/polypcore/llist.h b/src/pulsecore/llist.h
similarity index 92%
rename from src/polypcore/llist.h
rename to src/pulsecore/llist.h
index c54742d..bf3c150 100644
--- a/src/polypcore/llist.h
+++ b/src/pulsecore/llist.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/log.c b/src/pulsecore/log.c
similarity index 94%
rename from src/polypcore/log.c
rename to src/pulsecore/log.c
index 6cdffa5..df5b140 100644
--- a/src/polypcore/log.c
+++ b/src/pulsecore/log.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,10 +33,10 @@
 #include 
 #endif
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
+#include 
 
 #include "log.h"
 
diff --git a/src/polypcore/log.h b/src/pulsecore/log.h
similarity index 89%
rename from src/polypcore/log.h
rename to src/pulsecore/log.h
index c306aca..7bf4e40 100644
--- a/src/polypcore/log.h
+++ b/src/pulsecore/log.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
-#include 
+#include 
 
 /* A simple logging subsystem */
 
diff --git a/src/polypcore/mcalign.c b/src/pulsecore/mcalign.c
similarity index 95%
rename from src/polypcore/mcalign.c
rename to src/pulsecore/mcalign.c
index d9267f9..8283a7a 100644
--- a/src/polypcore/mcalign.c
+++ b/src/pulsecore/mcalign.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "mcalign.h"
 
diff --git a/src/polypcore/mcalign.h b/src/pulsecore/mcalign.h
similarity index 87%
rename from src/polypcore/mcalign.h
rename to src/pulsecore/mcalign.h
index 5801946..80e3749 100644
--- a/src/polypcore/mcalign.h
+++ b/src/pulsecore/mcalign.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 /* An alignment object, used for aligning memchunks to multiples of
  * the frame size. */
diff --git a/src/polypcore/memblock.c b/src/pulsecore/memblock.c
similarity index 93%
rename from src/polypcore/memblock.c
rename to src/pulsecore/memblock.c
index a0e5135..36de17f 100644
--- a/src/polypcore/memblock.c
+++ b/src/pulsecore/memblock.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "memblock.h"
 
diff --git a/src/polypcore/memblock.h b/src/pulsecore/memblock.h
similarity index 93%
rename from src/polypcore/memblock.h
rename to src/pulsecore/memblock.h
index 9471278..f854583 100644
--- a/src/polypcore/memblock.h
+++ b/src/pulsecore/memblock.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/memblockq.c b/src/pulsecore/memblockq.c
similarity index 98%
rename from src/polypcore/memblockq.c
rename to src/pulsecore/memblockq.c
index 8ed358f..ff199f1 100644
--- a/src/polypcore/memblockq.c
+++ b/src/pulsecore/memblockq.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,10 +30,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "memblockq.h"
 
diff --git a/src/polypcore/memblockq.h b/src/pulsecore/memblockq.h
similarity index 93%
rename from src/polypcore/memblockq.h
rename to src/pulsecore/memblockq.h
index 74fb00e..c35b62d 100644
--- a/src/polypcore/memblockq.h
+++ b/src/pulsecore/memblockq.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,9 +25,9 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 /* A memblockq is a queue of pa_memchunks (yepp, the name is not
  * perfect). It is similar to the ring buffers used by most other
diff --git a/src/polypcore/memchunk.c b/src/pulsecore/memchunk.c
similarity index 84%
rename from src/polypcore/memchunk.c
rename to src/pulsecore/memchunk.c
index 918b3f0..abfc2ca 100644
--- a/src/polypcore/memchunk.c
+++ b/src/pulsecore/memchunk.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "memchunk.h"
 
diff --git a/src/polypcore/memchunk.h b/src/pulsecore/memchunk.h
similarity index 83%
rename from src/polypcore/memchunk.h
rename to src/pulsecore/memchunk.h
index 3ddb28e..1b26c2e 100644
--- a/src/polypcore/memchunk.h
+++ b/src/pulsecore/memchunk.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 /* A memchunk describes a part of a memblock. In contrast to the memblock, a
  * memchunk is not allocated dynamically or reference counted, instead
diff --git a/src/polypcore/modargs.c b/src/pulsecore/modargs.c
similarity index 94%
rename from src/polypcore/modargs.c
rename to src/pulsecore/modargs.c
index 5d046d2..13a4878 100644
--- a/src/polypcore/modargs.c
+++ b/src/pulsecore/modargs.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,15 +28,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "modargs.h"
 
diff --git a/src/polypcore/modargs.h b/src/pulsecore/modargs.h
similarity index 87%
rename from src/polypcore/modargs.h
rename to src/pulsecore/modargs.h
index b6977d3..730cf39 100644
--- a/src/polypcore/modargs.h
+++ b/src/pulsecore/modargs.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_modargs pa_modargs;
 
diff --git a/src/polypcore/modinfo.c b/src/pulsecore/modinfo.c
similarity index 87%
rename from src/polypcore/modinfo.c
rename to src/pulsecore/modinfo.c
index a2fffb0..adefdb4 100644
--- a/src/polypcore/modinfo.c
+++ b/src/pulsecore/modinfo.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "modinfo.h"
 
diff --git a/src/polypcore/modinfo.h b/src/pulsecore/modinfo.h
similarity index 82%
rename from src/polypcore/modinfo.h
rename to src/pulsecore/modinfo.h
index 5317614..f39cee3 100644
--- a/src/polypcore/modinfo.h
+++ b/src/pulsecore/modinfo.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/module.c b/src/pulsecore/module.c
similarity index 95%
rename from src/polypcore/module.c
rename to src/pulsecore/module.c
index 47a878f..e7dca78 100644
--- a/src/polypcore/module.c
+++ b/src/pulsecore/module.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,12 +31,12 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "module.h"
 
diff --git a/src/polypcore/module.h b/src/pulsecore/module.h
similarity index 85%
rename from src/polypcore/module.h
rename to src/pulsecore/module.h
index 03b9bc8..9bc5cb5 100644
--- a/src/polypcore/module.h
+++ b/src/pulsecore/module.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,8 +25,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 typedef struct pa_module pa_module;
 
diff --git a/src/polypcore/namereg.c b/src/pulsecore/namereg.c
similarity index 92%
rename from src/polypcore/namereg.c
rename to src/pulsecore/namereg.c
index 17d7514..0f35ed1 100644
--- a/src/polypcore/namereg.c
+++ b/src/pulsecore/namereg.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,13 +29,13 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "namereg.h"
 
diff --git a/src/polypcore/namereg.h b/src/pulsecore/namereg.h
similarity index 82%
rename from src/polypcore/namereg.h
rename to src/pulsecore/namereg.h
index a98295f..e1aef8b 100644
--- a/src/polypcore/namereg.h
+++ b/src/pulsecore/namereg.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 typedef enum pa_namereg_type {
     PA_NAMEREG_SINK,
diff --git a/src/polypcore/native-common.h b/src/pulsecore/native-common.h
similarity index 91%
rename from src/polypcore/native-common.h
rename to src/pulsecore/native-common.h
index 1107da5..b35931d 100644
--- a/src/polypcore/native-common.h
+++ b/src/pulsecore/native-common.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 PA_C_DECL_BEGIN
 
@@ -112,7 +112,7 @@ enum {
 };
 
 #define PA_NATIVE_COOKIE_LENGTH 256
-#define PA_NATIVE_COOKIE_FILE ".polypaudio-cookie"
+#define PA_NATIVE_COOKIE_FILE ".pulseaudio-cookie"
 
 #define PA_NATIVE_DEFAULT_PORT 4713
 
diff --git a/src/polypcore/packet.c b/src/pulsecore/packet.c
similarity index 85%
rename from src/polypcore/packet.c
rename to src/pulsecore/packet.c
index 646b59e..8b010f0 100644
--- a/src/polypcore/packet.c
+++ b/src/pulsecore/packet.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "packet.h"
 
diff --git a/src/polypcore/packet.h b/src/pulsecore/packet.h
similarity index 81%
rename from src/polypcore/packet.h
rename to src/pulsecore/packet.h
index fbc5823..7842857 100644
--- a/src/polypcore/packet.h
+++ b/src/pulsecore/packet.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/parseaddr.c b/src/pulsecore/parseaddr.c
similarity index 90%
rename from src/polypcore/parseaddr.c
rename to src/pulsecore/parseaddr.c
index d0687b0..da1647a 100644
--- a/src/polypcore/parseaddr.c
+++ b/src/pulsecore/parseaddr.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,10 +27,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "parseaddr.h"
 
diff --git a/src/polypcore/parseaddr.h b/src/pulsecore/parseaddr.h
similarity index 81%
rename from src/polypcore/parseaddr.h
rename to src/pulsecore/parseaddr.h
index eff9dd3..0393f66 100644
--- a/src/polypcore/parseaddr.h
+++ b/src/pulsecore/parseaddr.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/pdispatch.c b/src/pulsecore/pdispatch.c
similarity index 95%
rename from src/polypcore/pdispatch.c
rename to src/pulsecore/pdispatch.c
index c6f90ba..5b76b43 100644
--- a/src/polypcore/pdispatch.c
+++ b/src/pulsecore/pdispatch.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,13 +27,13 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "pdispatch.h"
 
diff --git a/src/polypcore/pdispatch.h b/src/pulsecore/pdispatch.h
similarity index 82%
rename from src/polypcore/pdispatch.h
rename to src/pulsecore/pdispatch.h
index 0074e8b..07620e5 100644
--- a/src/polypcore/pdispatch.h
+++ b/src/pulsecore/pdispatch.h
@@ -4,29 +4,29 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_pdispatch pa_pdispatch;
 
diff --git a/src/polypcore/pid.c b/src/pulsecore/pid.c
similarity index 95%
rename from src/polypcore/pid.c
rename to src/pulsecore/pid.c
index a5c0ef0..b897286 100644
--- a/src/polypcore/pid.c
+++ b/src/pulsecore/pid.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -39,11 +39,11 @@
 #include 
 #endif
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "pid.h"
 
diff --git a/src/polypcore/pid.h b/src/pulsecore/pid.h
similarity index 76%
rename from src/polypcore/pid.h
rename to src/pulsecore/pid.h
index 906ab6d..bd476b2 100644
--- a/src/polypcore/pid.h
+++ b/src/pulsecore/pid.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/pipe.c b/src/pulsecore/pipe.c
similarity index 93%
rename from src/polypcore/pipe.c
rename to src/pulsecore/pipe.c
index eef6d53..6933e18 100644
--- a/src/polypcore/pipe.c
+++ b/src/pulsecore/pipe.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-   This file is part of polypaudio.
+   This file is part of PulseAudio.
 
-   polypaudio is free software; you can redistribute it and/or modify it
+   PulseAudio is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   polypaudio is distributed in the hope that it will be useful, but
+   PulseAudio is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with polypaudio; If not, write to the Free Software
+   License along with PulseAudio; If not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.
 ***/
diff --git a/src/polypcore/pipe.h b/src/pulsecore/pipe.h
similarity index 74%
rename from src/polypcore/pipe.h
rename to src/pulsecore/pipe.h
index 276b072..a251476 100644
--- a/src/polypcore/pipe.h
+++ b/src/pulsecore/pipe.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-   This file is part of polypaudio.
+   This file is part of PulseAudio.
 
-   polypaudio is free software; you can redistribute it and/or modify it
+   PulseAudio is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   polypaudio is distributed in the hope that it will be useful, but
+   PulseAudio is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with polypaudio; If not, write to the Free Software
+   License along with PulseAudio; If not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.
 ***/
diff --git a/src/polypcore/play-memchunk.c b/src/pulsecore/play-memchunk.c
similarity index 88%
rename from src/polypcore/play-memchunk.c
rename to src/pulsecore/play-memchunk.c
index 982cedc..7ac579e 100644
--- a/src/polypcore/play-memchunk.c
+++ b/src/pulsecore/play-memchunk.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,10 +28,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "play-memchunk.h"
 
diff --git a/src/polypcore/play-memchunk.h b/src/pulsecore/play-memchunk.h
similarity index 73%
rename from src/polypcore/play-memchunk.h
rename to src/pulsecore/play-memchunk.h
index 72aeda9..3d5b8cc 100644
--- a/src/polypcore/play-memchunk.h
+++ b/src/pulsecore/play-memchunk.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 int pa_play_memchunk(
     pa_sink *sink,
diff --git a/src/polypcore/poll.c b/src/pulsecore/poll.c
similarity index 95%
rename from src/polypcore/poll.c
rename to src/pulsecore/poll.c
index 7b1ed43..3f9ace7 100644
--- a/src/polypcore/poll.c
+++ b/src/pulsecore/poll.c
@@ -3,21 +3,21 @@
 /***
    Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
    Copyright (C) 2005, Cendio AB.
-   This file is part of polypaudio.
+   This file is part of PulseAudio.
    Based on work for the GNU C Library.
 
-   polypaudio is free software; you can redistribute it and/or modify it
+   PulseAudio is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   polypaudio is distributed in the hope that it will be useful, but
+   PulseAudio is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with polypaudio; If not, write to the Free Software
+   License along with PulseAudio; If not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.
 ***/
@@ -42,7 +42,7 @@
 
 #ifndef HAVE_SYS_POLL_H
 
-#include 
+#include 
 
 #include "poll.h"
 
diff --git a/src/polypcore/poll.h b/src/pulsecore/poll.h
similarity index 91%
rename from src/polypcore/poll.h
rename to src/pulsecore/poll.h
index c201014..bed772c 100644
--- a/src/polypcore/poll.h
+++ b/src/pulsecore/poll.h
@@ -4,21 +4,21 @@
    Compatibility definitions for System V `poll' interface.
    Copyright (C) 1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
    Copyright (C) 2005, Cendio AB.
-   This file is part of polypaudio.
+   This file is part of PulseAudio.
    Based on work for the GNU C Library.
 
-   polypaudio is free software; you can redistribute it and/or modify it
+   PulseAudio is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
-   polypaudio is distributed in the hope that it will be useful, but
+   PulseAudio is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public
-   License along with polypaudio; If not, write to the Free Software
+   License along with PulseAudio; If not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.
 ***/
diff --git a/src/polypcore/props.c b/src/pulsecore/props.c
similarity index 90%
rename from src/polypcore/props.c
rename to src/pulsecore/props.c
index 1db44ee..8879b7a 100644
--- a/src/polypcore/props.c
+++ b/src/pulsecore/props.c
@@ -1,29 +1,29 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
+#include 
 
-#include 
+#include 
 
 #include "props.h"
 
diff --git a/src/polypcore/props.h b/src/pulsecore/props.h
similarity index 86%
rename from src/polypcore/props.h
rename to src/pulsecore/props.h
index 9430db5..39b7ca6 100644
--- a/src/polypcore/props.h
+++ b/src/pulsecore/props.h
@@ -4,26 +4,26 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
+#include 
+#include 
 
 /* The property subsystem is to be used to share data between
  * modules. Consider them to be kind of "global" variables for a
diff --git a/src/polypcore/protocol-cli.c b/src/pulsecore/protocol-cli.c
similarity index 88%
rename from src/polypcore/protocol-cli.c
rename to src/pulsecore/protocol-cli.c
index 076411c..c5854f1 100644
--- a/src/polypcore/protocol-cli.c
+++ b/src/pulsecore/protocol-cli.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "protocol-cli.h"
 
diff --git a/src/polypcore/protocol-cli.h b/src/pulsecore/protocol-cli.h
similarity index 69%
rename from src/polypcore/protocol-cli.h
rename to src/pulsecore/protocol-cli.h
index c47b14d..84101e1 100644
--- a/src/polypcore/protocol-cli.h
+++ b/src/pulsecore/protocol-cli.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_protocol_cli pa_protocol_cli;
 
diff --git a/src/polypcore/protocol-esound.c b/src/pulsecore/protocol-esound.c
similarity index 98%
rename from src/polypcore/protocol-esound.c
rename to src/pulsecore/protocol-esound.c
index c9bc504..6b9112b 100644
--- a/src/polypcore/protocol-esound.c
+++ b/src/pulsecore/protocol-esound.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,25 +30,25 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "endianmacros.h"
 
diff --git a/src/polypcore/protocol-esound.h b/src/pulsecore/protocol-esound.h
similarity index 70%
rename from src/polypcore/protocol-esound.h
rename to src/pulsecore/protocol-esound.h
index a94d1c7..79b5acf 100644
--- a/src/polypcore/protocol-esound.h
+++ b/src/pulsecore/protocol-esound.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_protocol_esound pa_protocol_esound;
 
diff --git a/src/polypcore/protocol-http.c b/src/pulsecore/protocol-http.c
similarity index 95%
rename from src/polypcore/protocol-http.c
rename to src/pulsecore/protocol-http.c
index 86ea3b1..d0d9262 100644
--- a/src/polypcore/protocol-http.c
+++ b/src/pulsecore/protocol-http.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,13 +28,13 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "protocol-http.h"
 
diff --git a/src/polypcore/protocol-http.h b/src/pulsecore/protocol-http.h
similarity index 70%
rename from src/polypcore/protocol-http.h
rename to src/pulsecore/protocol-http.h
index 10dd656..5d5dba3 100644
--- a/src/polypcore/protocol-http.h
+++ b/src/pulsecore/protocol-http.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_protocol_http pa_protocol_http;
 
diff --git a/src/polypcore/protocol-native.c b/src/pulsecore/protocol-native.c
similarity index 98%
rename from src/polypcore/protocol-native.c
rename to src/pulsecore/protocol-native.c
index 221601a..1f936e7 100644
--- a/src/polypcore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,32 +29,32 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "protocol-native.h"
 
diff --git a/src/polypcore/protocol-native.h b/src/pulsecore/protocol-native.h
similarity index 73%
rename from src/polypcore/protocol-native.h
rename to src/pulsecore/protocol-native.h
index 88aa849..5b09101 100644
--- a/src/polypcore/protocol-native.h
+++ b/src/pulsecore/protocol-native.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_protocol_native pa_protocol_native;
 
diff --git a/src/polypcore/protocol-simple.c b/src/pulsecore/protocol-simple.c
similarity index 96%
rename from src/polypcore/protocol-simple.c
rename to src/pulsecore/protocol-simple.c
index 8b319d7..4d73bd2 100644
--- a/src/polypcore/protocol-simple.c
+++ b/src/pulsecore/protocol-simple.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,15 +30,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "protocol-simple.h"
 
diff --git a/src/polypcore/protocol-simple.h b/src/pulsecore/protocol-simple.h
similarity index 70%
rename from src/polypcore/protocol-simple.h
rename to src/pulsecore/protocol-simple.h
index f11c775..8dfaee3 100644
--- a/src/polypcore/protocol-simple.h
+++ b/src/pulsecore/protocol-simple.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_protocol_simple pa_protocol_simple;
 
diff --git a/src/polypcore/pstream-util.c b/src/pulsecore/pstream-util.c
similarity index 85%
rename from src/polypcore/pstream-util.c
rename to src/pulsecore/pstream-util.c
index bd1d1a8..3a99532 100644
--- a/src/polypcore/pstream-util.c
+++ b/src/pulsecore/pstream-util.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -25,7 +25,7 @@
 
 #include 
 
-#include 
+#include 
 
 #include "pstream-util.h"
 
diff --git a/src/polypcore/pstream-util.h b/src/pulsecore/pstream-util.h
similarity index 77%
rename from src/polypcore/pstream-util.h
rename to src/pulsecore/pstream-util.h
index f2677a4..fc6d18c 100644
--- a/src/polypcore/pstream-util.h
+++ b/src/pulsecore/pstream-util.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 /* The tagstruct is freed!*/
 void pa_pstream_send_tagstruct_with_creds(pa_pstream *p, pa_tagstruct *t, int creds);
diff --git a/src/polypcore/pstream.c b/src/pulsecore/pstream.c
similarity index 97%
rename from src/polypcore/pstream.c
rename to src/pulsecore/pstream.c
index 074cab9..60c0593 100644
--- a/src/polypcore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,11 +34,11 @@
 
 #include "winsock.h"
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "pstream.h"
 
diff --git a/src/polypcore/pstream.h b/src/pulsecore/pstream.h
similarity index 81%
rename from src/polypcore/pstream.h
rename to src/pulsecore/pstream.h
index feb1b15..1a2932d 100644
--- a/src/polypcore/pstream.h
+++ b/src/pulsecore/pstream.h
@@ -4,32 +4,32 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_pstream pa_pstream;
 
diff --git a/src/polypcore/queue.c b/src/pulsecore/queue.c
similarity index 88%
rename from src/polypcore/queue.c
rename to src/pulsecore/queue.c
index 01f957d..93b119e 100644
--- a/src/polypcore/queue.c
+++ b/src/pulsecore/queue.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,7 +26,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "queue.h"
 
diff --git a/src/polypcore/queue.h b/src/pulsecore/queue.h
similarity index 83%
rename from src/polypcore/queue.h
rename to src/pulsecore/queue.h
index 3edcfb6..3fb9dea 100644
--- a/src/polypcore/queue.h
+++ b/src/pulsecore/queue.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/random.c b/src/pulsecore/random.c
similarity index 88%
rename from src/polypcore/random.c
rename to src/pulsecore/random.c
index d7a37b0..3d3357a 100644
--- a/src/polypcore/random.c
+++ b/src/pulsecore/random.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,8 +31,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "random.h"
 
diff --git a/src/polypcore/random.h b/src/pulsecore/random.h
similarity index 75%
rename from src/polypcore/random.h
rename to src/pulsecore/random.h
index 1f152dc..f809afe 100644
--- a/src/polypcore/random.h
+++ b/src/pulsecore/random.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/resampler.c b/src/pulsecore/resampler.c
similarity index 98%
rename from src/polypcore/resampler.c
rename to src/pulsecore/resampler.c
index 33e8c29..23cdf38 100644
--- a/src/polypcore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,10 +30,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "resampler.h"
 
diff --git a/src/polypcore/resampler.h b/src/pulsecore/resampler.h
similarity index 86%
rename from src/polypcore/resampler.h
rename to src/pulsecore/resampler.h
index 2f4d3cb..c1199e5 100644
--- a/src/polypcore/resampler.h
+++ b/src/pulsecore/resampler.h
@@ -4,30 +4,30 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_resampler pa_resampler;
 
diff --git a/src/polypcore/sample-util.c b/src/pulsecore/sample-util.c
similarity index 98%
rename from src/polypcore/sample-util.c
rename to src/pulsecore/sample-util.c
index 7a75ce1..638f806 100644
--- a/src/polypcore/sample-util.c
+++ b/src/pulsecore/sample-util.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,7 +30,7 @@
 
 #include 
 
-#include 
+#include 
 
 #include "sample-util.h"
 #include "endianmacros.h"
diff --git a/src/polypcore/sample-util.h b/src/pulsecore/sample-util.h
similarity index 79%
rename from src/polypcore/sample-util.h
rename to src/pulsecore/sample-util.h
index da7f56e..3ebb7e2 100644
--- a/src/polypcore/sample-util.h
+++ b/src/pulsecore/sample-util.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 pa_memblock *pa_silence_memblock(pa_memblock* b, const pa_sample_spec *spec);
 pa_memblock *pa_silence_memblock_new(const pa_sample_spec *spec, size_t length, pa_memblock_stat*s);
diff --git a/src/polypcore/sconv-s16be.c b/src/pulsecore/sconv-s16be.c
similarity index 80%
rename from src/polypcore/sconv-s16be.c
rename to src/pulsecore/sconv-s16be.c
index 8b076f0..5ac9632 100644
--- a/src/polypcore/sconv-s16be.c
+++ b/src/pulsecore/sconv-s16be.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/sconv-s16be.h b/src/pulsecore/sconv-s16be.h
similarity index 77%
rename from src/polypcore/sconv-s16be.h
rename to src/pulsecore/sconv-s16be.h
index b2b6a8c..bd3fd34 100644
--- a/src/polypcore/sconv-s16be.h
+++ b/src/pulsecore/sconv-s16be.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/sconv-s16le.c b/src/pulsecore/sconv-s16le.c
similarity index 86%
rename from src/polypcore/sconv-s16le.c
rename to src/pulsecore/sconv-s16le.c
index 0814c35..d8b93cb 100644
--- a/src/polypcore/sconv-s16le.c
+++ b/src/pulsecore/sconv-s16le.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,8 +28,8 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "endianmacros.h"
 
diff --git a/src/polypcore/sconv-s16le.h b/src/pulsecore/sconv-s16le.h
similarity index 77%
rename from src/polypcore/sconv-s16le.h
rename to src/pulsecore/sconv-s16le.h
index ef5e31e..ae6e22d 100644
--- a/src/polypcore/sconv-s16le.h
+++ b/src/pulsecore/sconv-s16le.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/sconv.c b/src/pulsecore/sconv.c
similarity index 93%
rename from src/polypcore/sconv.c
rename to src/pulsecore/sconv.c
index c557be6..ff2a011 100644
--- a/src/polypcore/sconv.c
+++ b/src/pulsecore/sconv.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,7 +30,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "endianmacros.h"
 #include "sconv-s16le.h"
diff --git a/src/polypcore/sconv.h b/src/pulsecore/sconv.h
similarity index 79%
rename from src/polypcore/sconv.h
rename to src/pulsecore/sconv.h
index a0c15c2..4aba069 100644
--- a/src/polypcore/sconv.h
+++ b/src/pulsecore/sconv.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 typedef void (*pa_convert_to_float32ne_func_t)(unsigned n, const void *a, float *b);
 typedef void (*pa_convert_from_float32ne_func_t)(unsigned n, const float *a, void *b);
diff --git a/src/polypcore/sink-input.c b/src/pulsecore/sink-input.c
similarity index 96%
rename from src/polypcore/sink-input.c
rename to src/pulsecore/sink-input.c
index bd2a1dc..8590a0b 100644
--- a/src/polypcore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,12 +28,12 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "sink-input.h"
 
diff --git a/src/polypcore/sink-input.h b/src/pulsecore/sink-input.h
similarity index 86%
rename from src/polypcore/sink-input.h
rename to src/pulsecore/sink-input.h
index 4cf4460..69a7e50 100644
--- a/src/polypcore/sink-input.h
+++ b/src/pulsecore/sink-input.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,12 +26,12 @@
 
 typedef struct pa_sink_input pa_sink_input;
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef enum pa_sink_input_state {
     PA_SINK_INPUT_RUNNING,
diff --git a/src/polypcore/sink.c b/src/pulsecore/sink.c
similarity index 95%
rename from src/polypcore/sink.c
rename to src/pulsecore/sink.c
index dc27ca2..ee6850f 100644
--- a/src/polypcore/sink.c
+++ b/src/pulsecore/sink.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,16 +28,16 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "sink.h"
 
diff --git a/src/polypcore/sink.h b/src/pulsecore/sink.h
similarity index 83%
rename from src/polypcore/sink.h
rename to src/pulsecore/sink.h
index 59d4559..fdff052 100644
--- a/src/polypcore/sink.h
+++ b/src/pulsecore/sink.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,14 +26,14 @@
 
 typedef struct pa_sink pa_sink;
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #define PA_MAX_INPUTS_PER_SINK 32
 
diff --git a/src/polypcore/sioman.c b/src/pulsecore/sioman.c
similarity index 79%
rename from src/polypcore/sioman.c
rename to src/pulsecore/sioman.c
index b389ece..d84010e 100644
--- a/src/polypcore/sioman.c
+++ b/src/pulsecore/sioman.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/sioman.h b/src/pulsecore/sioman.h
similarity index 74%
rename from src/polypcore/sioman.h
rename to src/pulsecore/sioman.h
index 840d93f..cd04d14 100644
--- a/src/polypcore/sioman.h
+++ b/src/pulsecore/sioman.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/socket-client.c b/src/pulsecore/socket-client.c
similarity index 96%
rename from src/polypcore/socket-client.c
rename to src/pulsecore/socket-client.c
index efb6de9..8e54761 100644
--- a/src/polypcore/socket-client.c
+++ b/src/pulsecore/socket-client.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -54,14 +54,14 @@
 
 #include "winsock.h"
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "socket-client.h"
 
diff --git a/src/polypcore/socket-client.h b/src/pulsecore/socket-client.h
similarity index 83%
rename from src/polypcore/socket-client.h
rename to src/pulsecore/socket-client.h
index d000533..47e7cd5 100644
--- a/src/polypcore/socket-client.h
+++ b/src/pulsecore/socket-client.h
@@ -4,28 +4,28 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 struct sockaddr;
 
diff --git a/src/polypcore/socket-server.c b/src/pulsecore/socket-server.c
similarity index 97%
rename from src/polypcore/socket-server.c
rename to src/pulsecore/socket-server.c
index 17071ec..77ea13e 100644
--- a/src/polypcore/socket-server.c
+++ b/src/pulsecore/socket-server.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -62,13 +62,13 @@
 
 #include "winsock.h"
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "socket-server.h"
 
diff --git a/src/polypcore/socket-server.h b/src/pulsecore/socket-server.h
similarity index 88%
rename from src/polypcore/socket-server.h
rename to src/pulsecore/socket-server.h
index cd3276a..d90c819 100644
--- a/src/polypcore/socket-server.h
+++ b/src/pulsecore/socket-server.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
-#include 
-#include 
+#include 
+#include 
 
 /* It is safe to destroy the calling socket_server object from the callback */
 
diff --git a/src/polypcore/socket-util.c b/src/pulsecore/socket-util.c
similarity index 94%
rename from src/polypcore/socket-util.c
rename to src/pulsecore/socket-util.c
index 3cd205d..8705560 100644
--- a/src/polypcore/socket-util.c
+++ b/src/pulsecore/socket-util.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -66,11 +66,11 @@
 
 #include "winsock.h"
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "socket-util.h"
 
diff --git a/src/polypcore/socket-util.h b/src/pulsecore/socket-util.h
similarity index 80%
rename from src/polypcore/socket-util.h
rename to src/pulsecore/socket-util.h
index ae16fb1..f8248ae 100644
--- a/src/polypcore/socket-util.h
+++ b/src/pulsecore/socket-util.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/sound-file-stream.c b/src/pulsecore/sound-file-stream.c
similarity index 93%
rename from src/polypcore/sound-file-stream.c
rename to src/pulsecore/sound-file-stream.c
index 68fd8a8..386f5bd 100644
--- a/src/polypcore/sound-file-stream.c
+++ b/src/pulsecore/sound-file-stream.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,10 +30,10 @@
 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "sound-file-stream.h"
 
diff --git a/src/polypcore/sound-file-stream.h b/src/pulsecore/sound-file-stream.h
similarity index 73%
rename from src/polypcore/sound-file-stream.h
rename to src/pulsecore/sound-file-stream.h
index 5effc7f..28e6a8b 100644
--- a/src/polypcore/sound-file-stream.h
+++ b/src/pulsecore/sound-file-stream.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 int pa_play_file(pa_sink *sink, const char *fname, const pa_cvolume *volume);
 
diff --git a/src/polypcore/sound-file.c b/src/pulsecore/sound-file.c
similarity index 93%
rename from src/polypcore/sound-file.c
rename to src/pulsecore/sound-file.c
index bd0cf59..d11d4b9 100644
--- a/src/polypcore/sound-file.c
+++ b/src/pulsecore/sound-file.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,8 +28,8 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "sound-file.h"
 #include "core-scache.h"
diff --git a/src/polypcore/sound-file.h b/src/pulsecore/sound-file.h
similarity index 71%
rename from src/polypcore/sound-file.h
rename to src/pulsecore/sound-file.h
index 9d687f9..0b81d97 100644
--- a/src/polypcore/sound-file.h
+++ b/src/pulsecore/sound-file.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_channel_map *map, pa_memchunk *chunk, pa_memblock_stat *s);
 
diff --git a/src/polypcore/source-output.c b/src/pulsecore/source-output.c
similarity index 94%
rename from src/polypcore/source-output.c
rename to src/pulsecore/source-output.c
index 8ac3a33..230b416 100644
--- a/src/polypcore/source-output.c
+++ b/src/pulsecore/source-output.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "source-output.h"
 
diff --git a/src/polypcore/source-output.h b/src/pulsecore/source-output.h
similarity index 84%
rename from src/polypcore/source-output.h
rename to src/pulsecore/source-output.h
index 1c61205..ef398dd 100644
--- a/src/polypcore/source-output.h
+++ b/src/pulsecore/source-output.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,12 +26,12 @@
 
 typedef struct pa_source_output pa_source_output;
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 typedef enum {
     PA_SOURCE_OUTPUT_RUNNING,
diff --git a/src/polypcore/source.c b/src/pulsecore/source.c
similarity index 94%
rename from src/polypcore/source.c
rename to src/pulsecore/source.c
index c53bf07..84151a9 100644
--- a/src/polypcore/source.c
+++ b/src/pulsecore/source.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,14 +28,14 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "source.h"
 
diff --git a/src/polypcore/source.h b/src/pulsecore/source.h
similarity index 81%
rename from src/polypcore/source.h
rename to src/pulsecore/source.h
index 63b7762..6255c11 100644
--- a/src/polypcore/source.h
+++ b/src/pulsecore/source.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,16 +26,16 @@ typedef struct pa_source pa_source;
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #define PA_MAX_OUTPUTS_PER_SOURCE 16
 
diff --git a/src/polypcore/strbuf.c b/src/pulsecore/strbuf.c
similarity index 93%
rename from src/polypcore/strbuf.c
rename to src/pulsecore/strbuf.c
index d1517a1..ef8160d 100644
--- a/src/polypcore/strbuf.c
+++ b/src/pulsecore/strbuf.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -30,7 +30,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include "strbuf.h"
 
diff --git a/src/polypcore/strbuf.h b/src/pulsecore/strbuf.h
similarity index 79%
rename from src/polypcore/strbuf.h
rename to src/pulsecore/strbuf.h
index 4b06a7e..c45fb15 100644
--- a/src/polypcore/strbuf.h
+++ b/src/pulsecore/strbuf.h
@@ -4,25 +4,25 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
-#include 
+#include 
 
 typedef struct pa_strbuf pa_strbuf;
 
diff --git a/src/polypcore/strlist.c b/src/pulsecore/strlist.c
similarity index 89%
rename from src/polypcore/strlist.c
rename to src/pulsecore/strlist.c
index b942074..df3a027 100644
--- a/src/polypcore/strlist.c
+++ b/src/pulsecore/strlist.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -26,10 +26,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "strlist.h"
 
diff --git a/src/polypcore/strlist.h b/src/pulsecore/strlist.h
similarity index 86%
rename from src/polypcore/strlist.h
rename to src/pulsecore/strlist.h
index 2c54dc7..87925d5 100644
--- a/src/polypcore/strlist.h
+++ b/src/pulsecore/strlist.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/tagstruct.c b/src/pulsecore/tagstruct.c
similarity index 98%
rename from src/polypcore/tagstruct.c
rename to src/pulsecore/tagstruct.c
index 27582ca..60b05a3 100644
--- a/src/polypcore/tagstruct.c
+++ b/src/pulsecore/tagstruct.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -36,7 +36,7 @@
 
 #include "winsock.h"
 
-#include 
+#include 
 
 #include "tagstruct.h"
 
diff --git a/src/polypcore/tagstruct.h b/src/pulsecore/tagstruct.h
similarity index 90%
rename from src/polypcore/tagstruct.h
rename to src/pulsecore/tagstruct.h
index d5e6050..4c56f32 100644
--- a/src/polypcore/tagstruct.h
+++ b/src/pulsecore/tagstruct.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,9 +27,9 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 typedef struct pa_tagstruct pa_tagstruct;
 
diff --git a/src/polypcore/tokenizer.c b/src/pulsecore/tokenizer.c
similarity index 85%
rename from src/polypcore/tokenizer.c
rename to src/pulsecore/tokenizer.c
index 667643f..e799c1e 100644
--- a/src/polypcore/tokenizer.c
+++ b/src/pulsecore/tokenizer.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,10 +27,10 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #include "tokenizer.h"
 
diff --git a/src/polypcore/tokenizer.h b/src/pulsecore/tokenizer.h
similarity index 78%
rename from src/polypcore/tokenizer.h
rename to src/pulsecore/tokenizer.h
index bedacb8..b9a5c55 100644
--- a/src/polypcore/tokenizer.h
+++ b/src/pulsecore/tokenizer.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/winsock.h b/src/pulsecore/winsock.h
similarity index 100%
rename from src/polypcore/winsock.h
rename to src/pulsecore/winsock.h
diff --git a/src/polypcore/x11prop.c b/src/pulsecore/x11prop.c
similarity index 88%
rename from src/polypcore/x11prop.c
rename to src/pulsecore/x11prop.c
index e57fc13..dd4ff99 100644
--- a/src/polypcore/x11prop.c
+++ b/src/pulsecore/x11prop.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/x11prop.h b/src/pulsecore/x11prop.h
similarity index 78%
rename from src/polypcore/x11prop.h
rename to src/pulsecore/x11prop.h
index 5531c64..bd24951 100644
--- a/src/polypcore/x11prop.h
+++ b/src/pulsecore/x11prop.h
@@ -4,20 +4,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
 
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
 
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
diff --git a/src/polypcore/x11wrap.c b/src/pulsecore/x11wrap.c
similarity index 94%
rename from src/polypcore/x11wrap.c
rename to src/pulsecore/x11wrap.c
index b53a43b..2ba0a87 100644
--- a/src/polypcore/x11wrap.c
+++ b/src/pulsecore/x11wrap.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -22,11 +22,11 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include "x11wrap.h"
 
diff --git a/src/polypcore/x11wrap.h b/src/pulsecore/x11wrap.h
similarity index 85%
rename from src/polypcore/x11wrap.h
rename to src/pulsecore/x11wrap.h
index 1596986..fcdd9f6 100644
--- a/src/polypcore/x11wrap.h
+++ b/src/pulsecore/x11wrap.h
@@ -4,27 +4,27 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
 
 #include 
 
-#include 
+#include 
 
 typedef struct pa_x11_wrapper pa_x11_wrapper;
 
diff --git a/src/tests/Makefile b/src/tests/Makefile
index cd2a5c9..c110232 120000
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -1 +1 @@
-../polyp/Makefile
\ No newline at end of file
+../pulse/Makefile
\ No newline at end of file
diff --git a/src/tests/channelmap-test.c b/src/tests/channelmap-test.c
index c664422..124ce57 100644
--- a/src/tests/channelmap-test.c
+++ b/src/tests/channelmap-test.c
@@ -3,8 +3,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
     char cm[PA_CHANNEL_MAP_SNPRINT_MAX];
diff --git a/src/tests/cpulimit-test.c b/src/tests/cpulimit-test.c
index b51014c..2302a26 100644
--- a/src/tests/cpulimit-test.c
+++ b/src/tests/cpulimit-test.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,11 +29,11 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #ifdef TEST2
-#include 
+#include 
 #endif
 
 #include "../daemon/cpulimit.h"
diff --git a/src/tests/interpol-test.c b/src/tests/interpol-test.c
index fa5fae7..7cabc1c 100644
--- a/src/tests/interpol-test.c
+++ b/src/tests/interpol-test.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -34,8 +34,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 static pa_context *context = NULL;
 static pa_stream *stream = NULL;
diff --git a/src/tests/mainloop-test.c b/src/tests/mainloop-test.c
index 2936420..671adef 100644
--- a/src/tests/mainloop-test.c
+++ b/src/tests/mainloop-test.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,15 +28,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 #ifdef GLIB_MAIN_LOOP
 
 #include 
-#include 
+#include 
 
 static GMainLoop* glib_main_loop = NULL;
 
@@ -48,7 +48,7 @@ static GMainLoop* glib_main_loop = NULL;
 
 
 #else /* GLIB_MAIN_LOOP */
-#include 
+#include 
 #endif /* GLIB_MAIN_LOOP */
 
 static pa_defer_event *de;
diff --git a/src/tests/mcalign-test.c b/src/tests/mcalign-test.c
index 765dcf9..ccb0613 100644
--- a/src/tests/mcalign-test.c
+++ b/src/tests/mcalign-test.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,9 +31,9 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 /* A simple program for testing pa_mcalign */
 
diff --git a/src/tests/memblockq-test.c b/src/tests/memblockq-test.c
index e976462..af43d06 100644
--- a/src/tests/memblockq-test.c
+++ b/src/tests/memblockq-test.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,8 +27,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 int main(int argc, char *argv[]) {
     int ret;
diff --git a/src/tests/pacat-simple.c b/src/tests/pacat-simple.c
index 9d8cc92..364e1ad 100644
--- a/src/tests/pacat-simple.c
+++ b/src/tests/pacat-simple.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -29,9 +29,9 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #define BUFSIZE 1024
 
diff --git a/src/tests/parec-simple.c b/src/tests/parec-simple.c
index 4463d54..45a5228 100644
--- a/src/tests/parec-simple.c
+++ b/src/tests/parec-simple.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,9 +28,9 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #define BUFSIZE 1024
 
diff --git a/src/tests/strlist-test.c b/src/tests/strlist-test.c
index 415c94e..4262a00 100644
--- a/src/tests/strlist-test.c
+++ b/src/tests/strlist-test.c
@@ -1,8 +1,8 @@
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char* argv[]) {
     char *t, *u;
diff --git a/src/tests/sync-playback.c b/src/tests/sync-playback.c
index d675e01..39c6aac 100644
--- a/src/tests/sync-playback.c
+++ b/src/tests/sync-playback.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,8 +33,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 #define NSTREAMS 4
 #define SINE_HZ 440
diff --git a/src/tests/thread-mainloop-test.c b/src/tests/thread-mainloop-test.c
index aef3aff..bf3d4cd 100644
--- a/src/tests/thread-mainloop-test.c
+++ b/src/tests/thread-mainloop-test.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,11 +28,11 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, void *userdata) {
     fprintf(stderr, "TIME EVENT START\n");
diff --git a/src/tests/utf8-test.c b/src/tests/utf8-test.c
index 2c21613..2e9f128 100644
--- a/src/tests/utf8-test.c
+++ b/src/tests/utf8-test.c
@@ -3,8 +3,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 int main(int argc, char *argv[]) {
     char *c;
diff --git a/src/tests/voltest.c b/src/tests/voltest.c
index 4db8ef2..3de884a 100644
--- a/src/tests/voltest.c
+++ b/src/tests/voltest.c
@@ -2,8 +2,8 @@
 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
     pa_volume_t v;
diff --git a/src/utils/Makefile b/src/utils/Makefile
index cd2a5c9..c110232 120000
--- a/src/utils/Makefile
+++ b/src/utils/Makefile
@@ -1 +1 @@
-../polyp/Makefile
\ No newline at end of file
+../pulse/Makefile
\ No newline at end of file
diff --git a/src/utils/pabrowse.c b/src/utils/pabrowse.c
index 8063a28..954e4e6 100644
--- a/src/utils/pabrowse.c
+++ b/src/utils/pabrowse.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -27,8 +27,8 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
 static void exit_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {
     fprintf(stderr, "Got signal, exiting\n");
diff --git a/src/utils/pacat.c b/src/utils/pacat.c
index 99e54e6..5e4596d 100644
--- a/src/utils/pacat.c
+++ b/src/utils/pacat.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -33,7 +33,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #define TIME_EVENT_USEC 50000
 
@@ -479,7 +479,7 @@ int main(int argc, char *argv[]) {
                 goto quit;
                 
             case ARG_VERSION:
-                printf("pacat "PACKAGE_VERSION"\nCompiled with libpolyp %s\nLinked with libpolyp %s\n", pa_get_headers_version(), pa_get_library_version());
+                printf("pacat "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
                 ret = 0;
                 goto quit;
 
diff --git a/src/utils/pacmd.c b/src/utils/pacmd.c
index ad50c77..e4a0970 100644
--- a/src/utils/pacmd.c
+++ b/src/utils/pacmd.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -32,12 +32,12 @@
 #include 
 #include 
 
-#include 
-#include 
+#include 
+#include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char*argv[]) {
     pid_t pid ;
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index cc59e45..6e40f3f 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,7 +35,7 @@
 
 #include 
 
-#include 
+#include 
 
 #if PA_API_VERSION != 9
 #error Invalid Polypaudio API version
@@ -644,7 +644,7 @@ int main(int argc, char *argv[]) {
                 goto quit;
                 
             case ARG_VERSION:
-                printf("pactl "PACKAGE_VERSION"\nCompiled with libpolyp %s\nLinked with libpolyp %s\n", pa_get_headers_version(), pa_get_library_version());
+                printf("pactl "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
                 ret = 0;
                 goto quit;
 
diff --git a/src/utils/padsp b/src/utils/padsp
index 27f9933..6e7e9f0 100644
--- a/src/utils/padsp
+++ b/src/utils/padsp
@@ -2,20 +2,20 @@
 
 # $Id$
 #
-# This file is part of polypaudio.
+# This file is part of PulseAudio.
 #
-# polypaudio is free software; you can redistribute it and/or modify
+# PulseAudio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# polypaudio is distributed in the hope that it will be useful, but
+# PulseAudio is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public License
-# along with polypaudio; if not, write to the Free Software
+# along with PulseAudio; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
@@ -75,9 +75,9 @@ done
 shift $(( $OPTIND - 1 ))
 
 if [ x"$LD_PRELOAD" = x ] ; then
-   LD_PRELOAD="libpolypdsp.so"
+   LD_PRELOAD="libpulsedsp.so"
 else
-   LD_PRELOAD="$LD_PRELOAD libpolypdsp.so"
+   LD_PRELOAD="$LD_PRELOAD libpulsedsp.so"
 fi
 
 export LD_PRELOAD
diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index 56acbb2..13f571e 100644
--- a/src/utils/padsp.c
+++ b/src/utils/padsp.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -46,9 +46,9 @@
 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 typedef enum {
     FD_INFO_MIXER,
diff --git a/src/utils/paplay.c b/src/utils/paplay.c
index effc2a1..4b4a1ea 100644
--- a/src/utils/paplay.c
+++ b/src/utils/paplay.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -35,7 +35,7 @@
 
 #include 
 
-#include 
+#include 
 
 #if PA_API_VERSION != 9
 #error Invalid Polypaudio API version
@@ -253,7 +253,7 @@ int main(int argc, char *argv[]) {
                 goto quit;
                 
             case ARG_VERSION:
-                printf("paplay "PACKAGE_VERSION"\nCompiled with libpolyp %s\nLinked with libpolyp %s\n", pa_get_headers_version(), pa_get_library_version());
+                printf("paplay "PACKAGE_VERSION"\nCompiled with libpulse %s\nLinked with libpulse %s\n", pa_get_headers_version(), pa_get_library_version());
                 ret = 0;
                 goto quit;
 
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index 668361c..770455b 100644
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -1,20 +1,20 @@
 /* $Id$ */
 
 /***
-  This file is part of polypaudio.
+  This file is part of PulseAudio.
  
-  polypaudio is free software; you can redistribute it and/or modify
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
-  polypaudio is distributed in the hope that it will be useful, but
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,15 +31,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
-#include "../polyp/client-conf.h"
+#include "../pulse/client-conf.h"
 
 int main(int argc, char *argv[]) {
     const char *dname = NULL, *sink = NULL, *source = NULL, *server = NULL, *cookie_file = PA_NATIVE_COOKIE_FILE;