2 files changed, 12 insertions, 12 deletions

diff --git a/src/pulse/client-conf-x11.c b/src/pulse/client-conf-x11.c
index 7eea5ae3..e4a90017 100644
--- a/src/pulse/client-conf-x11.c
+++ b/src/pulse/client-conf-x11.c
@@ -50,22 +50,22 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
         goto finish;
     }
 
-    if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) {
+    if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t))) {
         pa_xfree(c->default_server);
         c->default_server = pa_xstrdup(t);
     }
 
-    if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t))) {
+    if (pa_x11_get_prop(d, "PULSE_SINK", t, sizeof(t))) {
         pa_xfree(c->default_sink);
         c->default_sink = pa_xstrdup(t);
     }
 
-    if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t))) {
+    if (pa_x11_get_prop(d, "PULSE_SOURCE", t, sizeof(t))) {
         pa_xfree(c->default_source);
         c->default_source = pa_xstrdup(t);
     }
 
-    if (pa_x11_get_prop(d, "POLYP_COOKIE", t, sizeof(t))) {
+    if (pa_x11_get_prop(d, "PULSE_COOKIE", t, sizeof(t))) {
         uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
 
         if (pa_parsehex(t, cookie, sizeof(cookie)) != sizeof(cookie)) {
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 9f5cf53d..e150a9cc 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -43,7 +43,7 @@
 # ifndef OS_IS_WIN32
 #  define DEFAULT_CONFIG_DIR "/etc/pulse"
 # else
-#  define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
+#  define DEFAULT_CONFIG_DIR "%PULSE_ROOT%"
 # endif
 #endif
 
@@ -56,12 +56,12 @@
 #define DEFAULT_CLIENT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "client.conf"
 #define DEFAULT_CLIENT_CONFIG_FILE_USER ".pulse" PATH_SEP "client.conf"
 
-#define ENV_CLIENT_CONFIG_FILE "POLYP_CLIENTCONFIG"
-#define ENV_DEFAULT_SINK "POLYP_SINK"
-#define ENV_DEFAULT_SOURCE "POLYP_SOURCE"
-#define ENV_DEFAULT_SERVER "POLYP_SERVER"
-#define ENV_DAEMON_BINARY "POLYP_BINARY"
-#define ENV_COOKIE_FILE "POLYP_COOKIE"
+#define ENV_CLIENT_CONFIG_FILE "PULSE_CLIENTCONFIG"
+#define ENV_DEFAULT_SINK "PULSE_SINK"
+#define ENV_DEFAULT_SOURCE "PULSE_SOURCE"
+#define ENV_DEFAULT_SERVER "PULSE_SERVER"
+#define ENV_DAEMON_BINARY "PULSE_BINARY"
+#define ENV_COOKIE_FILE "PULSE_COOKIE"
 
 static const pa_client_conf default_conf = {
     .daemon_binary = NULL,
@@ -77,7 +77,7 @@ static const pa_client_conf default_conf = {
 pa_client_conf *pa_client_conf_new(void) {
     pa_client_conf *c = pa_xmemdup(&default_conf, sizeof(default_conf));
     
-    c->daemon_binary = pa_xstrdup(POLYPAUDIO_BINARY);
+    c->daemon_binary = pa_xstrdup(PULSEAUDIO_BINARY);
     c->extra_arguments = pa_xstrdup("--log-target=syslog --exit-idle-time=5");
     c->cookie_file = pa_xstrdup(PA_NATIVE_COOKIE_FILE);