7 files changed, 16 insertions, 21 deletions
diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp
index f0e9a6ad..8eb39cd7 100644
--- a/src/gui/Configuration.cpp
+++ b/src/gui/Configuration.cpp
@@ -23,7 +23,7 @@
 #include "raul/log.hpp"
 #include "ingen/client/PortModel.hpp"
 #include "ingen/client/PluginModel.hpp"
-#include "serialisation/Parser.hpp"
+#include "ingen/serialisation/Parser.hpp"
 #include "shared/LV2URIMap.hpp"
 #include "flowcanvas/Port.hpp"
 #include "App.hpp"
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index c15512a9..1d4cb7c8 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -26,7 +26,6 @@
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "shared/runtime_paths.hpp"
-#include "serialisation/names.hpp"
 #include "App.hpp"
 #include "LoadPatchWindow.hpp"
 #include "PatchView.hpp"
@@ -75,12 +74,10 @@ LoadPatchWindow::LoadPatchWindow(BaseObjectType*                   cobject,
 			sigc::mem_fun(this, &LoadPatchWindow::selection_changed));
 
 	Gtk::FileFilter filt;
-	filt.add_pattern("*" INGEN_PATCH_FILE_EXT);
-	filt.set_name("Ingen patch files (*" INGEN_PATCH_FILE_EXT ")");
-	filt.add_pattern("*" INGEN_BUNDLE_EXT);
-	filt.set_name("Ingen bundles (*" INGEN_BUNDLE_EXT ")");
-	filt.add_pattern("*.om");
-	filt.set_name("Om patch files (*.om)");
+	filt.add_pattern("*.ttl");
+	filt.set_name("Ingen patch files (*.ttl)");
+	filt.add_pattern("*.ingen");
+	filt.set_name("Ingen bundles (*.ingen)");
 
 	set_filter(filt);
 
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 6cf461e7..70efb855 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -26,7 +26,7 @@
 #include "shared/LV2URIMap.hpp"
 #include "shared/Builder.hpp"
 #include "shared/ClashAvoider.hpp"
-#include "serialisation/Serialiser.hpp"
+#include "ingen/serialisation/Serialiser.hpp"
 #include "ingen/client/PluginModel.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/NodeModel.hpp"
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index 657d2874..b06c3fb5 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -26,7 +26,6 @@
 #include "shared/LV2URIMap.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "ingen/client/ClientStore.hpp"
-#include "serialisation/names.hpp"
 #include "App.hpp"
 #include "PatchCanvas.hpp"
 #include "LoadPluginWindow.hpp"
@@ -425,7 +424,7 @@ PatchWindow::event_save_as()
 		save_button->property_has_default() = true;
 
 		Gtk::FileFilter filt;
-		filt.add_pattern("*" INGEN_BUNDLE_EXT);
+		filt.add_pattern("*.ingen");
 		filt.set_name("Ingen bundles");
 		dialog.set_filter(filt);
 
@@ -443,11 +442,11 @@ PatchWindow::event_save_as()
 		std::string basename = Glib::path_get_basename(filename);
 
 		if (basename.find('.') == string::npos) {
-			filename += INGEN_BUNDLE_EXT;
-			basename += INGEN_BUNDLE_EXT;
-		} else if (filename.substr(filename.length() - 10) != INGEN_BUNDLE_EXT) {
+			filename += ".ingen";
+			basename += ".ingen";
+		} else if (filename.substr(filename.length() - 10) != ".ingen") {
 			Gtk::MessageDialog error_dialog(*this,
-"<b>" "Ingen patches must be saved to Ingen bundles (*" INGEN_BUNDLE_EXT ")." "</b>",
+"<b>" "Ingen patches must be saved to Ingen bundles (*.ingen)." "</b>",
 					true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
 			error_dialog.run();
 			continue;
diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp
index 3cba5f97..e4dbb303 100644
--- a/src/gui/ThreadedLoader.cpp
+++ b/src/gui/ThreadedLoader.cpp
@@ -19,7 +19,6 @@
 #include "raul/log.hpp"
 #include "shared/World.hpp"
 #include "shared/Module.hpp"
-#include "serialisation/names.hpp"
 #include "App.hpp"
 #include "ThreadedLoader.hpp"
 #include "ingen/client/PatchModel.hpp"
@@ -120,7 +119,7 @@ ThreadedLoader::save_patch_event(SharedPtr<const PatchModel> model,
                                  const string&               filename)
 {
 	if (App::instance().serialiser()) {
-		if (filename.find(INGEN_BUNDLE_EXT) != string::npos)
+		if (filename.find(".ingen") != string::npos)
 			App::instance().serialiser()->write_bundle(model, filename);
 		else
 			App::instance().serialiser()->to_file(model, filename);
diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp
index 41f56340..ab5995f9 100644
--- a/src/gui/ThreadedLoader.hpp
+++ b/src/gui/ThreadedLoader.hpp
@@ -26,8 +26,9 @@
 #include "raul/Slave.hpp"
 #include <glibmm/thread.h>
 #include "ingen/ServerInterface.hpp"
-#include "serialisation/Serialiser.hpp"
-#include "serialisation/Parser.hpp"
+#include "ingen/serialisation/Serialiser.hpp"
+#include "ingen/serialisation/Parser.hpp"
+
 using std::string;
 using std::list;
 using boost::optional;
diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp
index 9bf4ec52..0c02f411 100644
--- a/src/gui/UploadPatchWindow.cpp
+++ b/src/gui/UploadPatchWindow.cpp
@@ -25,8 +25,7 @@
 #include "shared/LV2URIMap.hpp"
 #include "ingen/client/ClientStore.hpp"
 #include "ingen/ServerInterface.hpp"
-#include "serialisation/Serialiser.hpp"
-#include "serialisation/names.hpp"
+#include "ingen/serialisation/Serialiser.hpp"
 #include "ingen/client/PatchModel.hpp"
 #include "UploadPatchWindow.hpp"
 #include "App.hpp"