more s/Polyp/Pulse/g

git-svn-id: file:///home/lennart/svn/public/gst-pulse/trunk@43 bb39ca4e-bce3-0310-b5d4-eea78a553289

12 files changed, 146 insertions, 146 deletions

diff --git a/src/pulsemixer.c b/src/pulsemixer.c
index 3abba78..3f6342e 100644
--- a/src/pulsemixer.c
+++ b/src/pulsemixer.c
@@ -44,12 +44,12 @@ static GstStateChangeReturn gst_pulsemixer_change_state(GstElement *element, Gst
 
 static void gst_pulsemixer_init_interfaces(GType type);
 
-GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS(GstPolypMixer, gst_pulsemixer)
-GST_IMPLEMENT_PULSEPROBE_METHODS(GstPolypMixer, gst_pulsemixer)
-GST_BOILERPLATE_FULL(GstPolypMixer, gst_pulsemixer, GstElement, GST_TYPE_ELEMENT, gst_pulsemixer_init_interfaces)
+GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS(GstPulseMixer, gst_pulsemixer)
+GST_IMPLEMENT_PULSEPROBE_METHODS(GstPulseMixer, gst_pulsemixer)
+GST_BOILERPLATE_FULL(GstPulseMixer, gst_pulsemixer, GstElement, GST_TYPE_ELEMENT, gst_pulsemixer_init_interfaces)
 
 static gboolean gst_pulsemixer_interface_supported(GstImplementsInterface* iface, GType interface_type) {
-    GstPolypMixer *this = GST_PULSEMIXER(iface);
+    GstPulseMixer *this = GST_PULSEMIXER(iface);
     
     if (interface_type == GST_TYPE_MIXER && this->mixer)
         return TRUE;
@@ -98,7 +98,7 @@ static void gst_pulsemixer_base_init(gpointer g_class) {
     gst_element_class_set_details(GST_ELEMENT_CLASS(g_class), &details);
 }
 
-static void gst_pulsemixer_class_init(GstPolypMixerClass *g_class) {
+static void gst_pulsemixer_class_init(GstPulseMixerClass *g_class) {
     GstElementClass *gstelement_class = GST_ELEMENT_CLASS(g_class);
     GObjectClass *gobject_class = G_OBJECT_CLASS(g_class);
     
@@ -124,7 +124,7 @@ static void gst_pulsemixer_class_init(GstPolypMixerClass *g_class) {
             g_param_spec_string("device-name", "Device name", "Human-readable name of the sound device", NULL, G_PARAM_READABLE));
 }
 
-static void gst_pulsemixer_init(GstPolypMixer *this, GstPolypMixerClass *g_class) {
+static void gst_pulsemixer_init(GstPulseMixer *this, GstPulseMixerClass *g_class) {
     this->mixer = NULL;
     this->server = NULL;
     this->device = NULL;
@@ -133,7 +133,7 @@ static void gst_pulsemixer_init(GstPolypMixer *this, GstPolypMixerClass *g_class
 }
 
 static void gst_pulsemixer_finalize(GObject *object) {
-    GstPolypMixer *this = GST_PULSEMIXER(object);
+    GstPulseMixer *this = GST_PULSEMIXER(object);
 
     g_free(this->server);
     g_free(this->device);
@@ -157,7 +157,7 @@ static void gst_pulsemixer_set_property(
         const GValue * value,
         GParamSpec * pspec) {
     
-    GstPolypMixer *this = GST_PULSEMIXER(object);
+    GstPulseMixer *this = GST_PULSEMIXER(object);
 
     switch (prop_id) {
         case PROP_SERVER:
@@ -186,7 +186,7 @@ static void gst_pulsemixer_get_property(
         GValue * value,
         GParamSpec * pspec) {
     
-    GstPolypMixer *this = GST_PULSEMIXER(object);
+    GstPulseMixer *this = GST_PULSEMIXER(object);
 
     switch(prop_id) {
 
@@ -216,7 +216,7 @@ static void gst_pulsemixer_get_property(
 }
 
 static GstStateChangeReturn gst_pulsemixer_change_state(GstElement *element, GstStateChange transition) {
-    GstPolypMixer *this = GST_PULSEMIXER(element);
+    GstPulseMixer *this = GST_PULSEMIXER(element);
     
     switch (transition) {
         case GST_STATE_CHANGE_NULL_TO_READY:
diff --git a/src/pulsemixer.h b/src/pulsemixer.h
index fd71d9e..13684d6 100644
--- a/src/pulsemixer.h
+++ b/src/pulsemixer.h
@@ -35,27 +35,27 @@ G_BEGIN_DECLS
 #define GST_TYPE_PULSEMIXER \
   (gst_pulsemixer_get_type())
 #define GST_PULSEMIXER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PULSEMIXER,GstPolypMixer))
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PULSEMIXER,GstPulseMixer))
 #define GST_PULSEMIXER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PULSEMIXER,GstPolypMixerClass))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PULSEMIXER,GstPulseMixerClass))
 #define GST_IS_PULSEMIXER(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PULSEMIXER))
 #define GST_IS_PULSEMIXER_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PULSEMIXER))
 
-typedef struct _GstPolypMixer GstPolypMixer;
-typedef struct _GstPolypMixerClass GstPolypMixerClass;
+typedef struct _GstPulseMixer GstPulseMixer;
+typedef struct _GstPulseMixerClass GstPulseMixerClass;
 
-struct _GstPolypMixer {
+struct _GstPulseMixer {
     GstElement parent;
 
     gchar *server, *device;
 
-    GstPolypMixerCtrl *mixer;
-    GstPolypProbe *probe;
+    GstPulseMixerCtrl *mixer;
+    GstPulseProbe *probe;
 };
 
-struct _GstPolypMixerClass {
+struct _GstPulseMixerClass {
     GstElementClass parent_class;
 };
 
diff --git a/src/pulsemixerctrl.c b/src/pulsemixerctrl.c
index 4786004..883331f 100644
--- a/src/pulsemixerctrl.c
+++ b/src/pulsemixerctrl.c
@@ -33,7 +33,7 @@ GST_DEBUG_CATEGORY_EXTERN(pulse_debug);
 #define GST_CAT_DEFAULT pulse_debug
 
 static void gst_pulsemixer_ctrl_context_state_cb(pa_context *context, void *userdata) {
-    GstPolypMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
+    GstPulseMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
 
     /* Called from the background thread! */
     
@@ -53,7 +53,7 @@ static void gst_pulsemixer_ctrl_context_state_cb(pa_context *context, void *user
 }
 
 static void gst_pulsemixer_ctrl_sink_info_cb(pa_context *context, const pa_sink_info *i, int eol, void *userdata) {
-    GstPolypMixerCtrl *c = (GstPolypMixerCtrl*) userdata;
+    GstPulseMixerCtrl *c = (GstPulseMixerCtrl*) userdata;
 
     /* Called from the background thread! */
 
@@ -85,7 +85,7 @@ static void gst_pulsemixer_ctrl_sink_info_cb(pa_context *context, const pa_sink_
 }
 
 static void gst_pulsemixer_ctrl_source_info_cb(pa_context *context, const pa_source_info *i, int eol, void *userdata) {
-    GstPolypMixerCtrl *c = (GstPolypMixerCtrl*) userdata;
+    GstPulseMixerCtrl *c = (GstPulseMixerCtrl*) userdata;
 
     /* Called from the background thread! */
 
@@ -116,7 +116,7 @@ static void gst_pulsemixer_ctrl_source_info_cb(pa_context *context, const pa_sou
 }
 
 static void gst_pulsemixer_ctrl_subscribe_cb(pa_context *context, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    GstPolypMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
+    GstPulseMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
     pa_operation *o = NULL;
 
     /* Called from the background thread! */
@@ -141,7 +141,7 @@ static void gst_pulsemixer_ctrl_subscribe_cb(pa_context *context, pa_subscriptio
 }
 
 static void gst_pulsemixer_ctrl_success_cb(pa_context *context, int success, void *userdata) {
-    GstPolypMixerCtrl *c = (GstPolypMixerCtrl*) userdata;
+    GstPulseMixerCtrl *c = (GstPulseMixerCtrl*) userdata;
 
     c->operation_success = success;
     pa_threaded_mainloop_signal(c->mainloop, 0);
@@ -154,7 +154,7 @@ if (!(c)->context || pa_context_get_state((c)->context) != PA_CONTEXT_READY) { \
 } \
 } while(0);
 
-static gboolean gst_pulsemixer_ctrl_open(GstPolypMixerCtrl *c) {
+static gboolean gst_pulsemixer_ctrl_open(GstPulseMixerCtrl *c) {
     int e;
     gchar *name = gst_pulse_client_name();
     pa_operation *o = NULL;
@@ -275,7 +275,7 @@ unlock_and_fail:
     return FALSE;
 }
 
-static void gst_pulsemixer_ctrl_close(GstPolypMixerCtrl *c) {
+static void gst_pulsemixer_ctrl_close(GstPulseMixerCtrl *c) {
     g_assert(c);
 
     if (c->mainloop)
@@ -305,10 +305,10 @@ static void gst_pulsemixer_ctrl_close(GstPolypMixerCtrl *c) {
     }
 }
 
-GstPolypMixerCtrl* gst_pulsemixer_ctrl_new(const gchar *server, const gchar *device, GstPolypMixerType type) {
-    GstPolypMixerCtrl *c = NULL;
+GstPulseMixerCtrl* gst_pulsemixer_ctrl_new(const gchar *server, const gchar *device, GstPulseMixerType type) {
+    GstPulseMixerCtrl *c = NULL;
 
-    c = g_new(GstPolypMixerCtrl, 1);
+    c = g_new(GstPulseMixerCtrl, 1);
     c->tracklist = NULL;
     c->server = g_strdup(server);
     c->device = g_strdup(device);
@@ -334,7 +334,7 @@ GstPolypMixerCtrl* gst_pulsemixer_ctrl_new(const gchar *server, const gchar *dev
     return c;
 }
 
-void gst_pulsemixer_ctrl_free(GstPolypMixerCtrl *c) {
+void gst_pulsemixer_ctrl_free(GstPulseMixerCtrl *c) {
     g_assert(c);
 
     gst_pulsemixer_ctrl_close(c);
@@ -346,7 +346,7 @@ void gst_pulsemixer_ctrl_free(GstPolypMixerCtrl *c) {
     g_free(c);
 }
 
-const GList* gst_pulsemixer_ctrl_list_tracks(GstPolypMixerCtrl *c) {
+const GList* gst_pulsemixer_ctrl_list_tracks(GstPulseMixerCtrl *c) {
     g_assert(c);
 
     return c->tracklist;
@@ -354,7 +354,7 @@ const GList* gst_pulsemixer_ctrl_list_tracks(GstPolypMixerCtrl *c) {
 
 static void gst_pulsemixer_ctrl_timeout_event(pa_mainloop_api *a, pa_time_event *e, const struct timeval *tv, void *userdata) {
     pa_operation *o;
-    GstPolypMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
+    GstPulseMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
     
     if (c->type == GST_PULSEMIXER_SINK)
         o = pa_context_set_sink_volume_by_index(c->context, c->index, &c->volume, NULL, NULL);
@@ -371,7 +371,7 @@ static void gst_pulsemixer_ctrl_timeout_event(pa_mainloop_api *a, pa_time_event
     c->time_event = NULL;
 }
 
-void gst_pulsemixer_ctrl_set_volume(GstPolypMixerCtrl *c, GstMixerTrack *track, gint *volumes) {
+void gst_pulsemixer_ctrl_set_volume(GstPulseMixerCtrl *c, GstMixerTrack *track, gint *volumes) {
     pa_cvolume v;
     int i;
     
@@ -399,7 +399,7 @@ void gst_pulsemixer_ctrl_set_volume(GstPolypMixerCtrl *c, GstMixerTrack *track,
     pa_threaded_mainloop_unlock(c->mainloop);
 }
 
-void gst_pulsemixer_ctrl_get_volume(GstPolypMixerCtrl *c, GstMixerTrack *track, gint *volumes) {
+void gst_pulsemixer_ctrl_get_volume(GstPulseMixerCtrl *c, GstMixerTrack *track, gint *volumes) {
     int i;
     
     g_assert(c);
@@ -413,12 +413,12 @@ void gst_pulsemixer_ctrl_get_volume(GstPolypMixerCtrl *c, GstMixerTrack *track,
     pa_threaded_mainloop_unlock(c->mainloop);
 }
 
-void gst_pulsemixer_ctrl_set_record(GstPolypMixerCtrl *c, GstMixerTrack *track, gboolean record) {
+void gst_pulsemixer_ctrl_set_record(GstPulseMixerCtrl *c, GstMixerTrack *track, gboolean record) {
     g_assert(c);
     g_assert(track == c->track);
 }
 
-void gst_pulsemixer_ctrl_set_mute(GstPolypMixerCtrl *c, GstMixerTrack *track, gboolean mute) {
+void gst_pulsemixer_ctrl_set_mute(GstPulseMixerCtrl *c, GstMixerTrack *track, gboolean mute) {
     pa_operation *o = NULL;
     
     g_assert(c);
diff --git a/src/pulsemixerctrl.h b/src/pulsemixerctrl.h
index f901f56..378898d 100644
--- a/src/pulsemixerctrl.h
+++ b/src/pulsemixerctrl.h
@@ -30,18 +30,18 @@
 
 G_BEGIN_DECLS
 
-#define GST_PULSEMIXER_CTRL(obj) ((GstPolypMixerCtrl*)(obj))
+#define GST_PULSEMIXER_CTRL(obj) ((GstPulseMixerCtrl*)(obj))
 
-typedef struct _GstPolypMixerCtrl GstPolypMixerCtrl;
+typedef struct _GstPulseMixerCtrl GstPulseMixerCtrl;
 
 
 typedef enum {
     GST_PULSEMIXER_UNKNOWN,
     GST_PULSEMIXER_SINK,
     GST_PULSEMIXER_SOURCE }
-GstPolypMixerType;
+GstPulseMixerType;
 
-struct _GstPolypMixerCtrl {
+struct _GstPulseMixerCtrl {
     GList *tracklist;
     
     gchar *server, *device;
@@ -54,7 +54,7 @@ struct _GstPolypMixerCtrl {
     pa_cvolume volume;
     int muted;
     guint32 index;
-    GstPolypMixerType type;
+    GstPulseMixerType type;
     int operation_success;
 
     GstMixerTrack *track;
@@ -62,14 +62,14 @@ struct _GstPolypMixerCtrl {
     pa_time_event *time_event;
 };
 
-GstPolypMixerCtrl* gst_pulsemixer_ctrl_new(const gchar *server, const gchar *device, GstPolypMixerType type);
-void gst_pulsemixer_ctrl_free(GstPolypMixerCtrl*mixer);
+GstPulseMixerCtrl* gst_pulsemixer_ctrl_new(const gchar *server, const gchar *device, GstPulseMixerType type);
+void gst_pulsemixer_ctrl_free(GstPulseMixerCtrl*mixer);
 
-const GList* gst_pulsemixer_ctrl_list_tracks(GstPolypMixerCtrl *mixer);
-void gst_pulsemixer_ctrl_set_volume(GstPolypMixerCtrl *mixer, GstMixerTrack *track, gint *volumes);
-void gst_pulsemixer_ctrl_get_volume(GstPolypMixerCtrl *mixer, GstMixerTrack *track, gint *volumes);
-void gst_pulsemixer_ctrl_set_mute(GstPolypMixerCtrl *mixer, GstMixerTrack *track, gboolean mute);
-void gst_pulsemixer_ctrl_set_record(GstPolypMixerCtrl *mixer, GstMixerTrack *track, gboolean record);
+const GList* gst_pulsemixer_ctrl_list_tracks(GstPulseMixerCtrl *mixer);
+void gst_pulsemixer_ctrl_set_volume(GstPulseMixerCtrl *mixer, GstMixerTrack *track, gint *volumes);
+void gst_pulsemixer_ctrl_get_volume(GstPulseMixerCtrl *mixer, GstMixerTrack *track, gint *volumes);
+void gst_pulsemixer_ctrl_set_mute(GstPulseMixerCtrl *mixer, GstMixerTrack *track, gboolean mute);
+void gst_pulsemixer_ctrl_set_record(GstPulseMixerCtrl *mixer, GstMixerTrack *track, gboolean record);
 
 #define GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS(Type, interface_as_function)     \
 static const GList*                                                             \
diff --git a/src/pulsemixertrack.c b/src/pulsemixertrack.c
index 3e9b746..79ab47c 100644
--- a/src/pulsemixertrack.c
+++ b/src/pulsemixertrack.c
@@ -30,17 +30,17 @@
 GST_DEBUG_CATEGORY_EXTERN(pulse_debug);
 #define GST_CAT_DEFAULT pulse_debug
 
-G_DEFINE_TYPE(GstPolypMixerTrack, gst_pulsemixer_track, GST_TYPE_MIXER_TRACK);
+G_DEFINE_TYPE(GstPulseMixerTrack, gst_pulsemixer_track, GST_TYPE_MIXER_TRACK);
 
-static void gst_pulsemixer_track_class_init(GstPolypMixerTrackClass *klass) {
+static void gst_pulsemixer_track_class_init(GstPulseMixerTrackClass *klass) {
 }
 
-static void gst_pulsemixer_track_init(GstPolypMixerTrack *track) {
+static void gst_pulsemixer_track_init(GstPulseMixerTrack *track) {
     track->control = NULL;
 }
 
-GstMixerTrack *gst_pulsemixer_track_new(GstPolypMixerCtrl *control) {
-    GstPolypMixerTrack *pulsetrack;
+GstMixerTrack *gst_pulsemixer_track_new(GstPulseMixerCtrl *control) {
+    GstPulseMixerTrack *pulsetrack;
     GstMixerTrack *track;
     
     pulsetrack = g_object_new(GST_TYPE_PULSEMIXER_TRACK, NULL);
diff --git a/src/pulsemixertrack.h b/src/pulsemixertrack.h
index 68b1a50..69817bf 100644
--- a/src/pulsemixertrack.h
+++ b/src/pulsemixertrack.h
@@ -31,25 +31,25 @@ G_BEGIN_DECLS
 #define GST_TYPE_PULSEMIXER_TRACK \
   (gst_pulsemixer_track_get_type())
 #define GST_PULSEMIXER_TRACK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_PULSEMIXER_TRACK, GstPolypMixerTrack))
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_PULSEMIXER_TRACK, GstPulseMixerTrack))
 #define GST_PULSEMIXER_TRACK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_PULSEMIXER_TRACK, GstPolypMixerTrackClass))
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_PULSEMIXER_TRACK, GstPulseMixerTrackClass))
 #define GST_IS_PULSEMIXER_TRACK(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_PULSEMIXER_TRACK))
 #define GST_IS_PULSEMIXER_TRACK_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_PULSEMIXER_TRACK))
 
-typedef struct _GstPolypMixerTrack {
+typedef struct _GstPulseMixerTrack {
     GstMixerTrack parent;
-    GstPolypMixerCtrl *control;
-} GstPolypMixerTrack;
+    GstPulseMixerCtrl *control;
+} GstPulseMixerTrack;
 
-typedef struct _GstPolypMixerTrackClass {
+typedef struct _GstPulseMixerTrackClass {
     GstMixerTrackClass parent;
-} GstPolypMixerTrackClass;
+} GstPulseMixerTrackClass;
 
 GType gst_pulsemixer_track_get_type(void);
-GstMixerTrack* gst_pulsemixer_track_new(GstPolypMixerCtrl *control);
+GstMixerTrack* gst_pulsemixer_track_new(GstPulseMixerCtrl *control);
 
 G_END_DECLS
 
diff --git a/src/pulseprobe.c b/src/pulseprobe.c
index adb5212..0e487e4 100644
--- a/src/pulseprobe.c
+++ b/src/pulseprobe.c
@@ -30,7 +30,7 @@ GST_DEBUG_CATEGORY_EXTERN(pulse_debug);
 #define GST_CAT_DEFAULT pulse_debug
 
 static void gst_pulseprobe_context_state_cb(pa_context *context, void *userdata) {
-    GstPolypProbe *c = (GstPolypProbe*) userdata;
+    GstPulseProbe *c = (GstPulseProbe*) userdata;
 
     /* Called from the background thread! */
     
@@ -50,7 +50,7 @@ static void gst_pulseprobe_context_state_cb(pa_context *context, void *userdata)
 }
 
 static void gst_pulseprobe_sink_info_cb(pa_context *context, const pa_sink_info *i, int eol, void *userdata) {
-    GstPolypProbe *c = (GstPolypProbe*) userdata;
+    GstPulseProbe *c = (GstPulseProbe*) userdata;
 
     /* Called from the background thread! */
 
@@ -65,7 +65,7 @@ static void gst_pulseprobe_sink_info_cb(pa_context *context, const pa_sink_info
 }
 
 static void gst_pulseprobe_source_info_cb(pa_context *context, const pa_source_info *i, int eol, void *userdata) {
-    GstPolypProbe *c = (GstPolypProbe*) userdata;
+    GstPulseProbe *c = (GstPulseProbe*) userdata;
 
     /* Called from the background thread! */
 
@@ -78,14 +78,14 @@ static void gst_pulseprobe_source_info_cb(pa_context *context, const pa_source_i
         c->devices = g_list_append(c->devices, g_strdup(i->name));
 }
 
-static void gst_pulseprobe_invalidate(GstPolypProbe *c) {
+static void gst_pulseprobe_invalidate(GstPulseProbe *c) {
     g_list_foreach(c->devices, (GFunc) g_free, NULL);
     g_list_free(c->devices);
     c->devices = NULL;
     c->devices_valid = 0;
 }
 
-static gboolean gst_pulseprobe_open(GstPolypProbe *c) {
+static gboolean gst_pulseprobe_open(GstPulseProbe *c) {
     int e;
     gchar *name = gst_pulse_client_name();
 
@@ -143,7 +143,7 @@ if (!(c)->context || pa_context_get_state((c)->context) != PA_CONTEXT_READY) { \
 } \
 } while(0);
 
-static gboolean gst_pulseprobe_enumerate(GstPolypProbe *c) {
+static gboolean gst_pulseprobe_enumerate(GstPulseProbe *c) {
     pa_operation *o = NULL;
 
     pa_threaded_mainloop_lock(c->mainloop);
@@ -210,7 +210,7 @@ unlock_and_fail:
     return FALSE;
 }
 
-static void gst_pulseprobe_close(GstPolypProbe *c) {
+static void gst_pulseprobe_close(GstPulseProbe *c) {
     g_assert(c);
 
     if (c->mainloop)
@@ -228,10 +228,10 @@ static void gst_pulseprobe_close(GstPolypProbe *c) {
     }
 }
 
-GstPolypProbe* gst_pulseprobe_new(GObjectClass *klass, guint prop_id, const gchar *server, gboolean sinks, gboolean sources) {
-    GstPolypProbe *c = NULL;
+GstPulseProbe* gst_pulseprobe_new(GObjectClass *klass, guint prop_id, const gchar *server, gboolean sinks, gboolean sources) {
+    GstPulseProbe *c = NULL;
 
-    c = g_new(GstPolypProbe, 1);
+    c = g_new(GstPulseProbe, 1);
     c->server = g_strdup(server);
     c->enumerate_sinks = sinks;
     c->enumerate_sources = sources;
@@ -247,7 +247,7 @@ GstPolypProbe* gst_pulseprobe_new(GObjectClass *klass, guint prop_id, const gcha
     return c;
 }
 
-void gst_pulseprobe_free(GstPolypProbe* c) {
+void gst_pulseprobe_free(GstPulseProbe* c) {
     g_assert(c);
 
     gst_pulseprobe_close(c);
@@ -261,11 +261,11 @@ void gst_pulseprobe_free(GstPolypProbe* c) {
     g_free(c);
 }
 
-const GList* gst_pulseprobe_get_properties(GstPolypProbe *c) {
+const GList* gst_pulseprobe_get_properties(GstPulseProbe *c) {
     return c->properties;
 }
 
-gboolean gst_pulseprobe_needs_probe(GstPolypProbe *c, guint prop_id, const GParamSpec *pspec) {
+gboolean gst_pulseprobe_needs_probe(GstPulseProbe *c, guint prop_id, const GParamSpec *pspec) {
 
     if (prop_id == c->prop_id)
         return !c->devices_valid;
@@ -274,7 +274,7 @@ gboolean gst_pulseprobe_needs_probe(GstPolypProbe *c, guint prop_id, const GPara
     return FALSE;
 }
 
-void gst_pulseprobe_probe_property(GstPolypProbe *c, guint prop_id, const GParamSpec *pspec) {
+void gst_pulseprobe_probe_property(GstPulseProbe *c, guint prop_id, const GParamSpec *pspec) {
 
     if (prop_id != c->prop_id) {
         G_OBJECT_WARN_INVALID_PROPERTY_ID(c, prop_id, pspec);
@@ -287,7 +287,7 @@ void gst_pulseprobe_probe_property(GstPolypProbe *c, guint prop_id, const GParam
     }
 }
 
-GValueArray *gst_pulseprobe_get_values(GstPolypProbe *c, guint prop_id, const GParamSpec *pspec) {
+GValueArray *gst_pulseprobe_get_values(GstPulseProbe *c, guint prop_id, const GParamSpec *pspec) {
     GValueArray *array;
     GValue value = { 0 };
     GList *item;
@@ -312,7 +312,7 @@ GValueArray *gst_pulseprobe_get_values(GstPolypProbe *c, guint prop_id, const GP
     return array;
 }
 
-void gst_pulseprobe_set_server(GstPolypProbe *c, const gchar *server) {
+void gst_pulseprobe_set_server(GstPulseProbe *c, const gchar *server) {
     g_assert(c);
 
     gst_pulseprobe_invalidate(c);
diff --git a/src/pulseprobe.h b/src/pulseprobe.h
index ae936e9..ad97c9f 100644
--- a/src/pulseprobe.h
+++ b/src/pulseprobe.h
@@ -30,9 +30,9 @@ G_BEGIN_DECLS
 #include <pulse/pulseaudio.h>
 #include <pulse/thread-mainloop.h>
 
-typedef struct _GstPolypProbe GstPolypProbe;
+typedef struct _GstPulseProbe GstPulseProbe;
 
-struct _GstPolypProbe {
+struct _GstPulseProbe {
     gchar *server;
     GList *devices;
     int devices_valid;
@@ -47,15 +47,15 @@ struct _GstPolypProbe {
     int operation_success;
 };
 
-GstPolypProbe* gst_pulseprobe_new(GObjectClass *klass, guint prop_id, const gchar *server, gboolean sinks, gboolean sources);
-void gst_pulseprobe_free(GstPolypProbe* probe);
+GstPulseProbe* gst_pulseprobe_new(GObjectClass *klass, guint prop_id, const gchar *server, gboolean sinks, gboolean sources);
+void gst_pulseprobe_free(GstPulseProbe* probe);
 
-const GList* gst_pulseprobe_get_properties(GstPolypProbe *probe);
-gboolean gst_pulseprobe_needs_probe(GstPolypProbe *probe, guint prop_id, const GParamSpec *pspec);
-void gst_pulseprobe_probe_property(GstPolypProbe *probe, guint prop_id, const GParamSpec *pspec);
-GValueArray *gst_pulseprobe_get_values(GstPolypProbe *probe, guint prop_id, const GParamSpec *pspec);
+const GList* gst_pulseprobe_get_properties(GstPulseProbe *probe);
+gboolean gst_pulseprobe_needs_probe(GstPulseProbe *probe, guint prop_id, const GParamSpec *pspec);
+void gst_pulseprobe_probe_property(GstPulseProbe *probe, guint prop_id, const GParamSpec *pspec);
+GValueArray *gst_pulseprobe_get_values(GstPulseProbe *probe, guint prop_id, const GParamSpec *pspec);
 
-void gst_pulseprobe_set_server(GstPolypProbe *c, const gchar *server);
+void gst_pulseprobe_set_server(GstPulseProbe *c, const gchar *server);
 
 #define GST_IMPLEMENT_PULSEPROBE_METHODS(Type, interface_as_function)           \
 static const GList*                                                             \
diff --git a/src/pulsesink.c b/src/pulsesink.c
index a1f5990..1d8e432 100644
--- a/src/pulsesink.c
+++ b/src/pulsesink.c
@@ -42,8 +42,8 @@ enum {
 
 static GstAudioSinkClass *parent_class = NULL;
 
-static void gst_pulsesink_destroy_stream(GstPolypSink *pulsesink);
-static void gst_pulsesink_destroy_context(GstPolypSink *pulsesink);
+static void gst_pulsesink_destroy_stream(GstPulseSink *pulsesink);
+static void gst_pulsesink_destroy_context(GstPulseSink *pulsesink);
 
 static void gst_pulsesink_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void gst_pulsesink_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
@@ -158,7 +158,7 @@ static void gst_pulsesink_init(
         GTypeInstance * instance,
         gpointer g_class) {
     
-    GstPolypSink *pulsesink = GST_PULSESINK(instance);
+    GstPulseSink *pulsesink = GST_PULSESINK(instance);
     int e;
 
     pulsesink->server = pulsesink->device = pulsesink->stream_name = NULL;
@@ -173,7 +173,7 @@ static void gst_pulsesink_init(
     g_assert(e == 0);
 }
 
-static void gst_pulsesink_destroy_stream(GstPolypSink* pulsesink) {
+static void gst_pulsesink_destroy_stream(GstPulseSink* pulsesink) {
     if (pulsesink->stream) {
         pa_stream_disconnect(pulsesink->stream);
         pa_stream_unref(pulsesink->stream);
@@ -184,7 +184,7 @@ static void gst_pulsesink_destroy_stream(GstPolypSink* pulsesink) {
     pulsesink->stream_name = NULL;
 }
 
-static void gst_pulsesink_destroy_context(GstPolypSink* pulsesink) {
+static void gst_pulsesink_destroy_context(GstPulseSink* pulsesink) {
 
     gst_pulsesink_destroy_stream(pulsesink);
 
@@ -196,7 +196,7 @@ static void gst_pulsesink_destroy_context(GstPolypSink* pulsesink) {
 }
 
 static void gst_pulsesink_finalize(GObject * object) {
-    GstPolypSink *pulsesink = GST_PULSESINK(object);
+    GstPulseSink *pulsesink = GST_PULSESINK(object);
 
     pa_threaded_mainloop_stop(pulsesink->mainloop);
 
@@ -220,7 +220,7 @@ static void gst_pulsesink_set_property(
         guint prop_id,
         const GValue * value,
         GParamSpec * pspec) {    
-    GstPolypSink *pulsesink = GST_PULSESINK(object);
+    GstPulseSink *pulsesink = GST_PULSESINK(object);
 
     switch (prop_id) {
         case PROP_SERVER:
@@ -245,7 +245,7 @@ static void gst_pulsesink_get_property(
         GValue * value,
         GParamSpec * pspec) {
     
-    GstPolypSink *pulsesink = GST_PULSESINK(object);
+    GstPulseSink *pulsesink = GST_PULSESINK(object);
 
     switch(prop_id) {
         case PROP_SERVER:
@@ -263,7 +263,7 @@ static void gst_pulsesink_get_property(
 }
 
 static void gst_pulsesink_context_state_cb(pa_context *c, void *userdata) {
-    GstPolypSink *pulsesink = GST_PULSESINK(userdata);
+    GstPulseSink *pulsesink = GST_PULSESINK(userdata);
 
     switch (pa_context_get_state(c)) {
         case PA_CONTEXT_READY:
@@ -281,7 +281,7 @@ static void gst_pulsesink_context_state_cb(pa_context *c, void *userdata) {
 }
 
 static void gst_pulsesink_stream_state_cb(pa_stream *s, void * userdata) {
-    GstPolypSink *pulsesink = GST_PULSESINK(userdata);
+    GstPulseSink *pulsesink = GST_PULSESINK(userdata);
 
     switch (pa_stream_get_state(s)) {
 
@@ -298,19 +298,19 @@ static void gst_pulsesink_stream_state_cb(pa_stream *s, void * userdata) {
 }
 
 static void gst_pulsesink_stream_request_cb(pa_stream *s, size_t length, void *userdata) {
-    GstPolypSink *pulsesink = GST_PULSESINK(userdata);
+    GstPulseSink *pulsesink = GST_PULSESINK(userdata);
 
     pa_threaded_mainloop_signal(pulsesink->mainloop, 0);
 }
 
 static void gst_pulsesink_stream_latency_update_cb(pa_stream *s, void *userdata) {
-    GstPolypSink *pulsesink = GST_PULSESINK(userdata);
+    GstPulseSink *pulsesink = GST_PULSESINK(userdata);
 
     pa_threaded_mainloop_signal(pulsesink->mainloop, 0);
 }
 
 static gboolean gst_pulsesink_open(GstAudioSink *asink) {
-    GstPolypSink *pulsesink = GST_PULSESINK(asink);
+    GstPulseSink *pulsesink = GST_PULSESINK(asink);
     gchar *name = gst_pulse_client_name();
 
     pa_threaded_mainloop_lock(pulsesink->mainloop);
@@ -347,7 +347,7 @@ unlock_and_fail:
 }
 
 static gboolean gst_pulsesink_close(GstAudioSink *asink) {
-    GstPolypSink *pulsesink = GST_PULSESINK(asink);
+    GstPulseSink *pulsesink = GST_PULSESINK(asink);
 
     pa_threaded_mainloop_lock(pulsesink->mainloop);
     gst_pulsesink_destroy_context(pulsesink);
@@ -359,7 +359,7 @@ static gboolean gst_pulsesink_close(GstAudioSink *asink) {
 static gboolean gst_pulsesink_prepare(GstAudioSink *asink, GstRingBufferSpec *spec) {
     pa_buffer_attr buf_attr;
     
-    GstPolypSink *pulsesink = GST_PULSESINK(asink);
+    GstPulseSink *pulsesink = GST_PULSESINK(asink);
 
     if (!gst_pulse_fill_sample_spec(spec, &pulsesink->sample_spec)) {
         GST_ELEMENT_ERROR(pulsesink, RESOURCE, SETTINGS, ("Invalid sample specification."), (NULL));
@@ -414,7 +414,7 @@ unlock_and_fail:
 }
 
 static gboolean gst_pulsesink_unprepare(GstAudioSink * asink) {
-    GstPolypSink *pulsesink = GST_PULSESINK(asink);
+    GstPulseSink *pulsesink = GST_PULSESINK(asink);
 
     pa_threaded_mainloop_lock(pulsesink->mainloop);
     gst_pulsesink_destroy_stream(pulsesink);
@@ -431,7 +431,7 @@ if (!(pulsesink)->context || pa_context_get_state((pulsesink)->context) != PA_CO
 }
 
 static guint gst_pulsesink_write(GstAudioSink *asink, gpointer data, guint length) {
-    GstPolypSink *pulsesink = GST_PULSESINK(asink);
+    GstPulseSink *pulsesink = GST_PULSESINK(asink);
     size_t sum = 0;
     
     pa_threaded_mainloop_lock(pulsesink->mainloop);
@@ -478,7 +478,7 @@ unlock_and_fail:
 }
 
 static guint gst_pulsesink_delay(GstAudioSink *asink) {
-    GstPolypSink *pulsesink = GST_PULSESINK(asink);
+    GstPulseSink *pulsesink = GST_PULSESINK(asink);
     pa_usec_t t;
 
     pa_threaded_mainloop_lock(pulsesink->mainloop);
@@ -508,14 +508,14 @@ unlock_and_fail:
 }
 
 static void gst_pulsesink_success_cb(pa_stream *s, int success, void *userdata) {
-    GstPolypSink *pulsesink = GST_PULSESINK(userdata);
+    GstPulseSink *pulsesink = GST_PULSESINK(userdata);
 
     pulsesink->operation_success = success;
     pa_threaded_mainloop_signal(pulsesink->mainloop, 0);
 }
 
 static void gst_pulsesink_reset(GstAudioSink *asink) {
-    GstPolypSink *pulsesink = GST_PULSESINK(asink);
+    GstPulseSink *pulsesink = GST_PULSESINK(asink);
     pa_operation *o = NULL;
     
     pa_threaded_mainloop_lock(pulsesink->mainloop);
@@ -549,7 +549,7 @@ unlock_and_fail:
     pa_threaded_mainloop_unlock(pulsesink->mainloop);
 }
 
-static void gst_pulsesink_change_title(GstPolypSink *pulsesink, const gchar *t) {
+static void gst_pulsesink_change_title(GstPulseSink *pulsesink, const gchar *t) {
     pa_operation *o = NULL;
     
     pa_threaded_mainloop_lock(pulsesink->mainloop);
@@ -578,7 +578,7 @@ unlock_and_fail:
 }
 
 static gboolean gst_pulsesink_event(GstBaseSink *sink, GstEvent *event) {
-    GstPolypSink *pulsesink = GST_PULSESINK(sink);
+    GstPulseSink *pulsesink = GST_PULSESINK(sink);
 
     switch (GST_EVENT_TYPE(event)) {
         case GST_EVENT_TAG: {
@@ -625,20 +625,20 @@ GType gst_pulsesink_get_type(void) {
     if (!pulsesink_type) {
 
         static const GTypeInfo pulsesink_info = {
-            sizeof(GstPolypSinkClass),
+            sizeof(GstPulseSinkClass),
             gst_pulsesink_base_init,
             NULL,
             gst_pulsesink_class_init,
             NULL,
             NULL,
-            sizeof(GstPolypSink),
+            sizeof(GstPulseSink),
             0,
             gst_pulsesink_init,
         };
 
         pulsesink_type = g_type_register_static(
                 GST_TYPE_AUDIO_SINK,
-                "GstPolypSink",
+                "GstPulseSink",
                 &pulsesink_info,
                 0);
     }
diff --git a/src/pulsesink.h b/src/pulsesink.h
index 84153ad..d8b20da 100644
--- a/src/pulsesink.h
+++ b/src/pulsesink.h
@@ -33,18 +33,18 @@ G_BEGIN_DECLS
 #define GST_TYPE_PULSESINK \
   (gst_pulsesink_get_type())
 #define GST_PULSESINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PULSESINK,GstPolypSink))
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PULSESINK,GstPulseSink))
 #define GST_PULSESINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PULSESINK,GstPolypSinkClass))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PULSESINK,GstPulseSinkClass))
 #define GST_IS_PULSESINK(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PULSESINK))
 #define GST_IS_PULSESINK_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PULSESINK))
 
-typedef struct _GstPolypSink GstPolypSink;
-typedef struct _GstPolypSinkClass GstPolypSinkClass;
+typedef struct _GstPulseSink GstPulseSink;
+typedef struct _GstPulseSinkClass GstPulseSinkClass;
 
-struct _GstPolypSink {
+struct _GstPulseSink {
     GstAudioSink sink;
 
     gchar *server, *device, *stream_name;
@@ -59,7 +59,7 @@ struct _GstPolypSink {
     int operation_success;
 };
 
-struct _GstPolypSinkClass {
+struct _GstPulseSinkClass {
     GstAudioSinkClass parent_class;
 };
 
diff --git a/src/pulsesrc.c b/src/pulsesrc.c
index c830ca8..a66acdc 100644
--- a/src/pulsesrc.c
+++ b/src/pulsesrc.c
@@ -43,10 +43,10 @@ enum {
 
 static GstAudioSrcClass *parent_class = NULL;
 
-GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS(GstPolypSrc, gst_pulsesrc)
+GST_IMPLEMENT_PULSEMIXER_CTRL_METHODS(GstPulseSrc, gst_pulsesrc)
 
-static void gst_pulsesrc_destroy_stream(GstPolypSrc *pulsesrc);
-static void gst_pulsesrc_destroy_context(GstPolypSrc *pulsesrc);
+static void gst_pulsesrc_destroy_stream(GstPulseSrc *pulsesrc);
+static void gst_pulsesrc_destroy_context(GstPulseSrc *pulsesrc);
 
 static void gst_pulsesrc_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void gst_pulsesrc_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
@@ -71,7 +71,7 @@ static GstStateChangeReturn gst_pulsesrc_change_state(GstElement *element, GstSt
 #endif
 
 static gboolean gst_pulsesrc_interface_supported(GstImplementsInterface* iface, GType interface_type) {
-    GstPolypSrc *this = GST_PULSESRC(iface);
+    GstPulseSrc *this = GST_PULSESRC(iface);
     
     if (interface_type == GST_TYPE_MIXER && this->mixer)
         return TRUE;
@@ -188,7 +188,7 @@ static void gst_pulsesrc_init(
         GTypeInstance * instance,
         gpointer g_class) {
     
-    GstPolypSrc *pulsesrc = GST_PULSESRC(instance);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(instance);
     int e;
 
     pulsesrc->server = pulsesrc->device = NULL;
@@ -208,7 +208,7 @@ static void gst_pulsesrc_init(
     pulsesrc->mixer = NULL;
 }
 
-static void gst_pulsesrc_destroy_stream(GstPolypSrc* pulsesrc) {
+static void gst_pulsesrc_destroy_stream(GstPulseSrc* pulsesrc) {
     if (pulsesrc->stream) {
         pa_stream_disconnect(pulsesrc->stream);
         pa_stream_unref(pulsesrc->stream);
@@ -216,7 +216,7 @@ static void gst_pulsesrc_destroy_stream(GstPolypSrc* pulsesrc) {
     }
 }
 
-static void gst_pulsesrc_destroy_context(GstPolypSrc* pulsesrc) {
+static void gst_pulsesrc_destroy_context(GstPulseSrc* pulsesrc) {
 
     gst_pulsesrc_destroy_stream(pulsesrc);
 
@@ -228,7 +228,7 @@ static void gst_pulsesrc_destroy_context(GstPolypSrc* pulsesrc) {
 }
 
 static void gst_pulsesrc_finalize(GObject * object) {
-    GstPolypSrc *pulsesrc = GST_PULSESRC(object);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(object);
 
     pa_threaded_mainloop_stop(pulsesrc->mainloop);
 
@@ -255,7 +255,7 @@ static void gst_pulsesrc_set_property(
         const GValue * value,
         GParamSpec * pspec) {
     
-    GstPolypSrc *pulsesrc = GST_PULSESRC(object);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(object);
 
     switch (prop_id) {
         case PROP_SERVER:
@@ -280,7 +280,7 @@ static void gst_pulsesrc_get_property(
         GValue * value,
         GParamSpec * pspec) {
     
-    GstPolypSrc *pulsesrc = GST_PULSESRC(object);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(object);
 
     switch(prop_id) {
         case PROP_SERVER:
@@ -298,7 +298,7 @@ static void gst_pulsesrc_get_property(
 }
 
 static void gst_pulsesrc_context_state_cb(pa_context *c, void *userdata) {
-    GstPolypSrc *pulsesrc = GST_PULSESRC(userdata);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(userdata);
 
     switch (pa_context_get_state(c)) {
         case PA_CONTEXT_READY:
@@ -316,7 +316,7 @@ static void gst_pulsesrc_context_state_cb(pa_context *c, void *userdata) {
 }
 
 static void gst_pulsesrc_stream_state_cb(pa_stream *s, void * userdata) {
-    GstPolypSrc *pulsesrc = GST_PULSESRC(userdata);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(userdata);
 
     switch (pa_stream_get_state(s)) {
 
@@ -333,13 +333,13 @@ static void gst_pulsesrc_stream_state_cb(pa_stream *s, void * userdata) {
 }
 
 static void gst_pulsesrc_stream_request_cb(pa_stream *s, size_t length, void *userdata) {
-    GstPolypSrc *pulsesrc = GST_PULSESRC(userdata);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(userdata);
 
     pa_threaded_mainloop_signal(pulsesrc->mainloop, 0);
 }
 
 static gboolean gst_pulsesrc_open(GstAudioSrc *asrc) {
-    GstPolypSrc *pulsesrc = GST_PULSESRC(asrc);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(asrc);
     gchar *name = gst_pulse_client_name();
 
     pa_threaded_mainloop_lock(pulsesrc->mainloop);
@@ -378,7 +378,7 @@ unlock_and_fail:
 }
 
 static gboolean gst_pulsesrc_close(GstAudioSrc *asrc) {
-    GstPolypSrc *pulsesrc = GST_PULSESRC(asrc);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(asrc);
 
     pa_threaded_mainloop_lock(pulsesrc->mainloop);
     gst_pulsesrc_destroy_context(pulsesrc);
@@ -389,7 +389,7 @@ static gboolean gst_pulsesrc_close(GstAudioSrc *asrc) {
 static gboolean gst_pulsesrc_prepare(GstAudioSrc *asrc, GstRingBufferSpec *spec) {
     pa_buffer_attr buf_attr;
     
-    GstPolypSrc *pulsesrc = GST_PULSESRC(asrc);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(asrc);
 
     if (!gst_pulse_fill_sample_spec(spec, &pulsesrc->sample_spec)) {
         GST_ELEMENT_ERROR(pulsesrc, RESOURCE, SETTINGS, ("Invalid sample specification."), (NULL));
@@ -442,7 +442,7 @@ unlock_and_fail:
 }
 
 static gboolean gst_pulsesrc_unprepare(GstAudioSrc * asrc) {
-    GstPolypSrc *pulsesrc = GST_PULSESRC(asrc);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(asrc);
 
     pa_threaded_mainloop_lock(pulsesrc->mainloop);
     gst_pulsesrc_destroy_stream(pulsesrc);
@@ -463,7 +463,7 @@ if (!(pulsesrc)->context || pa_context_get_state((pulsesrc)->context) != PA_CONT
 }
 
 static guint gst_pulsesrc_read(GstAudioSrc *asrc, gpointer data, guint length) {
-    GstPolypSrc *pulsesrc = GST_PULSESRC(asrc);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(asrc);
     size_t sum = 0;
 
     pa_threaded_mainloop_lock(pulsesrc->mainloop);
@@ -526,7 +526,7 @@ unlock_and_fail:
 }
 
 static guint gst_pulsesrc_delay(GstAudioSrc *asrc) {
-    GstPolypSrc *pulsesrc = GST_PULSESRC(asrc);
+    GstPulseSrc *pulsesrc = GST_PULSESRC(asrc);
     pa_usec_t t;
     int negative;
 
@@ -557,7 +557,7 @@ unlock_and_fail:
 }
 
 static GstStateChangeReturn gst_pulsesrc_change_state(GstElement *element, GstStateChange transition) {
-    GstPolypSrc *this = GST_PULSESRC(element);
+    GstPulseSrc *this = GST_PULSESRC(element);
     
     switch (transition) {
         case GST_STATE_CHANGE_NULL_TO_READY:
@@ -592,20 +592,20 @@ GType gst_pulsesrc_get_type(void) {
     if (!pulsesrc_type) {
 
         static const GTypeInfo pulsesrc_info = {
-            sizeof(GstPolypSrcClass),
+            sizeof(GstPulseSrcClass),
             gst_pulsesrc_base_init,
             NULL,
             gst_pulsesrc_class_init,
             NULL,
             NULL,
-            sizeof(GstPolypSrc),
+            sizeof(GstPulseSrc),
             0,
             gst_pulsesrc_init,
         };
 
         pulsesrc_type = g_type_register_static(
                 GST_TYPE_AUDIO_SRC,
-                "GstPolypSrc",
+                "GstPulseSrc",
                 &pulsesrc_info,
                 0);
 
diff --git a/src/pulsesrc.h b/src/pulsesrc.h
index c78072f..85206f8 100644
--- a/src/pulsesrc.h
+++ b/src/pulsesrc.h
@@ -35,18 +35,18 @@ G_BEGIN_DECLS
 #define GST_TYPE_PULSESRC \
   (gst_pulsesrc_get_type())
 #define GST_PULSESRC(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PULSESRC,GstPolypSrc))
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PULSESRC,GstPulseSrc))
 #define GST_PULSESRC_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PULSESRC,GstPolypSrcClass))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PULSESRC,GstPulseSrcClass))
 #define GST_IS_PULSESRC(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PULSESRC))
 #define GST_IS_PULSESRC_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PULSESRC))
 
-typedef struct _GstPolypSrc GstPolypSrc;
-typedef struct _GstPolypSrcClass GstPolypSrcClass;
+typedef struct _GstPulseSrc GstPulseSrc;
+typedef struct _GstPulseSrcClass GstPulseSrcClass;
 
-struct _GstPolypSrc {
+struct _GstPulseSrc {
     GstAudioSrc src;
 
     gchar *server, *device;
@@ -61,10 +61,10 @@ struct _GstPolypSrc {
     const void *read_buffer;
     size_t read_buffer_length;
 
-    GstPolypMixerCtrl *mixer;
+    GstPulseMixerCtrl *mixer;
 };
 
-struct _GstPolypSrcClass {
+struct _GstPulseSrcClass {
     GstAudioSrcClass parent_class;
 };