diff --git a/meson.build b/meson.build
index 1a32ee7c3..561b8e3b5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('pipewire', 'c',
-  version : '0.1.4.1',
+  version : '0.1.5',
   meson_version : '>= 0.36.0',
   default_options : [ 'warning_level=1',
                       'c_std=gnu99',
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
index 9fda6a0db..19f47ccc8 100644
--- a/src/daemon/pipewire.conf.in
+++ b/src/daemon/pipewire.conf.in
@@ -1,7 +1,7 @@
 #load-module libpipewire-module-protocol-dbus
 load-module libpipewire-module-protocol-native
 load-module libpipewire-module-suspend-on-idle
-load-module libpipewire-module-spa-monitor alsa/libspa-alsa alsa-monitor alsa
+#load-module libpipewire-module-spa-monitor alsa/libspa-alsa alsa-monitor alsa
 load-module libpipewire-module-spa-monitor v4l2/libspa-v4l2 v4l2-monitor v4l2
 #load-module libpipewire-module-spa-node videotestsrc/libspa-videotestsrc videotestsrc videotestsrc Spa:POD:Object:Props:patternType=Spa:POD:Object:Props:patternType:snow
 load-module libpipewire-module-autolink
diff --git a/src/examples/export-sink.c b/src/examples/export-sink.c
index da243e102..473f495ce 100644
--- a/src/examples/export-sink.c
+++ b/src/examples/export-sink.c
@@ -31,7 +31,7 @@
 
 #include <pipewire/pipewire.h>
 #include <pipewire/module.h>
-#include <pipewire/node-factory.h>
+#include <pipewire/factory.h>
 
 struct type {
 	uint32_t format;
diff --git a/src/examples/export-spa.c b/src/examples/export-spa.c
index 938a5999f..ed2e31365 100644
--- a/src/examples/export-spa.c
+++ b/src/examples/export-spa.c
@@ -29,7 +29,7 @@
 #include <spa/lib/debug.h>
 
 #include <pipewire/pipewire.h>
-#include <pipewire/node-factory.h>
+#include <pipewire/factory.h>
 
 struct data {
 	struct pw_main_loop *loop;
diff --git a/src/examples/local-v4l2.c b/src/examples/local-v4l2.c
index 36df1ec41..73d4387ff 100644
--- a/src/examples/local-v4l2.c
+++ b/src/examples/local-v4l2.c
@@ -31,7 +31,7 @@
 
 #include <pipewire/pipewire.h>
 #include <pipewire/module.h>
-#include <pipewire/node-factory.h>
+#include <pipewire/factory.h>
 
 struct type {
 	uint32_t format;
diff --git a/src/modules/module-jack.c b/src/modules/module-jack.c
index 7c9ffb5ff..fa49c5e4b 100644
--- a/src/modules/module-jack.c
+++ b/src/modules/module-jack.c
@@ -41,7 +41,7 @@
 #include "pipewire/resource.h"
 #include "pipewire/private.h"
 #include "pipewire/link.h"
-#include "pipewire/node-factory.h"
+#include "pipewire/factory.h"
 #include "pipewire/data-loop.h"
 #include "pipewire/main-loop.h"
 
diff --git a/src/modules/module-protocol-dbus.c b/src/modules/module-protocol-dbus.c
index ed2387f32..81e6f60db 100644
--- a/src/modules/module-protocol-dbus.c
+++ b/src/modules/module-protocol-dbus.c
@@ -37,7 +37,7 @@
 #include "pipewire/server/client.h"
 #include "pipewire/server/resource.h"
 #include "pipewire/server/link.h"
-#include "pipewire/server/node-factory.h"
+#include "pipewire/server/factory.h"
 #include "pipewire/server/data-loop.h"
 #include "pipewire/server/main-loop.h"
 
diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c
index 797060473..6824df386 100644
--- a/src/modules/module-protocol-native.c
+++ b/src/modules/module-protocol-native.c
@@ -39,7 +39,7 @@
 #include "pipewire/client.h"
 #include "pipewire/resource.h"
 #include "pipewire/link.h"
-#include "pipewire/node-factory.h"
+#include "pipewire/factory.h"
 #include "pipewire/data-loop.h"
 #include "pipewire/main-loop.h"
 
diff --git a/src/pipewire/pipewire.h b/src/pipewire/pipewire.h
index 807b73a2d..d8d10b685 100644
--- a/src/pipewire/pipewire.h
+++ b/src/pipewire/pipewire.h
@@ -35,7 +35,7 @@ extern "C" {
 #include <pipewire/loop.h>
 #include <pipewire/main-loop.h>
 #include <pipewire/module.h>
-#include <pipewire/node-factory.h>
+#include <pipewire/factory.h>
 #include <pipewire/node.h>
 #include <pipewire/port.h>
 #include <pipewire/properties.h>
diff --git a/src/pipewire/type.c b/src/pipewire/type.c
index 48b288791..f5664d824 100644
--- a/src/pipewire/type.c
+++ b/src/pipewire/type.c
@@ -28,8 +28,6 @@
 #include "pipewire/type.h"
 #include "pipewire/module.h"
 
-#include "pipewire/node-factory.h"
-
 
 /** Initializes the type system
  * \param type a type structure