Changed namespace names, removed almost all references to "Om"

git-svn-id: http://svn.drobilla.net/lad/ingen@97 a436a847-0d15-0410-975c-d299462d15a1

265 files changed, 830 insertions, 823 deletions

diff --git a/src/common/interface/ClientInterface.h b/src/common/interface/ClientInterface.h
index 380f96c3..eac8e605 100644
--- a/src/common/interface/ClientInterface.h
+++ b/src/common/interface/ClientInterface.h
@@ -21,7 +21,7 @@
 #include <string>
 using std::string;
 
-namespace Om {
+namespace Ingen {
 namespace Shared {
 
 
@@ -97,6 +97,6 @@ protected:
 
 
 } // namespace Shared
-} // namespace Om
+} // namespace Ingen
 
 #endif
diff --git a/src/common/interface/ClientKey.h b/src/common/interface/ClientKey.h
index 98a77a74..d53a4870 100644
--- a/src/common/interface/ClientKey.h
+++ b/src/common/interface/ClientKey.h
@@ -19,7 +19,7 @@
 
 #include <string>
 
-namespace Om {
+namespace Ingen {
 namespace Shared {
 
 
@@ -78,7 +78,7 @@ protected:
 
 
 } // namespace Shared
-} // namespace Om
+} // namespace Ingen
 
 #endif // CLIENTKEY_H
 
diff --git a/src/common/interface/EngineInterface.h b/src/common/interface/EngineInterface.h
index d8db6d2d..864e1b6f 100644
--- a/src/common/interface/EngineInterface.h
+++ b/src/common/interface/EngineInterface.h
@@ -23,7 +23,7 @@
 #include "interface/ClientInterface.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 /** Shared code used on both client side and engine side (abstract interfaces). */
 namespace Shared {
 
@@ -119,7 +119,7 @@ protected:
 
 
 } // namespace Shared
-} // namespace Om
+} // namespace Ingen
 
 #endif // ENGINEINTERFACE_H
 
diff --git a/src/common/util/Path.h b/src/common/util/Path.h
index 441f35cd..d79a95c2 100644
--- a/src/common/util/Path.h
+++ b/src/common/util/Path.h
@@ -21,8 +21,6 @@
 #include <cassert>
 using std::string;
 
-namespace Om {
-
 	
 /** Simple wrapper around standard string with useful path-specific methods.
  *
@@ -134,6 +132,4 @@ public:
 };
 	
 
-} // namespace Om
-
 #endif // PATH_H
diff --git a/src/libs/client/ConnectionModel.cpp b/src/libs/client/ConnectionModel.cpp
index e36cd25a..778678f7 100644
--- a/src/libs/client/ConnectionModel.cpp
+++ b/src/libs/client/ConnectionModel.cpp
@@ -18,7 +18,8 @@
 #include "PortModel.h"
 #include "PatchModel.h"
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 ConnectionModel::ConnectionModel(const Path& src_port, const Path& dst_port)
@@ -97,4 +98,5 @@ ConnectionModel::patch_path() const
 }
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
diff --git a/src/libs/client/ConnectionModel.h b/src/libs/client/ConnectionModel.h
index a1976dd0..fe244649 100644
--- a/src/libs/client/ConnectionModel.h
+++ b/src/libs/client/ConnectionModel.h
@@ -24,20 +24,20 @@
 #include "PortModel.h"
 #include <cassert>
 using std::string;
-using Om::Path;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 /** Class to represent a port->port connection in the engine.
  *
  * This can either have pointers to the connection ports' models, or just
- * paths as strings.  LibOmClient passes just strings (by necessity), but
+ * paths as strings.  The engine passes just strings (by necessity), but
  * clients can set the pointers then they don't have to worry about port
  * renaming, as the connections will always return the port's path, even
  * if it changes.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class ConnectionModel
 {
@@ -66,6 +66,7 @@ private:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // CONNECTIONMODEL_H
diff --git a/src/libs/client/ControlModel.h b/src/libs/client/ControlModel.h
index 0c396b50..08143c73 100644
--- a/src/libs/client/ControlModel.h
+++ b/src/libs/client/ControlModel.h
@@ -20,12 +20,13 @@
 #include <string>
 #include "util/Path.h"
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 	
 /** A single port's control setting (in a preset).
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class ControlModel
 {
@@ -48,6 +49,7 @@ private:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // CONTROLMODEL
diff --git a/src/libs/client/DirectSigClientInterface.h b/src/libs/client/DirectSigClientInterface.h
index dc8f9c45..d57771cd 100644
--- a/src/libs/client/DirectSigClientInterface.h
+++ b/src/libs/client/DirectSigClientInterface.h
@@ -23,7 +23,8 @@
 #include "SigClientInterface.h"
 using std::string;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 /** A direct (nonthreaded) LibSigC++ signal emitting interface for clients to use.
@@ -107,6 +108,7 @@ private:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif
diff --git a/src/libs/client/ModelClientInterface.cpp b/src/libs/client/ModelClientInterface.cpp
index 9e9d8a78..f2fcd10e 100644
--- a/src/libs/client/ModelClientInterface.cpp
+++ b/src/libs/client/ModelClientInterface.cpp
@@ -21,7 +21,8 @@
 #include "NodeModel.h"
 #include "PluginModel.h"
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 void
@@ -131,4 +132,5 @@ ModelClientInterface::connection(const string& src_port_path,
 
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
diff --git a/src/libs/client/ModelClientInterface.h b/src/libs/client/ModelClientInterface.h
index c0e7fdd1..d4362a38 100644
--- a/src/libs/client/ModelClientInterface.h
+++ b/src/libs/client/ModelClientInterface.h
@@ -22,7 +22,8 @@
 using std::string; using std::auto_ptr;
 #include "interface/ClientInterface.h"
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 class PatchModel;
 class NodeModel;
@@ -37,13 +38,13 @@ class PluginModel;
  * this and implement a class with a similar interface to ClientInterface except
  * with model classes passed where appropriate instead of primitives.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
-class ModelClientInterface : virtual public Om::Shared::ClientInterface
+class ModelClientInterface : virtual public Ingen::Shared::ClientInterface
 {
 public:
-	ModelClientInterface(Om::Shared::ClientInterface& extend)
-	: Om::Shared::ClientInterface(extend)
+	ModelClientInterface(Ingen::Shared::ClientInterface& extend)
+	: Ingen::Shared::ClientInterface(extend)
 	{}
 	
 	virtual ~ModelClientInterface() {}
@@ -82,6 +83,7 @@ protected:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // MODELCLIENTINTERFACE_H
diff --git a/src/libs/client/ModelEngineInterface.h b/src/libs/client/ModelEngineInterface.h
index dd6ca54a..763cdc69 100644
--- a/src/libs/client/ModelEngineInterface.h
+++ b/src/libs/client/ModelEngineInterface.h
@@ -22,10 +22,11 @@
 #include "interface/EngineInterface.h"
 using std::string;
 
-/** \defgroup libomclient Client Library
+/** \defgroup IngenClient Client Library
  */
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 class NodeModel;
 class PresetModel;
@@ -36,7 +37,7 @@ class ModelClientInterface;
 
 /** Model-based engine command interface.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class ModelEngineInterface
 {
@@ -53,6 +54,7 @@ protected:
 	ModelEngineInterface() {}
 };
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // MODELENGINEINTERFACE_H
diff --git a/src/libs/client/NodeModel.cpp b/src/libs/client/NodeModel.cpp
index a7209ffc..496e02db 100644
--- a/src/libs/client/NodeModel.cpp
+++ b/src/libs/client/NodeModel.cpp
@@ -18,7 +18,8 @@
 #include "PatchModel.h"
 #include <cassert>
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 NodeModel::NodeModel(CountedPtr<PluginModel> plugin, const Path& path)
@@ -126,4 +127,5 @@ NodeModel::remove_program(int bank, int program)
 		m_banks.erase(bank);
 }
 
-}
+} // namespace Client
+} // namespace Ingen
diff --git a/src/libs/client/NodeModel.h b/src/libs/client/NodeModel.h
index 8b6cacfb..6ab6b873 100644
--- a/src/libs/client/NodeModel.h
+++ b/src/libs/client/NodeModel.h
@@ -31,14 +31,15 @@
 using std::string; using std::map; using std::find;
 using std::cout; using std::cerr; using std::endl;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 class PluginModel;
 
 	
 /** Node model class, used by the client to store engine's state.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class NodeModel : public ObjectModel
 {
@@ -79,8 +80,8 @@ protected:
 	bool                        m_polyphonic;
 	PortModelList               m_ports;  ///< List of ports (instead of map to preserve order)
 	CountedPtr<PluginModel>     m_plugin; ///< The plugin this node is an instance of
-	float                       m_x;      ///< Just metadata, here as an optimization for OmGtk
-	float                       m_y;      ///< Just metadata, here as an optimization for OmGtk
+	float                       m_x;      ///< Just metadata, here as an optimization for GUI
+	float                       m_y;      ///< Just metadata, here as an optimization for GUI
 	map<int, map<int, string> > m_banks;  ///< DSSI banks
 
 private:
@@ -93,6 +94,7 @@ private:
 typedef map<string, CountedPtr<NodeModel> >   NodeModelMap;
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // NODEMODEL_H
diff --git a/src/libs/client/OSCEngineInterface.cpp b/src/libs/client/OSCEngineInterface.cpp
index 72b2fda1..29bb965a 100644
--- a/src/libs/client/OSCEngineInterface.cpp
+++ b/src/libs/client/OSCEngineInterface.cpp
@@ -17,7 +17,8 @@
 #include "OSCEngineInterface.h"
 #include "interface/ClientKey.h"
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 /** Note the sending port is implicitly set by liblo, lo_send by default sends
  * from the most recently created server, so create the OSC listener before
@@ -341,6 +342,7 @@ OSCEngineInterface::request_all_objects()
 
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 
diff --git a/src/libs/client/OSCEngineInterface.h b/src/libs/client/OSCEngineInterface.h
index 7c6c2673..69b7dc05 100644
--- a/src/libs/client/OSCEngineInterface.h
+++ b/src/libs/client/OSCEngineInterface.h
@@ -22,19 +22,20 @@
 #include <lo/lo.h>
 #include "interface/EngineInterface.h"
 using std::string;
-using Om::Shared::EngineInterface;
-using Om::Shared::ClientInterface;
-using Om::Shared::ClientKey;
+using Ingen::Shared::EngineInterface;
+using Ingen::Shared::ClientInterface;
+using Ingen::Shared::ClientKey;
 
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 /* OSC (via liblo) interface to the engine.
  *
  * Clients can use this opaquely as an EngineInterface* to control the engine
  * over OSC (whether over a network or not, etc).
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class OSCEngineInterface : public EngineInterface
 {
@@ -137,7 +138,8 @@ protected:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // OSCENGINEINTERFACE_H
 
diff --git a/src/libs/client/OSCListener.cpp b/src/libs/client/OSCListener.cpp
index e7b483ec..c63ffd85 100644
--- a/src/libs/client/OSCListener.cpp
+++ b/src/libs/client/OSCListener.cpp
@@ -23,7 +23,8 @@
 #include <iostream>
 using std::cerr; using std::cout; using std::endl;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 	
 /** Construct a OSCListener with a user-provided ModelClientInterface object for notification
@@ -410,4 +411,5 @@ OSCListener::m_program_remove_cb(const char* path, const char* types, lo_arg** a
 }
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
diff --git a/src/libs/client/OSCListener.h b/src/libs/client/OSCListener.h
index e5947558..3e9d165d 100644
--- a/src/libs/client/OSCListener.h
+++ b/src/libs/client/OSCListener.h
@@ -22,7 +22,10 @@
 #include <lo/lo.h>
 #include "interface/ClientInterface.h"
 
-namespace LibOmClient {
+namespace Ingen {
+
+/** Client library */
+namespace Client {
 
 //class NodeModel;
 //class PresetModel;
@@ -50,9 +53,9 @@ inline static int name##_cb(LO_HANDLER_ARGS, void* osc_listener)\
  * things like listening to the notification band over TCP while sending commands
  * on the control band over UDP.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
-class OSCListener : virtual public Om::Shared::ClientInterface
+class OSCListener : virtual public Ingen::Shared::ClientInterface
 {
 public:
 	OSCListener(int listen_port);
@@ -111,6 +114,8 @@ private:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+
+} // namespace Ingen
 
 #endif // OSCLISTENER_H
diff --git a/src/libs/client/OSCModelEngineInterface.cpp b/src/libs/client/OSCModelEngineInterface.cpp
index 98c35d46..2e831705 100644
--- a/src/libs/client/OSCModelEngineInterface.cpp
+++ b/src/libs/client/OSCModelEngineInterface.cpp
@@ -31,7 +31,8 @@
 
 using std::cerr; using std::cout; using std::endl;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 	
 /** Construct a OSCModelEngineInterface with a user-provided ModelClientInterface object for notification
@@ -58,7 +59,7 @@ OSCModelEngineInterface::~OSCModelEngineInterface()
 }
 
 
-/** Attempt to connect to the Om engine and notify it of our existance.
+/** Attempt to connect to the engine and notify it of our existance.
  *
  * Passing a client_port of 0 will automatically choose a free port.  If the
  * @a block parameter is true, this function will not return until a connection
@@ -361,4 +362,5 @@ OSCModelEngineInterface::m_om_response_error_cb(const char* path, const char* ty
 }
 */
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
diff --git a/src/libs/client/OSCModelEngineInterface.h b/src/libs/client/OSCModelEngineInterface.h
index 90f90e74..a2172e23 100644
--- a/src/libs/client/OSCModelEngineInterface.h
+++ b/src/libs/client/OSCModelEngineInterface.h
@@ -25,10 +25,11 @@
 #include "ModelEngineInterface.h"
 using std::string;
 
-/** \defgroup libomclient Client Library
+/** \defgroup IngenClient Client Library
  */
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 class NodeModel;
 class PresetModel;
@@ -53,7 +54,7 @@ class ModelClientInterface;
  * will change in the future (for complete separation).  See OSC namespace
  * documentation for more details.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class OSCModelEngineInterface : public OSCEngineInterface, public ModelEngineInterface
 {
@@ -112,6 +113,7 @@ OSCModelEngineInterface::om_response_error_cb(const char* path, const char* type
 	return ((OSCModelEngineInterface*)comm)->m_om_response_error_cb(path, types, argv, argc, data);
 }
 */
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // OSCCONTROLLER_H
diff --git a/src/libs/client/ObjectController.h b/src/libs/client/ObjectController.h
index bc776ce2..fca59a80 100644
--- a/src/libs/client/ObjectController.h
+++ b/src/libs/client/ObjectController.h
@@ -17,7 +17,8 @@
 #ifndef OBJECTCONTROLLER_H
 #define OBJECTCONTROLLER_H
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 	
 /** A trivial base class for controllers of an ObjectModel.
@@ -28,7 +29,7 @@ namespace LibOmClient {
  * Models, rather than having a parallel structure of pointers in the
  * app's controllers.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class ObjectController
 {
@@ -37,7 +38,8 @@ public:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 
 #endif // OBJECTCONTROLLER_H
diff --git a/src/libs/client/ObjectModel.cpp b/src/libs/client/ObjectModel.cpp
index 6e8a2809..6309a774 100644
--- a/src/libs/client/ObjectModel.cpp
+++ b/src/libs/client/ObjectModel.cpp
@@ -16,7 +16,8 @@
 
 #include "ObjectModel.h"
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 ObjectModel::ObjectModel(const string& path)
@@ -60,5 +61,6 @@ ObjectModel::set_controller(ObjectController* c)
 	m_controller = c;
 }
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
diff --git a/src/libs/client/ObjectModel.h b/src/libs/client/ObjectModel.h
index ad54985b..9daccfd2 100644
--- a/src/libs/client/ObjectModel.h
+++ b/src/libs/client/ObjectModel.h
@@ -28,16 +28,16 @@
 #include "util/CountedPtr.h"
 using std::string; using std::map; using std::find;
 using std::cout; using std::cerr; using std::endl;
-using Om::Path;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 class ObjectController;
 
 	
-/** Base class for all OmObject models (NodeModel, PatchModel, PortModel).
+/** Base class for all GraphObject models (NodeModel, PatchModel, PortModel).
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class ObjectModel
 {
@@ -82,6 +82,7 @@ private:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // OBJECTMODEL_H
diff --git a/src/libs/client/PatchLibrarian.cpp b/src/libs/client/PatchLibrarian.cpp
index 678e1797..e12c99e0 100644
--- a/src/libs/client/PatchLibrarian.cpp
+++ b/src/libs/client/PatchLibrarian.cpp
@@ -41,7 +41,8 @@
 using std::string; using std::vector; using std::pair;
 using std::cerr; using std::cout; using std::endl;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 	
 /** Searches for the filename passed in the path, returning the full
@@ -101,7 +102,7 @@ PatchLibrarian::find_file(const string& filename, const string& additional_path)
  *
  * This will break if:
  * - The filename does not have an extension (ie contain a ".")
- * - The patch_model has no (Om) path
+ * - The patch_model has no (Ingen) path
  */
 void
 PatchLibrarian::save_patch(PatchModel* patch_model, const string& filename, bool recursive)
@@ -391,7 +392,7 @@ PatchLibrarian::load_patch(PatchModel* pm, bool wait, bool existing)
 	}
 
 	if (xmlStrcmp(cur->name, (const xmlChar*) "patch")) {
-		cerr << "File is not an Om patch file, root node != patch" << endl;
+		cerr << "File is not an Ingen patch file (root node != <patch>)" << endl;
 		xmlFreeDoc(doc);
 		return "";
 	}
@@ -830,4 +831,5 @@ PatchLibrarian::parse_preset(const PatchModel* patch, xmlDocPtr doc, const xmlNo
 	return pm;
 }
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
diff --git a/src/libs/client/PatchLibrarian.cpp.new b/src/libs/client/PatchLibrarian.cpp.new
index 8e26e833..d05d34c5 100644
--- a/src/libs/client/PatchLibrarian.cpp.new
+++ b/src/libs/client/PatchLibrarian.cpp.new
@@ -1,11 +1,11 @@
-/* This file is part of Om.  Copyright (C) 2005 Dave Robillard.
+/* This file is part of Ingen.  Copyright (C) 2005 Dave Robillard.
  * 
- * Om is free software; you can redistribute it and/or modify it under the
+ * Ingen is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
  * 
- * Om is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Ingen is distributed in the hope that 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 details.
  * 
@@ -40,7 +40,8 @@
 using std::string; using std::vector; using std::pair;
 using std::cerr; using std::cout; using std::endl;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 	
 /** Searches for the filename passed in the path, returning the full
@@ -100,7 +101,7 @@ PatchLibrarian::find_file(const string& filename, const string& additional_path)
  *
  * This will break if:
  * - The filename does not have an extension (ie contain a ".")
- * - The patch_model has no (Om) path
+ * - The patch_model has no (Ingen) path
  */
 void
 PatchLibrarian::save_patch(PatchModel* patch_model, const string& filename, bool recursive)
@@ -391,7 +392,7 @@ PatchLibrarian::load_patch(PatchModel* pm, bool wait, bool existing)
 	}
 
 	if (xmlStrcmp(cur->name, (const xmlChar*) "patch")) {
-		cerr << "File is not an Om patch file, root node != patch" << endl;
+		cerr << "File is not an Ingen patch file (root node != <patch>)" << endl;
 		xmlFreeDoc(doc);
 		return "";
 	}
@@ -827,4 +828,5 @@ PatchLibrarian::parse_preset(const PatchModel* patch, xmlDocPtr doc, const xmlNo
 	return pm;
 }
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
diff --git a/src/libs/client/PatchLibrarian.h b/src/libs/client/PatchLibrarian.h
index b462ab82..817f98ca 100644
--- a/src/libs/client/PatchLibrarian.h
+++ b/src/libs/client/PatchLibrarian.h
@@ -24,7 +24,8 @@
 
 using std::string;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 class PatchModel;
 class NodeModel;
@@ -36,7 +37,7 @@ class ModelClientInterface;
 	
 /** Handles all patch saving and loading.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class PatchLibrarian
 {
@@ -73,6 +74,7 @@ private:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // PATCHLIBRARIAN_H
diff --git a/src/libs/client/PatchModel.cpp b/src/libs/client/PatchModel.cpp
index 8194d7fd..5afec7ab 100644
--- a/src/libs/client/PatchModel.cpp
+++ b/src/libs/client/PatchModel.cpp
@@ -22,7 +22,8 @@
 
 using std::cerr; using std::cout; using std::endl;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 void
@@ -254,4 +255,5 @@ PatchModel::polyphonic() const
 }
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
diff --git a/src/libs/client/PatchModel.h b/src/libs/client/PatchModel.h
index 9d5abadf..c15f7746 100644
--- a/src/libs/client/PatchModel.h
+++ b/src/libs/client/PatchModel.h
@@ -28,12 +28,13 @@
 
 using std::list; using std::string; using std::map;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 /** Client's model of a patch.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class PatchModel : public NodeModel
 {
@@ -94,6 +95,7 @@ private:
 typedef map<string, CountedPtr<PatchModel> > PatchModelMap;
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // PATCHMODEL_H
diff --git a/src/libs/client/PluginModel.h b/src/libs/client/PluginModel.h
index 4f5987e5..5174db76 100644
--- a/src/libs/client/PluginModel.h
+++ b/src/libs/client/PluginModel.h
@@ -20,12 +20,13 @@
 #include <string>
 using std::string;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 /** Model for a plugin available for loading.
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class PluginModel
 {
@@ -99,7 +100,8 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Client
+} // namespace Ingen
 
 #endif // PLUGINMODEL_H
 
diff --git a/src/libs/client/PortModel.h b/src/libs/client/PortModel.h
index ecf5bd34..37e312f3 100644
--- a/src/libs/client/PortModel.h
+++ b/src/libs/client/PortModel.h
@@ -25,11 +25,12 @@
 #include "util/CountedPtr.h"
 using std::string; using std::list;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 /* Model of a port.
  *
- * \ingroup libomclient.
+ * \ingroup IngenClient.
  */
 class PortModel : public ObjectModel
 {
@@ -118,6 +119,7 @@ private:
 typedef list<CountedPtr<PortModel> > PortModelList;
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // PORTMODEL_H
diff --git a/src/libs/client/PresetModel.h b/src/libs/client/PresetModel.h
index 302897ba..e56a9177 100644
--- a/src/libs/client/PresetModel.h
+++ b/src/libs/client/PresetModel.h
@@ -23,12 +23,13 @@
 
 using std::string; using std::list;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 /** Model of a preset (a collection of control settings).
  *
- * \ingroup libomclient
+ * \ingroup IngenClient
  */
 class PresetModel
 {
@@ -61,6 +62,7 @@ private:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // PRESETMODEL
diff --git a/src/libs/client/SigClientInterface.h b/src/libs/client/SigClientInterface.h
index 66e66ab1..6e14de8c 100644
--- a/src/libs/client/SigClientInterface.h
+++ b/src/libs/client/SigClientInterface.h
@@ -23,7 +23,8 @@
 #include "interface/ClientInterface.h"
 using std::string;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 /** A LibSigC++ signal emitting interface for clients to use.
@@ -32,7 +33,7 @@ namespace LibOmClient {
  * the engine.  Use Store (which extends this) if you want a nice client-side
  * model of the engine.
  */
-class SigClientInterface : virtual public Om::Shared::ClientInterface, public sigc::trackable
+class SigClientInterface : virtual public Ingen::Shared::ClientInterface, public sigc::trackable
 {
 public:
 
@@ -121,6 +122,7 @@ protected:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif
diff --git a/src/libs/client/Store.cpp b/src/libs/client/Store.cpp
index bd7e2e68..0b25da2e 100644
--- a/src/libs/client/Store.cpp
+++ b/src/libs/client/Store.cpp
@@ -23,7 +23,8 @@
 #include "PatchModel.h"
 #include "SigClientInterface.h"
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 /// Singleton instance
@@ -390,5 +391,6 @@ Store::disconnection_event(const Path& src_port_path, const Path& dst_port_path)
 }
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
diff --git a/src/libs/client/Store.h b/src/libs/client/Store.h
index 4016e325..ff3eea62 100644
--- a/src/libs/client/Store.h
+++ b/src/libs/client/Store.h
@@ -24,9 +24,9 @@
 #include <sigc++/sigc++.h>
 #include "util/Path.h"
 using std::string; using std::map;
-using Om::Path;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 class SigClientInterface;
 class ObjectModel;
@@ -35,9 +35,9 @@ class PatchModel;
 class NodeModel;
 class PortModel;
 
-/** Singeton which holds all "Om Objects" for easy/fast lookup
+/** Singeton which holds all "Ingen Objects" for easy/fast lookup
  *
- * \ingroup OmGtk
+ * \ingroup IngenClient
  */
 class Store : public sigc::trackable { // FIXME: is trackable necessary?
 public:
@@ -79,11 +79,12 @@ private:
 	void connection_event(const Path& src_port_path, const Path& dst_port_path);
 	void disconnection_event(const Path& src_port_path, const Path& dst_port_path);
 	
-	map<string, CountedPtr<ObjectModel> > m_objects; ///< Keyed by Om path
+	map<string, CountedPtr<ObjectModel> > m_objects; ///< Keyed by Ingen path
 	map<string, CountedPtr<PluginModel> > m_plugins; ///< Keyed by URI
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif // STORE_H
diff --git a/src/libs/client/ThreadedSigClientInterface.cpp b/src/libs/client/ThreadedSigClientInterface.cpp
index dd1224c6..dd4503e7 100644
--- a/src/libs/client/ThreadedSigClientInterface.cpp
+++ b/src/libs/client/ThreadedSigClientInterface.cpp
@@ -18,7 +18,8 @@
 #include <iostream>
 using std::cerr; using std::endl;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 /** Push an event (from the engine, ie 'new patch') on to the queue.
@@ -65,4 +66,5 @@ ThreadedSigClientInterface::emit_signals()
 }
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
diff --git a/src/libs/client/ThreadedSigClientInterface.h b/src/libs/client/ThreadedSigClientInterface.h
index fd88acd1..985b1f26 100644
--- a/src/libs/client/ThreadedSigClientInterface.h
+++ b/src/libs/client/ThreadedSigClientInterface.h
@@ -28,7 +28,8 @@ using std::string;
 /** Returns nothing and takes no parameters (because they have all been bound) */
 typedef sigc::slot<void> Closure;
 
-namespace LibOmClient {
+namespace Ingen {
+namespace Client {
 
 
 /** A LibSigC++ signal emitting interface for clients to use.
@@ -172,6 +173,7 @@ private:
 };
 
 
-} // namespace LibOmClient
+} // namespace Client
+} // namespace Ingen
 
 #endif
diff --git a/src/libs/engine/AlsaMidiDriver.cpp b/src/libs/engine/AlsaMidiDriver.cpp
index a27470dd..76d11ddb 100644
--- a/src/libs/engine/AlsaMidiDriver.cpp
+++ b/src/libs/engine/AlsaMidiDriver.cpp
@@ -30,7 +30,7 @@
 #endif
 using std::cout; using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 	
 //// AlsaMidiPort ////
@@ -208,7 +208,7 @@ AlsaMidiDriver::AlsaMidiDriver()
 		snd_midi_event_reset_decode(m_event_coder);
 	}
 
-	snd_seq_set_client_name(m_seq_handle, "Om");
+	snd_seq_set_client_name(m_seq_handle, "Ingen");
 }
 
 
@@ -367,5 +367,5 @@ AlsaMidiDriver::process_midi_in(void* alsa_driver)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/AlsaMidiDriver.h b/src/libs/engine/AlsaMidiDriver.h
index 2ddbaecd..c1941c42 100644
--- a/src/libs/engine/AlsaMidiDriver.h
+++ b/src/libs/engine/AlsaMidiDriver.h
@@ -22,7 +22,7 @@
 #include "util/Queue.h"
 #include "MidiDriver.h"
 
-namespace Om {
+namespace Ingen {
 
 class Node;
 class SetPortValueEvent;
@@ -121,7 +121,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // ALSAMIDIDRIVER_H
diff --git a/src/libs/engine/AudioDriver.h b/src/libs/engine/AudioDriver.h
index a76fce8d..f46d4689 100644
--- a/src/libs/engine/AudioDriver.h
+++ b/src/libs/engine/AudioDriver.h
@@ -21,7 +21,7 @@
 #include "types.h"
 #include "List.h"
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 class AudioDriver;
@@ -45,6 +45,6 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // AUDIODRIVER_H
diff --git a/src/libs/engine/Buffer.cpp b/src/libs/engine/Buffer.cpp
index ff43664d..af655a19 100644
--- a/src/libs/engine/Buffer.cpp
+++ b/src/libs/engine/Buffer.cpp
@@ -24,7 +24,7 @@ using std::cerr; using std::endl;
 /* TODO: Be sure these functions are vectorized by GCC when it's vectorizer
  * stops sucking.  Probably a good idea to inline them as well */
 
-namespace Om {
+namespace Ingen {
 
 
 template <typename T>
@@ -313,4 +313,4 @@ template void DriverBuffer<Sample>::set_data(sample* data);
 template void DriverBuffer<MidiMessage>::set_data(MidiMessage* data);
 #endif
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/Buffer.h b/src/libs/engine/Buffer.h
index 96407623..13c75bbc 100644
--- a/src/libs/engine/Buffer.h
+++ b/src/libs/engine/Buffer.h
@@ -21,7 +21,7 @@
 #include <cassert>
 #include "types.h"
 
-namespace Om {
+namespace Ingen {
 
 	
 template <typename T>
@@ -89,6 +89,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // BUFFER_H
diff --git a/src/libs/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp
index f073fd19..b6caf962 100644
--- a/src/libs/engine/ClientBroadcaster.cpp
+++ b/src/libs/engine/ClientBroadcaster.cpp
@@ -33,9 +33,9 @@
 #include "interface/ClientInterface.h"
 #include "OSCClient.h"
 using std::cout; using std::cerr; using std::endl;
-using Om::Shared::ClientInterface;
+using Ingen::Shared::ClientInterface;
 
-namespace Om {
+namespace Ingen {
 
 	
 /** Register a client to receive messages over the notification band.
@@ -327,4 +327,4 @@ ClientBroadcaster::send_node_creation_messages(const Node* const node)
 }
 */	
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/ClientBroadcaster.h b/src/libs/engine/ClientBroadcaster.h
index 3b7158e5..2c9890a6 100644
--- a/src/libs/engine/ClientBroadcaster.h
+++ b/src/libs/engine/ClientBroadcaster.h
@@ -29,7 +29,7 @@
 
 using std::list; using std::string; using std::pair;
 
-namespace Om {
+namespace Ingen {
 
 class Node;
 class Port;
@@ -94,7 +94,7 @@ private:
 
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // CLIENTBROADCASTER_H
 
diff --git a/src/libs/engine/Connection.cpp b/src/libs/engine/Connection.cpp
index ac650753..a896913b 100644
--- a/src/libs/engine/Connection.cpp
+++ b/src/libs/engine/Connection.cpp
@@ -19,7 +19,7 @@
 #include "Node.h"
 #include "Port.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Constructor for a connection from a node's output port.
@@ -39,5 +39,5 @@ Connection::Connection(Port* const src_port, Port* const dst_port)
 		|| (src_port->parent_node()->poly() == 1 || dst_port->parent_node()->poly() == 1));
 }
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/Connection.h b/src/libs/engine/Connection.h
index 665031f9..e2422a33 100644
--- a/src/libs/engine/Connection.h
+++ b/src/libs/engine/Connection.h
@@ -21,7 +21,7 @@
 #include "MaidObject.h"
 #include "types.h"
 
-namespace Om {
+namespace Ingen {
 
 class Port;
 
@@ -60,6 +60,6 @@ protected:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // CONNECTION_H
diff --git a/src/libs/engine/Controller.h b/src/libs/engine/Controller.h
index eb7bafb3..82b3d7fd 100644
--- a/src/libs/engine/Controller.h
+++ b/src/libs/engine/Controller.h
@@ -17,10 +17,10 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 
-namespace Om {
+namespace Ingen {
 
 
-/** Public interface to Om engine shared library.
+/** Public interface to engine library.
  *
  * This is an interface to all the audio-processing related functionality
  * only.  OSC communication, LASH session management, etc, are not part of 
@@ -76,7 +76,7 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // CONTROLLER_H
 
diff --git a/src/libs/engine/DSSINode.cpp b/src/libs/engine/DSSINode.cpp
index ba415446..9c866915 100644
--- a/src/libs/engine/DSSINode.cpp
+++ b/src/libs/engine/DSSINode.cpp
@@ -24,7 +24,7 @@
 
 using namespace std;
 
-namespace Om {
+namespace Ingen {
 
 
 DSSINode::DSSINode(const Plugin* plugin, const string& name, size_t poly, Patch* parent, DSSI_Descriptor* descriptor, SampleRate srate, size_t buffer_size)
@@ -334,4 +334,4 @@ DSSINode::send_creation_messages(ClientInterface* client) const
 }
 */
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/DSSINode.h b/src/libs/engine/DSSINode.h
index 71bb053b..625d325c 100644
--- a/src/libs/engine/DSSINode.h
+++ b/src/libs/engine/DSSINode.h
@@ -22,7 +22,7 @@
 #include <lo/lo.h>
 #include "LADSPANode.h"
 
-namespace Om {
+namespace Ingen {
 
 class MidiMessage;
 template <typename T> class InputPort;
@@ -102,7 +102,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // DSSINODE_H
diff --git a/src/libs/engine/DataType.h b/src/libs/engine/DataType.h
index fdaaa863..c658eccc 100644
--- a/src/libs/engine/DataType.h
+++ b/src/libs/engine/DataType.h
@@ -17,14 +17,14 @@
 #ifndef DATATYPE_H
 #define DATATYPE_H
 
-namespace Om
+namespace Ingen
 {
 
 
 /** A data type that can be stored in a Port.
  *
  * Eventually the goal is to be able to just have to create a new one of these
- * to have Om support a new data type.
+ * to support a new data type.
  */
 class DataType {
 public:
@@ -65,6 +65,6 @@ private:
 
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DATATYPE_H
diff --git a/src/libs/engine/Driver.h b/src/libs/engine/Driver.h
index 5f452781..2fd17150 100644
--- a/src/libs/engine/Driver.h
+++ b/src/libs/engine/Driver.h
@@ -20,12 +20,12 @@
 #include <string>
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 template <typename T> class DuplexPort;
 
 
-/** Representation of a system (outside Om, ie hardware) audio port.
+/** Representation of a "system" (eg outside Ingen) port.
  *
  * This is the class through which the rest of the engine manages everything 
  * related to driver ports.  Derived classes are expected to have a pointer to
@@ -107,6 +107,6 @@ public:
 #endif
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DRIVER_H
diff --git a/src/libs/engine/DuplexPort.cpp b/src/libs/engine/DuplexPort.cpp
index 55316f1c..cda18cc9 100644
--- a/src/libs/engine/DuplexPort.cpp
+++ b/src/libs/engine/DuplexPort.cpp
@@ -26,7 +26,7 @@
 using std::cerr; using std::cout; using std::endl;
 
 
-namespace Om {
+namespace Ingen {
 
 
 template <typename T>
@@ -42,5 +42,5 @@ template DuplexPort<Sample>::DuplexPort(Node* parent, const string& name, size_t
 template DuplexPort<MidiMessage>::DuplexPort(Node* parent, const string& name, size_t index, size_t poly, DataType type, size_t buffer_size, bool is_output);
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/DuplexPort.h b/src/libs/engine/DuplexPort.h
index c1f8e16e..c7f09811 100644
--- a/src/libs/engine/DuplexPort.h
+++ b/src/libs/engine/DuplexPort.h
@@ -25,7 +25,7 @@
 #include "OutputPort.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 	
 class MidiMessage;
 class Node;
@@ -63,6 +63,6 @@ protected:
 template class DuplexPort<Sample>;
 template class DuplexPort<MidiMessage>;
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DUPLEXPORT_H
diff --git a/src/libs/engine/Event.h b/src/libs/engine/Event.h
index f726339d..6532655c 100644
--- a/src/libs/engine/Event.h
+++ b/src/libs/engine/Event.h
@@ -23,7 +23,7 @@
 #include "MaidObject.h"
 #include "Responder.h"
 
-namespace Om {	
+namespace Ingen {	
 
 
 
@@ -69,6 +69,6 @@ protected:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // EVENT_H
diff --git a/src/libs/engine/EventSource.h b/src/libs/engine/EventSource.h
index 28b07d18..212249c6 100644
--- a/src/libs/engine/EventSource.h
+++ b/src/libs/engine/EventSource.h
@@ -17,7 +17,7 @@
 #ifndef EVENTSOURCE_H
 #define EVENTSOURCE_H
 
-namespace Om {
+namespace Ingen {
 
 class Event;
 class QueuedEvent;
@@ -50,7 +50,7 @@ protected:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // EVENTSOURCE_H
 
diff --git a/src/libs/engine/GraphObject.h b/src/libs/engine/GraphObject.h
index 409be3ea..1c4fae49 100644
--- a/src/libs/engine/GraphObject.h
+++ b/src/libs/engine/GraphObject.h
@@ -26,7 +26,7 @@
 #include "types.h"
 using std::string; using std::map;
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 class Node;
@@ -107,6 +107,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // OMOBJECT_H
diff --git a/src/libs/engine/Ingen.cpp b/src/libs/engine/Ingen.cpp
index 37e8f893..695a0be5 100644
--- a/src/libs/engine/Ingen.cpp
+++ b/src/libs/engine/Ingen.cpp
@@ -46,7 +46,7 @@
 #endif
 using std::cout; using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 
 Ingen* Ingen::m_instance = NULL;
@@ -142,7 +142,7 @@ Ingen::main()
 		deactivate();
 
 	sleep(1);
-	cout << "[Main] Om exiting..." << endl;
+	cout << "[Main] Exiting..." << endl;
 	
 	return 0;
 }
@@ -205,4 +205,4 @@ Ingen::deactivate()
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/Ingen.h b/src/libs/engine/Ingen.h
index 0b1ecccf..b0e1f947 100644
--- a/src/libs/engine/Ingen.h
+++ b/src/libs/engine/Ingen.h
@@ -22,7 +22,7 @@
 template<typename T> class Queue;
 class Maid;
 
-namespace Om {
+namespace Ingen {
 
 class AudioDriver;
 class MidiDriver;
@@ -39,7 +39,7 @@ class LashDriver;
 template <typename T> class Driver;
 
 
-/** The main class for Om, the whole app lives in here
+/** The main class for Ingen, the whole engine basically lives in here
  *
  * A singleton, but shouldn't be (FIXME).  Explicitly instantiated singleton
  * to be exact - call instantiate before instance or suffer horrible death.
@@ -102,6 +102,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // OMAPP_H
diff --git a/src/libs/engine/InputPort.cpp b/src/libs/engine/InputPort.cpp
index fefc39f7..29270bd1 100644
--- a/src/libs/engine/InputPort.cpp
+++ b/src/libs/engine/InputPort.cpp
@@ -26,7 +26,7 @@
 using std::cerr; using std::cout; using std::endl;
 
 
-namespace Om {
+namespace Ingen {
 
 
 template <typename T>
@@ -349,5 +349,5 @@ InputPort<MidiMessage>::process(SampleCount nframes)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/InputPort.h b/src/libs/engine/InputPort.h
index e6ac55cb..39632cee 100644
--- a/src/libs/engine/InputPort.h
+++ b/src/libs/engine/InputPort.h
@@ -25,7 +25,7 @@
 #include "MidiMessage.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 template <typename T> class TypedConnection;
 template <typename T> class OutputPort;
@@ -84,6 +84,6 @@ private:
 template class InputPort<Sample>;
 template class InputPort<MidiMessage>;
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // INPUTPORT_H
diff --git a/src/libs/engine/InternalNode.h b/src/libs/engine/InternalNode.h
index 995799e6..98bd473f 100644
--- a/src/libs/engine/InternalNode.h
+++ b/src/libs/engine/InternalNode.h
@@ -21,7 +21,7 @@
 #include "NodeBase.h"
 #include "Plugin.h"
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 
@@ -37,7 +37,7 @@ public:
 	: NodeBase(plugin, path, poly, parent, srate, buffer_size),
 	  _is_added(false)
 	{
-		_plugin.lib_path("/Om");
+		_plugin.lib_path("/Ingen");
 	}
 	
 	virtual ~InternalNode() {}
@@ -64,6 +64,6 @@ protected:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // INTERNALNODE_H
diff --git a/src/libs/engine/JackAudioDriver.cpp b/src/libs/engine/JackAudioDriver.cpp
index 2df1f026..aba00f7c 100644
--- a/src/libs/engine/JackAudioDriver.cpp
+++ b/src/libs/engine/JackAudioDriver.cpp
@@ -40,7 +40,7 @@
 using std::cout; using std::cerr; using std::endl;
 
 
-namespace Om {
+namespace Ingen {
 
 	
 //// JackAudioPort ////
@@ -126,7 +126,7 @@ JackAudioDriver::JackAudioDriver()
   m_local_client(true),
   m_root_patch(NULL)
 {
-	m_client = jack_client_new("Om");
+	m_client = jack_client_new("Ingen");
 	if (m_client == NULL) {
 		cerr << "[JackAudioDriver] Unable to connect to Jack.  Exiting." << endl;
 		exit(EXIT_FAILURE);
@@ -182,7 +182,7 @@ JackAudioDriver::activate()
 	} else {
 		cout << "[JackAudioDriver] Activated Jack client." << endl;
 #ifdef HAVE_LASH
-	Ingen::instance().lash_driver()->set_jack_client_name("Om"); // FIXME: unique name
+	Ingen::instance().lash_driver()->set_jack_client_name(jack_client_get_name(m_client));
 #endif
 	}
 }
@@ -355,7 +355,7 @@ int
 JackAudioDriver::m_sample_rate_cb(jack_nframes_t nframes) 
 {
 	if (m_is_activated) {
-		cerr << "[JackAudioDriver] Om does not support changing sample rate on the fly (yet).  Aborting." << endl;
+		cerr << "[JackAudioDriver] On-the-fly sample rate changing not supported (yet).  Aborting." << endl;
 		exit(EXIT_FAILURE);
 	} else {
 		m_sample_rate = nframes;
@@ -368,7 +368,7 @@ int
 JackAudioDriver::m_buffer_size_cb(jack_nframes_t nframes) 
 {
 	if (m_is_activated) {
-		cerr << "[JackAudioDriver] Om does not support chanding buffer size on the fly (yet).  Aborting." << endl;
+		cerr << "[JackAudioDriver] On-the-fly buffer size changing not supported (yet).  Aborting." << endl;
 		exit(EXIT_FAILURE);
 	} else {
 		m_buffer_size = nframes;
@@ -377,5 +377,5 @@ JackAudioDriver::m_buffer_size_cb(jack_nframes_t nframes)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/JackAudioDriver.h b/src/libs/engine/JackAudioDriver.h
index cfbcc4c5..73b80a78 100644
--- a/src/libs/engine/JackAudioDriver.h
+++ b/src/libs/engine/JackAudioDriver.h
@@ -23,7 +23,7 @@
 #include "AudioDriver.h"
 #include "Buffer.h"
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 class Port;
@@ -166,6 +166,6 @@ inline int JackAudioDriver::sample_rate_cb(jack_nframes_t nframes, void* jack_dr
 }
 	
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // JACKAUDIODRIVER_H
diff --git a/src/libs/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp
index 91869ca6..c2a5ca4a 100644
--- a/src/libs/engine/JackMidiDriver.cpp
+++ b/src/libs/engine/JackMidiDriver.cpp
@@ -29,7 +29,7 @@
 #endif
 using std::cout; using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 	
 //// JackMidiPort ////
@@ -208,5 +208,5 @@ JackMidiDriver::remove_port(JackMidiPort* port)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/JackMidiDriver.h b/src/libs/engine/JackMidiDriver.h
index 2e155d60..cf651291 100644
--- a/src/libs/engine/JackMidiDriver.h
+++ b/src/libs/engine/JackMidiDriver.h
@@ -24,7 +24,7 @@
 #include "util/Queue.h"
 #include "MidiDriver.h"
 
-namespace Om {
+namespace Ingen {
 
 class Node;
 class SetPortValueEvent;
@@ -117,7 +117,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // JACKMIDIDRIVER_H
diff --git a/src/libs/engine/LADSPANode.cpp b/src/libs/engine/LADSPANode.cpp
index 356fe07d..ee38cff0 100644
--- a/src/libs/engine/LADSPANode.cpp
+++ b/src/libs/engine/LADSPANode.cpp
@@ -25,7 +25,7 @@
 #include "OutputPort.h"
 #include "Plugin.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Partially construct a LADSPANode.
@@ -335,5 +335,5 @@ LADSPANode::default_port_value(ulong port_index)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/LADSPANode.h b/src/libs/engine/LADSPANode.h
index 1c98eb44..677145fe 100644
--- a/src/libs/engine/LADSPANode.h
+++ b/src/libs/engine/LADSPANode.h
@@ -23,7 +23,7 @@
 #include "NodeBase.h"
 #include "Plugin.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** An instance of a LADSPA plugin.
@@ -61,6 +61,6 @@ protected:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // LADSPANODE_H
diff --git a/src/libs/engine/LV2Node.cpp b/src/libs/engine/LV2Node.cpp
index 59127915..d56778c1 100644
--- a/src/libs/engine/LV2Node.cpp
+++ b/src/libs/engine/LV2Node.cpp
@@ -24,7 +24,7 @@
 #include "OutputPort.h"
 #include "Plugin.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Partially construct a LV2Node.
@@ -260,5 +260,5 @@ LV2Node::get_port_vals(ulong port_index, PortInfo* info)
 #endif
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/LV2Node.h b/src/libs/engine/LV2Node.h
index 54739fa2..1c2c8416 100644
--- a/src/libs/engine/LV2Node.h
+++ b/src/libs/engine/LV2Node.h
@@ -23,7 +23,7 @@
 #include "NodeBase.h"
 #include "Plugin.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** An instance of a LV2 plugin.
@@ -63,7 +63,7 @@ protected:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // LV2NODE_H
 
diff --git a/src/libs/engine/LashDriver.cpp b/src/libs/engine/LashDriver.cpp
index 0a014eb0..79b839bc 100644
--- a/src/libs/engine/LashDriver.cpp
+++ b/src/libs/engine/LashDriver.cpp
@@ -23,7 +23,7 @@
 using std::cerr; using std::cout; using std::endl;
 using std::string;
 
-namespace Om {
+namespace Ingen {
 	
 
 LashDriver::LashDriver(Ingen* app, lash_args_t* args)
@@ -38,7 +38,7 @@ LashDriver::LashDriver(Ingen* app, lash_args_t* args)
 	} else {
 		cout << "[LashDriver] Lash initialised" << endl;
 		lash_event_t* event = lash_event_new_with_type(LASH_Client_Name);
-		lash_event_set_string(event, "Om");
+		lash_event_set_string(event, "Ingen");
 		lash_send_event(m_client, event);			
 	}
 }
@@ -155,4 +155,4 @@ LashDriver::handle_config(lash_config_t* conf)
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/LashDriver.h b/src/libs/engine/LashDriver.h
index 1a36b59b..568e4709 100644
--- a/src/libs/engine/LashDriver.h
+++ b/src/libs/engine/LashDriver.h
@@ -22,7 +22,7 @@
 #include <string>
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Ingen;
 
@@ -52,6 +52,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // LASHDRIVER_H
diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am
index 82e09ce7..fbd11a16 100644
--- a/src/libs/engine/Makefile.am
+++ b/src/libs/engine/Makefile.am
@@ -19,7 +19,6 @@ libingen_la_SOURCES = \
 	Patch.cpp \
 	NodeFactory.h \
 	NodeFactory.cpp \
-	Om.cpp \
 	Ingen.h \
 	Ingen.cpp \
 	JackAudioDriver.h \
diff --git a/src/libs/engine/MidiControlNode.cpp b/src/libs/engine/MidiControlNode.cpp
index 688fd48f..4c6c3a5f 100644
--- a/src/libs/engine/MidiControlNode.cpp
+++ b/src/libs/engine/MidiControlNode.cpp
@@ -26,11 +26,11 @@
 #include "midi.h"
 
 
-namespace Om {
+namespace Ingen {
 
 	
 MidiControlNode::MidiControlNode(const string& path, size_t poly, Patch* parent, SampleRate srate, size_t buffer_size)
-: InternalNode(new Plugin(Plugin::Internal, "Om:ControlNode"), path, 1, parent, srate, buffer_size),
+: InternalNode(new Plugin(Plugin::Internal, "Ingen:ControlNode"), path, 1, parent, srate, buffer_size),
   _learning(false)
 {
 	_ports = new Array<Port*>(7);
@@ -57,7 +57,7 @@ MidiControlNode::MidiControlNode(const string& path, size_t poly, Patch* parent,
 	_ports->at(6) = _control_port;
 	
 	_plugin.plug_label("midi_control_in");
-	_plugin.name("Om Control Node (MIDI)");
+	_plugin.name("Ingen Control Node (MIDI)");
 }
 
 
@@ -119,5 +119,5 @@ MidiControlNode::control(uchar control_num, uchar val, SampleCount offset)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/MidiControlNode.h b/src/libs/engine/MidiControlNode.h
index 4048abde..952aa0c4 100644
--- a/src/libs/engine/MidiControlNode.h
+++ b/src/libs/engine/MidiControlNode.h
@@ -22,7 +22,7 @@
 #include "InternalNode.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 	
 class MidiLearnResponseEvent;
 class MidiMessage;
@@ -67,6 +67,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // MIDICONTROLNODE_H
diff --git a/src/libs/engine/MidiDriver.h b/src/libs/engine/MidiDriver.h
index aa3a73ee..79236a56 100644
--- a/src/libs/engine/MidiDriver.h
+++ b/src/libs/engine/MidiDriver.h
@@ -21,7 +21,7 @@
 #include <iostream>
 using std::cout; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 class MidiMessage;
 
@@ -73,6 +73,6 @@ public:
 
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // MIDIDRIVER_H
diff --git a/src/libs/engine/MidiMessage.h b/src/libs/engine/MidiMessage.h
index fd415ef8..2249a970 100644
--- a/src/libs/engine/MidiMessage.h
+++ b/src/libs/engine/MidiMessage.h
@@ -17,7 +17,7 @@
 #ifndef MIDIMESSAGE_H
 #define MIDIMESSAGE_H
 
-namespace Om {
+namespace Ingen {
 
 
 /** Midi Message (the type a MIDI port connects to).
@@ -45,7 +45,7 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // MIDIMESSAGE_H
diff --git a/src/libs/engine/MidiNoteNode.cpp b/src/libs/engine/MidiNoteNode.cpp
index e6916a72..a84ebfd7 100644
--- a/src/libs/engine/MidiNoteNode.cpp
+++ b/src/libs/engine/MidiNoteNode.cpp
@@ -30,11 +30,11 @@
 using std::cerr; using std::cout; using std::endl;
 
 
-namespace Om {
+namespace Ingen {
 
 
 MidiNoteNode::MidiNoteNode(const string& path, size_t poly, Patch* parent, SampleRate srate, size_t buffer_size)
-: InternalNode(new Plugin(Plugin::Internal, "Om:NoteNode"), path, poly, parent, srate, buffer_size),
+: InternalNode(new Plugin(Plugin::Internal, "Ingen:NoteNode"), path, poly, parent, srate, buffer_size),
   _voices(new Voice[poly]),
   _sustain(false)
 {
@@ -60,7 +60,7 @@ MidiNoteNode::MidiNoteNode(const string& path, size_t poly, Patch* parent, Sampl
 	_ports->at(4) = _trig_port;
 	
 	_plugin.plug_label("note_in");
-	_plugin.name("Om Note Node (MIDI, OSC)");
+	_plugin.name("Ingen Note Node (MIDI, OSC)");
 }
 
 
@@ -296,5 +296,5 @@ MidiNoteNode::sustain_off(SampleCount offset)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/MidiNoteNode.h b/src/libs/engine/MidiNoteNode.h
index e7d3831a..1f727b98 100644
--- a/src/libs/engine/MidiNoteNode.h
+++ b/src/libs/engine/MidiNoteNode.h
@@ -23,7 +23,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class MidiMessage;
 template <typename T> class InputPort;
@@ -82,6 +82,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // MIDINOTENODE_H
diff --git a/src/libs/engine/MidiTriggerNode.cpp b/src/libs/engine/MidiTriggerNode.cpp
index 98a30011..3b21129c 100644
--- a/src/libs/engine/MidiTriggerNode.cpp
+++ b/src/libs/engine/MidiTriggerNode.cpp
@@ -22,11 +22,11 @@
 #include "util.h"
 #include "midi.h"
 
-namespace Om {
+namespace Ingen {
 
 
 MidiTriggerNode::MidiTriggerNode(const string& path, size_t poly, Patch* parent, SampleRate srate, size_t buffer_size)
-: InternalNode(new Plugin(Plugin::Internal, "Om:TriggerNode"), path, 1, parent, srate, buffer_size)
+: InternalNode(new Plugin(Plugin::Internal, "Ingen:TriggerNode"), path, 1, parent, srate, buffer_size)
 {
 	_ports = new Array<Port*>(5);
 
@@ -50,7 +50,7 @@ MidiTriggerNode::MidiTriggerNode(const string& path, size_t poly, Patch* parent,
 	_ports->at(4) = _vel_port;
 	
 	_plugin.plug_label("trigger_in");
-	_plugin.name("Om Trigger Node (MIDI, OSC)");
+	_plugin.name("Ingen Trigger Node (MIDI, OSC)");
 }
 
 
@@ -116,5 +116,5 @@ MidiTriggerNode::note_off(uchar note_num, SampleCount offset)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/MidiTriggerNode.h b/src/libs/engine/MidiTriggerNode.h
index 14b586de..bf11f0b8 100644
--- a/src/libs/engine/MidiTriggerNode.h
+++ b/src/libs/engine/MidiTriggerNode.h
@@ -23,7 +23,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class MidiMessage;
 template <typename T> class InputPort;
@@ -59,6 +59,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // MIDITRIGGERNODE_H
diff --git a/src/libs/engine/Node.h b/src/libs/engine/Node.h
index 4fe74bd2..6d1158b0 100644
--- a/src/libs/engine/Node.h
+++ b/src/libs/engine/Node.h
@@ -26,7 +26,7 @@ using std::string;
 
 template <typename T> class List;
 
-namespace Om {
+namespace Ingen {
 
 class Port;
 template <typename T> class OutputPort;
@@ -44,7 +44,7 @@ namespace Shared {
  * 
  * This is a pure abstract base class for any Node, it contains no
  * implementation details/data whatsoever.  This is the interface you need to
- * implement to add a new Node type to Om.
+ * implement to add a new Node type.
  *
  * \ingroup engine
  */
@@ -110,6 +110,6 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // NODE_H
diff --git a/src/libs/engine/NodeBase.cpp b/src/libs/engine/NodeBase.cpp
index f5c4e546..ce58fd8b 100644
--- a/src/libs/engine/NodeBase.cpp
+++ b/src/libs/engine/NodeBase.cpp
@@ -30,7 +30,7 @@
 
 using std::cout; using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 
 NodeBase::NodeBase(const Plugin* plugin, const string& name, size_t poly, Patch* parent, SampleRate srate, size_t buffer_size)
@@ -165,5 +165,5 @@ NodeBase::set_path(const Path& new_path)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/NodeBase.h b/src/libs/engine/NodeBase.h
index 859a3306..f0c04d80 100644
--- a/src/libs/engine/NodeBase.h
+++ b/src/libs/engine/NodeBase.h
@@ -22,7 +22,7 @@
 #include "Node.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Plugin;
 class Patch;
@@ -101,6 +101,6 @@ protected:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // NODEBASE_H
diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp
index 60d8f44a..68bf4c40 100644
--- a/src/libs/engine/NodeFactory.cpp
+++ b/src/libs/engine/NodeFactory.cpp
@@ -46,7 +46,7 @@ using std::string;
 using std::cerr; using std::cout; using std::endl;
 
 
-namespace Om {
+namespace Ingen {
 
 
 /* I am perfectly aware that the vast majority of this class is a 
@@ -322,7 +322,7 @@ NodeFactory::load_lv2_plugin(const string& plug_uri,
                              size_t        poly,
                              Patch*        parent)
 {
-	// Find (Om) Plugin
+	// Find (internal) Plugin
 	Plugin* plugin = NULL;
 	list<Plugin*>::iterator i;
 	for (i = _plugins.begin(); i != _plugins.end(); ++i) {
@@ -333,8 +333,8 @@ NodeFactory::load_lv2_plugin(const string& plug_uri,
 	Node* n = NULL;
 
 	if (plugin) {
-		n = new Om::LV2Node(plugin, node_name, poly, parent,
-			Ingen::instance().audio_driver()->sample_rate(), Ingen::instance().audio_driver()->buffer_size());
+		n = new LV2Node(plugin, node_name, poly, parent,
+			Ingen::Ingen::instance().audio_driver()->sample_rate(), Ingen::Ingen::instance().audio_driver()->buffer_size());
 		bool success = ((LV2Node*)n)->instantiate();
 		if (!success) {
 			delete n;
@@ -691,4 +691,4 @@ NodeFactory::load_ladspa_plugin(const string& uri,
 #endif // HAVE_LADSPA
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/NodeFactory.h b/src/libs/engine/NodeFactory.h
index a109fc8f..abb30553 100644
--- a/src/libs/engine/NodeFactory.h
+++ b/src/libs/engine/NodeFactory.h
@@ -26,7 +26,7 @@
 
 using std::string; using std::list;
 
-namespace Om {
+namespace Ingen {
 
 class Node;
 class Patch;
@@ -87,6 +87,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // NODEFACTORY_H
diff --git a/src/libs/engine/OSCClient.cpp b/src/libs/engine/OSCClient.cpp
index a902f629..b1489288 100644
--- a/src/libs/engine/OSCClient.cpp
+++ b/src/libs/engine/OSCClient.cpp
@@ -32,13 +32,13 @@
 
 using std::cout; using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 	
 /*! \page client_osc_namespace Client OSC Namespace Documentation
  *
- * <p>These are all the messages sent from the engine to the client.  Om
- * communication takes place over two distinct bands: control band and
+ * <p>These are all the messages sent from the engine to the client.
+ * Communication takes place over two distinct bands: control band and
  * notification band.</p>
  * <p>The control band is where clients send commands, and receive a simple
  * response, either OK or an error.</p>
@@ -497,4 +497,4 @@ OSCClient::program_remove(const string& node_path, uint32_t bank, uint32_t progr
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/OSCClient.h b/src/libs/engine/OSCClient.h
index 56a663bc..423bb32f 100644
--- a/src/libs/engine/OSCClient.h
+++ b/src/libs/engine/OSCClient.h
@@ -28,7 +28,7 @@
 using std::list; using std::string;
 using std::cerr;
 
-namespace Om {
+namespace Ingen {
 
 
 /** Implements ClientInterface for OSC clients (sends OSC messages).
@@ -125,7 +125,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // OSCCLIENT_H
 
diff --git a/src/libs/engine/OSCReceiver.cpp b/src/libs/engine/OSCReceiver.cpp
index 1f5ef4d0..3b2e0be6 100644
--- a/src/libs/engine/OSCReceiver.cpp
+++ b/src/libs/engine/OSCReceiver.cpp
@@ -31,7 +31,7 @@
 
 using std::cerr; using std::cout; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 using Shared::ClientKey;
 
@@ -200,7 +200,7 @@ OSCReceiver::set_response_address_cb(const char* path, const char* types, lo_arg
 
 	//cerr << "SET RESPONSE\n";
 
-	if (argc < 1 || types[0] != 'i') // Not a valid Om message
+	if (argc < 1 || types[0] != 'i') // Not a valid Ingen message
 		return 0; // Save liblo the trouble
 
 	//cerr << "** valid msg\n";
@@ -906,4 +906,4 @@ OSCReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv, int
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/OSCReceiver.h b/src/libs/engine/OSCReceiver.h
index a7990f03..d217319a 100644
--- a/src/libs/engine/OSCReceiver.h
+++ b/src/libs/engine/OSCReceiver.h
@@ -24,7 +24,7 @@
 #include "OSCResponder.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class JackDriver;
 class NodeFactory;
@@ -124,6 +124,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // OSCRECEIVER_H
diff --git a/src/libs/engine/OSCResponder.cpp b/src/libs/engine/OSCResponder.cpp
index 4d337aa5..76e48fe4 100644
--- a/src/libs/engine/OSCResponder.cpp
+++ b/src/libs/engine/OSCResponder.cpp
@@ -25,7 +25,7 @@
 
 using std::cout; using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 
 /** Construct an OSCResponder from \a addr.
diff --git a/src/libs/engine/OSCResponder.h b/src/libs/engine/OSCResponder.h
index 41cbdbe1..57e61886 100644
--- a/src/libs/engine/OSCResponder.h
+++ b/src/libs/engine/OSCResponder.h
@@ -22,7 +22,7 @@
 #include <lo/lo.h>
 #include "Responder.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Responder for (liblo) OSC clients.
@@ -55,7 +55,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // OSCRESPONDER_H
 
diff --git a/src/libs/engine/ObjectSender.cpp b/src/libs/engine/ObjectSender.cpp
index 38ddc55f..8650b5cf 100644
--- a/src/libs/engine/ObjectSender.cpp
+++ b/src/libs/engine/ObjectSender.cpp
@@ -25,7 +25,7 @@
 #include "Connection.h"
 #include "NodeFactory.h"
 
-namespace Om {
+namespace Ingen {
 
 /** Send all currently existing objects to client.
  */
@@ -225,5 +225,5 @@ ObjectSender::send_plugins(ClientInterface* client)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/ObjectSender.h b/src/libs/engine/ObjectSender.h
index 0d2f1262..93cdf2b9 100644
--- a/src/libs/engine/ObjectSender.h
+++ b/src/libs/engine/ObjectSender.h
@@ -17,7 +17,7 @@
 #ifndef OBJECTSENDER_H
 #define OBJECTSENDER_H
 
-namespace Om {
+namespace Ingen {
 
 namespace Shared {
 	class ClientInterface;
@@ -49,7 +49,7 @@ public:
 	static void send_plugins(ClientInterface* client);
 };
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // OBJECTSENDER_H
 
diff --git a/src/libs/engine/ObjectStore.cpp b/src/libs/engine/ObjectStore.cpp
index d56b3e7b..517f805e 100644
--- a/src/libs/engine/ObjectStore.cpp
+++ b/src/libs/engine/ObjectStore.cpp
@@ -22,7 +22,7 @@
 #include "util/Path.h"
 #include "Tree.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Find the Patch at the given path.
@@ -104,4 +104,4 @@ ObjectStore::remove(const string& path)
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/ObjectStore.h b/src/libs/engine/ObjectStore.h
index 44b71ccb..c899b0ff 100644
--- a/src/libs/engine/ObjectStore.h
+++ b/src/libs/engine/ObjectStore.h
@@ -23,7 +23,7 @@
 #include "Tree.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 class Node;
@@ -56,6 +56,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // OBJECTSTORE
diff --git a/src/libs/engine/Om.cpp b/src/libs/engine/Om.cpp
deleted file mode 100644
index 8b4ac0fb..00000000
--- a/src/libs/engine/Om.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This file is part of Ingen.  Copyright (C) 2006 Dave Robillard.
- * 
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * 
- * Ingen is distributed in the hope that 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 details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "Ingen.h"
-#ifdef HAVE_LASH
-#include "LashDriver.h"
-#endif
-
-/** Om namespace.
- *
- * Everything internal to the Om engine lives in this namespace.  Generally
- * none of this code is used by clients - as special (possibly temporary)
- * exceptions, some classes in src/common are used by clients but are part
- * of the Om namespace.
- */
-namespace Om
-{
-	Ingen* om = 0;
-}
diff --git a/src/libs/engine/OmInProcess.cpp b/src/libs/engine/OmInProcess.cpp
index b5cee7f3..73d96946 100644
--- a/src/libs/engine/OmInProcess.cpp
+++ b/src/libs/engine/OmInProcess.cpp
@@ -36,13 +36,10 @@ extern "C"
 void*
 run_main(void* arg)
 {
-	Om::Ingen::instance().main();
-#ifdef HAVE_LASH
-
-	delete Om::lash_driver;
-#endif
-
-	delete Om::om;
+	Ingen::Ingen::instance().main();
+	
+	// FIXME: cleanup
+	
 	return 0;
 }
 
@@ -53,7 +50,7 @@ pthread_t main_thread;
 int
 jack_initialize(jack_client_t* client, const char* load_init)
 {
-	if ((Om::om = new Om::Ingen(load_init, new Om::JackAudioDriver(client))) != NULL) {
+	if ((Ingen::om = new Ingen::Ingen(load_init, new Ingen::JackAudioDriver(client))) != NULL) {
 		pthread_create(&main_thread, NULL, run_main, NULL);
 		return 0; // Success
 	} else {
@@ -66,7 +63,7 @@ void
 jack_finish(void* arg)
 {
 	void* ret;
-	Om::Ingen::instance().quit();
+	Ingen::Ingen::instance().quit();
 	pthread_join(main_thread, &ret);
 }
 
diff --git a/src/libs/engine/OutputPort.h b/src/libs/engine/OutputPort.h
index f1e08a31..bd3ae999 100644
--- a/src/libs/engine/OutputPort.h
+++ b/src/libs/engine/OutputPort.h
@@ -22,7 +22,7 @@
 #include "TypedPort.h"
 #include "types.h"
 
-namespace Om {
+namespace Ingen {
 
 template <typename T> class InputPort;
 
@@ -62,6 +62,6 @@ private:
 
 template class OutputPort<Sample>;
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // OUTPUTPORT_H
diff --git a/src/libs/engine/Patch.cpp b/src/libs/engine/Patch.cpp
index 358bc778..56006a86 100644
--- a/src/libs/engine/Patch.cpp
+++ b/src/libs/engine/Patch.cpp
@@ -26,11 +26,11 @@
 
 using std::cerr; using std::cout; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 
 Patch::Patch(const string& path, size_t poly, Patch* parent, SampleRate srate, size_t buffer_size, size_t internal_poly) 
-: NodeBase(new Plugin(Plugin::Patch, "Om:Patch"), path, poly, parent, srate, buffer_size),
+: NodeBase(new Plugin(Plugin::Patch, "Ingen:Patch"), path, poly, parent, srate, buffer_size),
   _internal_poly(internal_poly),
   _process_order(NULL),
   _process(false)
@@ -38,7 +38,7 @@ Patch::Patch(const string& path, size_t poly, Patch* parent, SampleRate srate, s
 	assert(internal_poly >= 1);
 
 	//_plugin->plug_label("om_patch");
-	//_plugin->name("Om Patch");
+	//_plugin->name("Ingen Patch");
 
 	//std::cerr << "Creating patch " << _name << ", poly = " << poly
 	//	<< ", internal poly = " << internal_poly << std::endl;
@@ -367,4 +367,4 @@ Patch::set_path(const Path& new_path)
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/Patch.h b/src/libs/engine/Patch.h
index 59993b68..4a37d2d0 100644
--- a/src/libs/engine/Patch.h
+++ b/src/libs/engine/Patch.h
@@ -28,7 +28,7 @@ using std::string;
 
 template <typename T> class Array;
 
-namespace Om {
+namespace Ingen {
 
 class Connection;
 class InternalNode;
@@ -130,6 +130,6 @@ Patch::build_process_order_recursive(Node* n, Array<Node*>* order) const
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // PATCH_H
diff --git a/src/libs/engine/Plugin.h b/src/libs/engine/Plugin.h
index c5046971..295e1bbf 100644
--- a/src/libs/engine/Plugin.h
+++ b/src/libs/engine/Plugin.h
@@ -30,7 +30,7 @@ using std::string;
 using std::cerr; using std::endl;
 
 
-namespace Om {
+namespace Ingen {
 
 class PluginLibrary;
 
@@ -52,7 +52,7 @@ public:
 	{}
 
 	// FIXME: remove
-	Plugin() : m_type(Internal), m_lib_path("/Om"),
+	Plugin() : m_type(Internal), m_lib_path("/Ingen"),
 	           m_id(0), m_library(NULL)
 	{
 #ifdef HAVE_SLV2
@@ -135,7 +135,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // PLUGIN_H
 
diff --git a/src/libs/engine/PluginLibrary.h b/src/libs/engine/PluginLibrary.h
index a9275a10..0cf44846 100644
--- a/src/libs/engine/PluginLibrary.h
+++ b/src/libs/engine/PluginLibrary.h
@@ -25,7 +25,7 @@ using std::string;
 using std::cerr; using std::endl;
 
 
-namespace Om {
+namespace Ingen {
 
 
 /** Representation of a shared library containing at least one Plugin.
@@ -94,7 +94,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // PLUGINLIBRARY_H
 
diff --git a/src/libs/engine/Port.cpp b/src/libs/engine/Port.cpp
index cccb6931..e5558303 100644
--- a/src/libs/engine/Port.cpp
+++ b/src/libs/engine/Port.cpp
@@ -18,7 +18,7 @@
 #include "Node.h"
 #include "DataType.h"
 
-namespace Om {
+namespace Ingen {
 
 
 // Yeah, this shouldn't be here.
@@ -37,4 +37,4 @@ Port::Port(Node* const node, const string& name, size_t index, size_t poly, Data
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/Port.h b/src/libs/engine/Port.h
index d742f5a9..918681e5 100644
--- a/src/libs/engine/Port.h
+++ b/src/libs/engine/Port.h
@@ -25,7 +25,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Node;
 
@@ -78,6 +78,6 @@ protected:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // PORT_H
diff --git a/src/libs/engine/PostProcessor.cpp b/src/libs/engine/PostProcessor.cpp
index 80dc13cc..9ee0fa5c 100644
--- a/src/libs/engine/PostProcessor.cpp
+++ b/src/libs/engine/PostProcessor.cpp
@@ -26,7 +26,7 @@
 
 using std::cerr; using std::cout; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 
 PostProcessor::PostProcessor(size_t queue_size)
@@ -51,4 +51,4 @@ PostProcessor::_whipped()
 	}
 }
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/PostProcessor.h b/src/libs/engine/PostProcessor.h
index 444b8db7..2ae8f28b 100644
--- a/src/libs/engine/PostProcessor.h
+++ b/src/libs/engine/PostProcessor.h
@@ -23,7 +23,7 @@
 #include "util/Semaphore.h"
 #include "Slave.h"
 
-namespace Om {
+namespace Ingen {
 
 class Event;
 
@@ -54,6 +54,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // POSTPROCESSOR_H
diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp
index 4c1e815c..97f87076 100644
--- a/src/libs/engine/QueuedEngineInterface.cpp
+++ b/src/libs/engine/QueuedEngineInterface.cpp
@@ -21,7 +21,7 @@
 #include "Ingen.h"
 #include "AudioDriver.h"
 
-namespace Om {
+namespace Ingen {
 
 QueuedEngineInterface::QueuedEngineInterface(size_t queued_size, size_t stamped_size)
 : QueuedEventSource(queued_size, stamped_size)
@@ -299,6 +299,6 @@ QueuedEngineInterface::request_all_objects()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
 
diff --git a/src/libs/engine/QueuedEngineInterface.h b/src/libs/engine/QueuedEngineInterface.h
index ee4a18ad..cd5ef1b7 100644
--- a/src/libs/engine/QueuedEngineInterface.h
+++ b/src/libs/engine/QueuedEngineInterface.h
@@ -28,7 +28,7 @@
 #include "Responder.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 using Shared::ClientKey;
 using Shared::ClientInterface;
@@ -55,7 +55,7 @@ using Shared::EngineInterface;
  * events and get pushed directly into the realtime event queue.  Should that
  * be separated into a different interface/client?
  */
-class QueuedEngineInterface : public Om::QueuedEventSource, public EngineInterface
+class QueuedEngineInterface : public QueuedEventSource, public EngineInterface
 {
 public:
 	QueuedEngineInterface(size_t queued_size, size_t stamped_size);
@@ -155,7 +155,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // QUEUEDENGINEINTERFACE_H
 
diff --git a/src/libs/engine/QueuedEvent.h b/src/libs/engine/QueuedEvent.h
index 1e2603aa..d88a247c 100644
--- a/src/libs/engine/QueuedEvent.h
+++ b/src/libs/engine/QueuedEvent.h
@@ -19,7 +19,7 @@
 
 #include "Event.h"
 
-namespace Om {
+namespace Ingen {
 
 class Responder;
 class QueuedEventSource;
@@ -86,6 +86,6 @@ protected:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // QUEUEDEVENT_H
diff --git a/src/libs/engine/QueuedEventSource.cpp b/src/libs/engine/QueuedEventSource.cpp
index 638d9b42..33ac130a 100644
--- a/src/libs/engine/QueuedEventSource.cpp
+++ b/src/libs/engine/QueuedEventSource.cpp
@@ -21,7 +21,7 @@
 using std::cout; using std::cerr; using std::endl;
 
 
-namespace Om {
+namespace Ingen {
 
 
 QueuedEventSource::QueuedEventSource(size_t queued_size, size_t stamped_size)
@@ -138,5 +138,5 @@ QueuedEventSource::_whipped()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/QueuedEventSource.h b/src/libs/engine/QueuedEventSource.h
index 23b8601c..5dcc9200 100644
--- a/src/libs/engine/QueuedEventSource.h
+++ b/src/libs/engine/QueuedEventSource.h
@@ -26,7 +26,7 @@
 #include "Event.h"
 #include "EventSource.h"
 
-namespace Om {
+namespace Ingen {
 
 class QueuedEvent;
 
@@ -100,6 +100,6 @@ QueuedEventSource::pop_earliest_stamped_before(const SampleCount time)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // QUEUEDEVENTSOURCE_H
diff --git a/src/libs/engine/Responder.h b/src/libs/engine/Responder.h
index 58a0ebfc..14c857bc 100644
--- a/src/libs/engine/Responder.h
+++ b/src/libs/engine/Responder.h
@@ -23,7 +23,7 @@
 #include "interface/ClientInterface.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 using Shared::ClientInterface;
 
@@ -57,7 +57,7 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // RESPONDER_H
 
diff --git a/src/libs/engine/Slave.h b/src/libs/engine/Slave.h
index 5f88528a..b48a3ab7 100644
--- a/src/libs/engine/Slave.h
+++ b/src/libs/engine/Slave.h
@@ -21,7 +21,7 @@
 #include "util/Semaphore.h"
 #include "Thread.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Thread driven by (realtime safe) signals.
@@ -56,6 +56,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // SLAVE_H
diff --git a/src/libs/engine/Thread.cpp b/src/libs/engine/Thread.cpp
index d797598e..45c27ec4 100644
--- a/src/libs/engine/Thread.cpp
+++ b/src/libs/engine/Thread.cpp
@@ -21,7 +21,7 @@
 
 using std::cerr; using std::cout; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 
 Thread::Thread()
@@ -100,5 +100,5 @@ Thread::_static_run(void* me)
 	return NULL;
 }
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/Thread.h b/src/libs/engine/Thread.h
index 4655e02b..52423844 100644
--- a/src/libs/engine/Thread.h
+++ b/src/libs/engine/Thread.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <pthread.h>
 
-namespace Om {
+namespace Ingen {
 
 
 /* FIXME: This isn't Ingen specific at all.  Move it to util. */
@@ -58,6 +58,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // THREAD_H
diff --git a/src/libs/engine/TransportNode.cpp b/src/libs/engine/TransportNode.cpp
index 40f531c9..4f6abed6 100644
--- a/src/libs/engine/TransportNode.cpp
+++ b/src/libs/engine/TransportNode.cpp
@@ -24,11 +24,11 @@
 #include "util.h"
 //#include "Ingen.h"
 
-namespace Om {
+namespace Ingen {
 
 
 TransportNode::TransportNode(const string& path, size_t poly, Patch* parent, SampleRate srate, size_t buffer_size)
-: InternalNode(new Plugin(Plugin::Internal, "Om:TransportNode"), path, 1, parent, srate, buffer_size)
+: InternalNode(new Plugin(Plugin::Internal, "Ingen:TransportNode"), path, 1, parent, srate, buffer_size)
 {
 #if 0
 	_num_ports = 10;
@@ -75,7 +75,7 @@ TransportNode::TransportNode(const string& path, size_t poly, Patch* parent, Sam
 	_ports.at(9) = bar_trig_port;
 #endif
 	_plugin.plug_label("transport");
-	_plugin.name("Om Transport Node (BROKEN)");
+	_plugin.name("Ingen Transport Node (BROKEN)");
 }
 
 
@@ -149,5 +149,5 @@ TransportNode::run(size_t nframes)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/TransportNode.h b/src/libs/engine/TransportNode.h
index 2ad5cc40..b4547fdc 100644
--- a/src/libs/engine/TransportNode.h
+++ b/src/libs/engine/TransportNode.h
@@ -23,7 +23,7 @@
 #include <jack/transport.h>
 #include "InternalNode.h"
 
-namespace Om {
+namespace Ingen {
 
 using std::string;
 
@@ -43,6 +43,6 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // TRANSPORTNODE_H
diff --git a/src/libs/engine/TypedConnection.cpp b/src/libs/engine/TypedConnection.cpp
index 8915bfce..e294185c 100644
--- a/src/libs/engine/TypedConnection.cpp
+++ b/src/libs/engine/TypedConnection.cpp
@@ -21,7 +21,7 @@
 #include "Node.h"
 #include "Port.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Constructor for a connection from a node's output port.
@@ -102,5 +102,5 @@ TypedConnection<MidiMessage>::process(SampleCount nframes)
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/TypedConnection.h b/src/libs/engine/TypedConnection.h
index 18f086f1..1289e158 100644
--- a/src/libs/engine/TypedConnection.h
+++ b/src/libs/engine/TypedConnection.h
@@ -21,7 +21,7 @@
 #include "OutputPort.h"
 #include "Connection.h"
 
-namespace Om {
+namespace Ingen {
 
 class MidiMessage;
 class Port;
@@ -100,6 +100,6 @@ TypedConnection<MidiMessage>::buffer(size_t voice) const
 template class TypedConnection<Sample>;
 template class TypedConnection<MidiMessage>;
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // TYPEDCONNECTION_H
diff --git a/src/libs/engine/TypedPort.cpp b/src/libs/engine/TypedPort.cpp
index 63c75b46..176c658c 100644
--- a/src/libs/engine/TypedPort.cpp
+++ b/src/libs/engine/TypedPort.cpp
@@ -24,7 +24,7 @@
 #include "Node.h"
 #include "MidiMessage.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Constructor for a Port.
@@ -120,5 +120,5 @@ template void TypedPort<Sample>::clear_buffers();
 template void TypedPort<MidiMessage>::clear_buffers();
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/TypedPort.h b/src/libs/engine/TypedPort.h
index ef667d28..4958269b 100644
--- a/src/libs/engine/TypedPort.h
+++ b/src/libs/engine/TypedPort.h
@@ -25,7 +25,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 	
 class MidiMessage;
 class Node;
@@ -74,6 +74,6 @@ protected:
 template class TypedPort<Sample>;
 template class TypedPort<MidiMessage>;
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // TYPEDPORT_H
diff --git a/src/libs/engine/events/ActivateEvent.cpp b/src/libs/engine/events/ActivateEvent.cpp
index 27875c59..7de723c3 100644
--- a/src/libs/engine/events/ActivateEvent.cpp
+++ b/src/libs/engine/events/ActivateEvent.cpp
@@ -18,7 +18,7 @@
 #include "Responder.h"
 #include "Ingen.h"
 
-namespace Om {
+namespace Ingen {
 
 
 ActivateEvent::ActivateEvent(CountedPtr<Responder> responder, SampleCount timestamp)
@@ -43,5 +43,5 @@ ActivateEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/ActivateEvent.h b/src/libs/engine/events/ActivateEvent.h
index cb961eab..de47ddf3 100644
--- a/src/libs/engine/events/ActivateEvent.h
+++ b/src/libs/engine/events/ActivateEvent.h
@@ -19,7 +19,7 @@
 
 #include "QueuedEvent.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Activates the engine.
@@ -36,6 +36,6 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // ACTIVATEEVENT_H
diff --git a/src/libs/engine/events/AddNodeEvent.cpp b/src/libs/engine/events/AddNodeEvent.cpp
index 1dc30263..7e5e70a4 100644
--- a/src/libs/engine/events/AddNodeEvent.cpp
+++ b/src/libs/engine/events/AddNodeEvent.cpp
@@ -30,7 +30,7 @@
 #include "util/Path.h"
 #include "Port.h"
 
-namespace Om {
+namespace Ingen {
 
 
 AddNodeEvent::AddNodeEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& path, Plugin* plugin, bool poly)
@@ -123,5 +123,5 @@ AddNodeEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/AddNodeEvent.h b/src/libs/engine/events/AddNodeEvent.h
index 99f89fe0..c2ec043a 100644
--- a/src/libs/engine/events/AddNodeEvent.h
+++ b/src/libs/engine/events/AddNodeEvent.h
@@ -25,7 +25,7 @@ using std::string;
 template <typename T> class Array;
 template<typename T> class TreeNode;
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 class Node;
@@ -58,6 +58,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // ADDNODEEVENT_H
diff --git a/src/libs/engine/events/AddPortEvent.cpp b/src/libs/engine/events/AddPortEvent.cpp
index 01937259..9f6439e8 100644
--- a/src/libs/engine/events/AddPortEvent.cpp
+++ b/src/libs/engine/events/AddPortEvent.cpp
@@ -33,7 +33,7 @@
 #include "Driver.h"
 #include "DuplexPort.h"
 
-namespace Om {
+namespace Ingen {
 
 
 AddPortEvent::AddPortEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& path, const string& type, bool is_output)
@@ -131,5 +131,5 @@ AddPortEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/AddPortEvent.h b/src/libs/engine/events/AddPortEvent.h
index e8599348..9643bd13 100644
--- a/src/libs/engine/events/AddPortEvent.h
+++ b/src/libs/engine/events/AddPortEvent.h
@@ -26,7 +26,7 @@ using std::string;
 
 template <typename T> class Array;
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 class Port;
@@ -60,6 +60,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // ADDPORTEVENT_H
diff --git a/src/libs/engine/events/AllNotesOffEvent.cpp b/src/libs/engine/events/AllNotesOffEvent.cpp
index 01d5b448..fceb47d6 100644
--- a/src/libs/engine/events/AllNotesOffEvent.cpp
+++ b/src/libs/engine/events/AllNotesOffEvent.cpp
@@ -19,7 +19,7 @@
 #include "Ingen.h"
 #include "ObjectStore.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Note off with patch explicitly passed - triggered by MIDI.
@@ -61,6 +61,6 @@ AllNotesOffEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
 
diff --git a/src/libs/engine/events/AllNotesOffEvent.h b/src/libs/engine/events/AllNotesOffEvent.h
index a994daae..56d52a25 100644
--- a/src/libs/engine/events/AllNotesOffEvent.h
+++ b/src/libs/engine/events/AllNotesOffEvent.h
@@ -21,7 +21,7 @@
 #include <string>
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 
@@ -45,6 +45,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // ALLNOTESOFFEVENT_H
diff --git a/src/libs/engine/events/ClearPatchEvent.cpp b/src/libs/engine/events/ClearPatchEvent.cpp
index fc045633..c6e1d36c 100644
--- a/src/libs/engine/events/ClearPatchEvent.cpp
+++ b/src/libs/engine/events/ClearPatchEvent.cpp
@@ -27,7 +27,7 @@
 #include "Connection.h"
 #include "QueuedEventSource.h"
 
-namespace Om {
+namespace Ingen {
 
 
 ClearPatchEvent::ClearPatchEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& patch_path)
@@ -109,5 +109,5 @@ ClearPatchEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/ClearPatchEvent.h b/src/libs/engine/events/ClearPatchEvent.h
index 1a2fe14b..bef90477 100644
--- a/src/libs/engine/events/ClearPatchEvent.h
+++ b/src/libs/engine/events/ClearPatchEvent.h
@@ -23,7 +23,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 
@@ -48,7 +48,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // CLEARPATCHEVENT_H
diff --git a/src/libs/engine/events/ConnectionEvent.cpp b/src/libs/engine/events/ConnectionEvent.cpp
index 15b79b46..27da617d 100644
--- a/src/libs/engine/events/ConnectionEvent.cpp
+++ b/src/libs/engine/events/ConnectionEvent.cpp
@@ -30,7 +30,7 @@
 #include "util/Path.h"
 
 using std::string;
-namespace Om {
+namespace Ingen {
 
 
 //// ConnectionEvent ////
@@ -257,5 +257,5 @@ TypedConnectionEvent<T>::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/ConnectionEvent.h b/src/libs/engine/events/ConnectionEvent.h
index b617b158..d5a580a5 100644
--- a/src/libs/engine/events/ConnectionEvent.h
+++ b/src/libs/engine/events/ConnectionEvent.h
@@ -26,7 +26,7 @@ using std::string;
 template <typename T> class ListNode;
 template <typename T> class Array;
 
-namespace Om {
+namespace Ingen {
 	
 class Patch;
 class Node;
@@ -101,6 +101,6 @@ private:
 
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // CONNECTIONEVENT_H
diff --git a/src/libs/engine/events/CreatePatchEvent.cpp b/src/libs/engine/events/CreatePatchEvent.cpp
index 65daf327..50e99c64 100644
--- a/src/libs/engine/events/CreatePatchEvent.cpp
+++ b/src/libs/engine/events/CreatePatchEvent.cpp
@@ -27,7 +27,7 @@
 #include "util/Path.h"
 #include "ObjectStore.h"
 
-namespace Om {
+namespace Ingen {
 
 
 CreatePatchEvent::CreatePatchEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& path, int poly)
@@ -145,5 +145,5 @@ CreatePatchEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/CreatePatchEvent.h b/src/libs/engine/events/CreatePatchEvent.h
index cbaca4fb..581bb381 100644
--- a/src/libs/engine/events/CreatePatchEvent.h
+++ b/src/libs/engine/events/CreatePatchEvent.h
@@ -25,7 +25,7 @@ using std::string;
 template<typename T> class Array;
 template<typename T> class TreeNode;
 
-namespace Om {
+namespace Ingen {
 	
 class Patch;
 class Node;
@@ -58,7 +58,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // CREATEPATCHEVENT_H
diff --git a/src/libs/engine/events/DSSIConfigureEvent.cpp b/src/libs/engine/events/DSSIConfigureEvent.cpp
index 290d177a..f8899304 100644
--- a/src/libs/engine/events/DSSIConfigureEvent.cpp
+++ b/src/libs/engine/events/DSSIConfigureEvent.cpp
@@ -21,7 +21,7 @@
 #include "Plugin.h"
 #include "ObjectStore.h"
 
-namespace Om {
+namespace Ingen {
 
 
 DSSIConfigureEvent::DSSIConfigureEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& node_path, const string& key, const string& val)
@@ -68,5 +68,5 @@ DSSIConfigureEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/DSSIConfigureEvent.h b/src/libs/engine/events/DSSIConfigureEvent.h
index 6d0a1000..80769929 100644
--- a/src/libs/engine/events/DSSIConfigureEvent.h
+++ b/src/libs/engine/events/DSSIConfigureEvent.h
@@ -20,7 +20,7 @@
 #include "QueuedEvent.h"
 #include "DSSINode.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Change of a 'configure' key/value pair for a DSSI plugin.
@@ -44,6 +44,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DSSICONFIGUREEVENT_H
diff --git a/src/libs/engine/events/DSSIControlEvent.cpp b/src/libs/engine/events/DSSIControlEvent.cpp
index 568ef573..565e37da 100644
--- a/src/libs/engine/events/DSSIControlEvent.cpp
+++ b/src/libs/engine/events/DSSIControlEvent.cpp
@@ -20,7 +20,7 @@
 #include "Plugin.h"
 #include "ObjectStore.h"
 
-namespace Om {
+namespace Ingen {
 
 
 DSSIControlEvent::DSSIControlEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& node_path, int port_num, Sample val)
@@ -63,5 +63,5 @@ DSSIControlEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/DSSIControlEvent.h b/src/libs/engine/events/DSSIControlEvent.h
index 52df88a8..e7c8605d 100644
--- a/src/libs/engine/events/DSSIControlEvent.h
+++ b/src/libs/engine/events/DSSIControlEvent.h
@@ -20,7 +20,7 @@
 #include "QueuedEvent.h"
 #include "DSSINode.h"
 
-namespace Om {
+namespace Ingen {
 	
 
 /** A control change event for a DSSI plugin.
@@ -46,6 +46,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DSSICONTROLEVENT_H
diff --git a/src/libs/engine/events/DSSIProgramEvent.cpp b/src/libs/engine/events/DSSIProgramEvent.cpp
index a9f82b33..a3ee39d1 100644
--- a/src/libs/engine/events/DSSIProgramEvent.cpp
+++ b/src/libs/engine/events/DSSIProgramEvent.cpp
@@ -25,7 +25,7 @@
 using std::cout; using std::cerr; using std::endl;
 
 
-namespace Om {
+namespace Ingen {
 
 
 DSSIProgramEvent::DSSIProgramEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& node_path, int bank, int program)
@@ -72,5 +72,5 @@ DSSIProgramEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/DSSIProgramEvent.h b/src/libs/engine/events/DSSIProgramEvent.h
index 6ac0dd5f..864110f4 100644
--- a/src/libs/engine/events/DSSIProgramEvent.h
+++ b/src/libs/engine/events/DSSIProgramEvent.h
@@ -20,7 +20,7 @@
 #include "QueuedEvent.h"
 #include "DSSINode.h"
 
-namespace Om {	
+namespace Ingen {	
 
 
 /** A program change for a DSSI plugin.
@@ -44,6 +44,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DSSIPROGRAMEVENT_H
diff --git a/src/libs/engine/events/DSSIUpdateEvent.cpp b/src/libs/engine/events/DSSIUpdateEvent.cpp
index 9a0a6585..f5628b86 100644
--- a/src/libs/engine/events/DSSIUpdateEvent.cpp
+++ b/src/libs/engine/events/DSSIUpdateEvent.cpp
@@ -24,7 +24,7 @@
 
 using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 
 DSSIUpdateEvent::DSSIUpdateEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& path, const string& url)
@@ -75,5 +75,5 @@ DSSIUpdateEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/DSSIUpdateEvent.h b/src/libs/engine/events/DSSIUpdateEvent.h
index 5182e3f0..bddbc21d 100644
--- a/src/libs/engine/events/DSSIUpdateEvent.h
+++ b/src/libs/engine/events/DSSIUpdateEvent.h
@@ -22,7 +22,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 	
 class DSSINode;
 
@@ -49,6 +49,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DSSIUPDATEEVENT_H
diff --git a/src/libs/engine/events/DeactivateEvent.cpp b/src/libs/engine/events/DeactivateEvent.cpp
index 803373f1..28648da3 100644
--- a/src/libs/engine/events/DeactivateEvent.cpp
+++ b/src/libs/engine/events/DeactivateEvent.cpp
@@ -18,7 +18,7 @@
 #include "Responder.h"
 #include "Ingen.h"
 
-namespace Om {
+namespace Ingen {
 
 
 DeactivateEvent::DeactivateEvent(CountedPtr<Responder> responder, SampleCount timestamp)
@@ -49,5 +49,5 @@ DeactivateEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/DeactivateEvent.h b/src/libs/engine/events/DeactivateEvent.h
index 27c2aa33..0fd79d32 100644
--- a/src/libs/engine/events/DeactivateEvent.h
+++ b/src/libs/engine/events/DeactivateEvent.h
@@ -19,7 +19,7 @@
 
 #include "QueuedEvent.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Deactivates the engine.
@@ -37,6 +37,6 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DEACTIVATEEVENT_H
diff --git a/src/libs/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp
index 1725f608..d490bb6b 100644
--- a/src/libs/engine/events/DestroyEvent.cpp
+++ b/src/libs/engine/events/DestroyEvent.cpp
@@ -31,7 +31,7 @@
 #include "QueuedEventSource.h"
 #include "Port.h"
 
-namespace Om {
+namespace Ingen {
 
 
 DestroyEvent::DestroyEvent(CountedPtr<Responder> responder, SampleCount timestamp, QueuedEventSource* source, const string& path, bool lock_mutex)
@@ -162,4 +162,4 @@ DestroyEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/events/DestroyEvent.h b/src/libs/engine/events/DestroyEvent.h
index 4f94e6a0..de4686c1 100644
--- a/src/libs/engine/events/DestroyEvent.h
+++ b/src/libs/engine/events/DestroyEvent.h
@@ -27,7 +27,7 @@ template<typename T> class Array;
 template<typename T> class ListNode;
 template<typename T> class TreeNode;
 
-namespace Om {
+namespace Ingen {
 
 class GraphObject;
 class Patch;
@@ -63,6 +63,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DESTROYEVENT_H
diff --git a/src/libs/engine/events/DisablePatchEvent.cpp b/src/libs/engine/events/DisablePatchEvent.cpp
index 42f0ecdf..3129736f 100644
--- a/src/libs/engine/events/DisablePatchEvent.cpp
+++ b/src/libs/engine/events/DisablePatchEvent.cpp
@@ -23,7 +23,7 @@
 #include "ObjectStore.h"
 #include "Port.h"
 
-namespace Om {
+namespace Ingen {
 
 
 DisablePatchEvent::DisablePatchEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& patch_path)
@@ -65,5 +65,5 @@ DisablePatchEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/DisablePatchEvent.h b/src/libs/engine/events/DisablePatchEvent.h
index b6a21a23..10721825 100644
--- a/src/libs/engine/events/DisablePatchEvent.h
+++ b/src/libs/engine/events/DisablePatchEvent.h
@@ -22,7 +22,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 
@@ -46,7 +46,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // DISABLEPATCHEVENT_H
diff --git a/src/libs/engine/events/DisconnectNodeEvent.cpp b/src/libs/engine/events/DisconnectNodeEvent.cpp
index 7b746fd1..e29e6956 100644
--- a/src/libs/engine/events/DisconnectNodeEvent.cpp
+++ b/src/libs/engine/events/DisconnectNodeEvent.cpp
@@ -35,7 +35,7 @@
 
 using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 
 DisconnectNodeEvent::DisconnectNodeEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& node_path)
@@ -138,5 +138,5 @@ DisconnectNodeEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/DisconnectNodeEvent.h b/src/libs/engine/events/DisconnectNodeEvent.h
index 7623bc40..d45fff39 100644
--- a/src/libs/engine/events/DisconnectNodeEvent.h
+++ b/src/libs/engine/events/DisconnectNodeEvent.h
@@ -23,7 +23,7 @@
 #include "List.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class DisconnectionEvent;
 class Patch;
@@ -62,7 +62,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // DISCONNECTNODEEVENT_H
diff --git a/src/libs/engine/events/DisconnectPortEvent.cpp b/src/libs/engine/events/DisconnectPortEvent.cpp
index a3b93727..889e8506 100644
--- a/src/libs/engine/events/DisconnectPortEvent.cpp
+++ b/src/libs/engine/events/DisconnectPortEvent.cpp
@@ -35,7 +35,7 @@
 
 using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 
 DisconnectPortEvent::DisconnectPortEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& port_path)
@@ -141,5 +141,5 @@ DisconnectPortEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/DisconnectPortEvent.h b/src/libs/engine/events/DisconnectPortEvent.h
index 0beee4b9..639de102 100644
--- a/src/libs/engine/events/DisconnectPortEvent.h
+++ b/src/libs/engine/events/DisconnectPortEvent.h
@@ -24,7 +24,7 @@
 
 template <typename T> class Array;
 
-namespace Om {
+namespace Ingen {
 
 	
 class Patch;
@@ -64,7 +64,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // DISCONNECTPORTEVENT_H
diff --git a/src/libs/engine/events/DisconnectionEvent.cpp b/src/libs/engine/events/DisconnectionEvent.cpp
index 29caf45c..4afdf2c4 100644
--- a/src/libs/engine/events/DisconnectionEvent.cpp
+++ b/src/libs/engine/events/DisconnectionEvent.cpp
@@ -29,7 +29,7 @@
 #include "util/Path.h"
 
 using std::string;
-namespace Om {
+namespace Ingen {
 
 
 //// DisconnectionEvent ////
@@ -278,5 +278,5 @@ TypedDisconnectionEvent<T>::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/DisconnectionEvent.h b/src/libs/engine/events/DisconnectionEvent.h
index 3fe95fad..3108f2f8 100644
--- a/src/libs/engine/events/DisconnectionEvent.h
+++ b/src/libs/engine/events/DisconnectionEvent.h
@@ -26,7 +26,7 @@ using std::string;
 template <typename T> class ListNode;
 template <typename T> class Array;
 
-namespace Om {
+namespace Ingen {
 	
 class Patch;
 class Node;
@@ -100,6 +100,6 @@ private:
 
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // DISCONNECTIONEVENT_H
diff --git a/src/libs/engine/events/EnablePatchEvent.cpp b/src/libs/engine/events/EnablePatchEvent.cpp
index 042acd12..e24c2fe1 100644
--- a/src/libs/engine/events/EnablePatchEvent.cpp
+++ b/src/libs/engine/events/EnablePatchEvent.cpp
@@ -22,7 +22,7 @@
 #include "ClientBroadcaster.h"
 #include "ObjectStore.h"
 
-namespace Om {
+namespace Ingen {
 
 
 EnablePatchEvent::EnablePatchEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& patch_path)
@@ -77,5 +77,5 @@ EnablePatchEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/EnablePatchEvent.h b/src/libs/engine/events/EnablePatchEvent.h
index 1984f72c..4ae93099 100644
--- a/src/libs/engine/events/EnablePatchEvent.h
+++ b/src/libs/engine/events/EnablePatchEvent.h
@@ -24,7 +24,7 @@ using std::string;
 
 template <typename T> class Array;
 
-namespace Om {
+namespace Ingen {
 
 class Patch;
 class Node;
@@ -50,7 +50,7 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 
 #endif // ENABLEPATCHEVENT_H
diff --git a/src/libs/engine/events/LashRestoreDoneEvent.h b/src/libs/engine/events/LashRestoreDoneEvent.h
index b090e01d..b543905c 100644
--- a/src/libs/engine/events/LashRestoreDoneEvent.h
+++ b/src/libs/engine/events/LashRestoreDoneEvent.h
@@ -24,7 +24,7 @@
 #include <iostream>
 using std::cerr;
 
-namespace Om {
+namespace Ingen {
 
 class Port;
 
@@ -49,6 +49,6 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // LASHRESTOREDONEEVENT_H
diff --git a/src/libs/engine/events/LoadPluginsEvent.cpp b/src/libs/engine/events/LoadPluginsEvent.cpp
index 317171ba..65972c17 100644
--- a/src/libs/engine/events/LoadPluginsEvent.cpp
+++ b/src/libs/engine/events/LoadPluginsEvent.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 using std::cerr;
 
-namespace Om {
+namespace Ingen {
 
 
 LoadPluginsEvent::LoadPluginsEvent(CountedPtr<Responder> responder, SampleCount timestamp)
@@ -40,5 +40,5 @@ LoadPluginsEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/LoadPluginsEvent.h b/src/libs/engine/events/LoadPluginsEvent.h
index 9600bdbc..0e40ca7e 100644
--- a/src/libs/engine/events/LoadPluginsEvent.h
+++ b/src/libs/engine/events/LoadPluginsEvent.h
@@ -19,7 +19,7 @@
 
 #include "QueuedEvent.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Loads all plugins into the internal plugin database (in NodeFactory).
@@ -35,6 +35,6 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // LOADPLUGINSEVENT_H
diff --git a/src/libs/engine/events/MidiLearnEvent.cpp b/src/libs/engine/events/MidiLearnEvent.cpp
index be0597f1..5349ba92 100644
--- a/src/libs/engine/events/MidiLearnEvent.cpp
+++ b/src/libs/engine/events/MidiLearnEvent.cpp
@@ -22,7 +22,7 @@
 #include "MidiControlNode.h"
 #include "ClientBroadcaster.h"
 
-namespace Om {
+namespace Ingen {
 
 
 // MidiLearnResponseEvent
@@ -82,6 +82,6 @@ MidiLearnEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
 
diff --git a/src/libs/engine/events/MidiLearnEvent.h b/src/libs/engine/events/MidiLearnEvent.h
index 26e8d3ec..558261a8 100644
--- a/src/libs/engine/events/MidiLearnEvent.h
+++ b/src/libs/engine/events/MidiLearnEvent.h
@@ -23,7 +23,7 @@
 #include <string>
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Node;
 class ControlChangeEvent;
@@ -79,6 +79,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // MIDILEARNEVENT_H
diff --git a/src/libs/engine/events/NoteOffEvent.cpp b/src/libs/engine/events/NoteOffEvent.cpp
index 39b04f31..36078e7c 100644
--- a/src/libs/engine/events/NoteOffEvent.cpp
+++ b/src/libs/engine/events/NoteOffEvent.cpp
@@ -22,7 +22,7 @@
 #include "MidiNoteNode.h"
 #include "MidiTriggerNode.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Note off with patch explicitly passed - triggered by MIDI.
@@ -72,6 +72,6 @@ NoteOffEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
 
diff --git a/src/libs/engine/events/NoteOffEvent.h b/src/libs/engine/events/NoteOffEvent.h
index 8bf14dae..707077a1 100644
--- a/src/libs/engine/events/NoteOffEvent.h
+++ b/src/libs/engine/events/NoteOffEvent.h
@@ -22,7 +22,7 @@
 #include <string>
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Node;
 
@@ -47,6 +47,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // NOTEOFFEVENT_H
diff --git a/src/libs/engine/events/NoteOnEvent.cpp b/src/libs/engine/events/NoteOnEvent.cpp
index df28c478..90711619 100644
--- a/src/libs/engine/events/NoteOnEvent.cpp
+++ b/src/libs/engine/events/NoteOnEvent.cpp
@@ -23,7 +23,7 @@
 #include "MidiTriggerNode.h"
 #include "Plugin.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Note on with Patch explicitly passed.
@@ -84,5 +84,5 @@ NoteOnEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/NoteOnEvent.h b/src/libs/engine/events/NoteOnEvent.h
index b0a20b04..209e7137 100644
--- a/src/libs/engine/events/NoteOnEvent.h
+++ b/src/libs/engine/events/NoteOnEvent.h
@@ -22,7 +22,7 @@
 #include <string>
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Node;
 
@@ -49,6 +49,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // NOTEONEVENT_H
diff --git a/src/libs/engine/events/PingQueuedEvent.h b/src/libs/engine/events/PingQueuedEvent.h
index 92b965c4..10e3a3bb 100644
--- a/src/libs/engine/events/PingQueuedEvent.h
+++ b/src/libs/engine/events/PingQueuedEvent.h
@@ -21,7 +21,7 @@
 #include "types.h"
 #include "Responder.h"
 
-namespace Om {
+namespace Ingen {
 
 class Port;
 
@@ -40,6 +40,6 @@ public:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // PINGQUEUEDEVENT_H
diff --git a/src/libs/engine/events/RegisterClientEvent.cpp b/src/libs/engine/events/RegisterClientEvent.cpp
index 54c47ce6..bbec1ba9 100644
--- a/src/libs/engine/events/RegisterClientEvent.cpp
+++ b/src/libs/engine/events/RegisterClientEvent.cpp
@@ -19,7 +19,7 @@
 #include "Ingen.h"
 #include "ClientBroadcaster.h"
 
-namespace Om {
+namespace Ingen {
 
 
 RegisterClientEvent::RegisterClientEvent(CountedPtr<Responder>       responder,
@@ -49,5 +49,5 @@ RegisterClientEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/RegisterClientEvent.h b/src/libs/engine/events/RegisterClientEvent.h
index 4e0dee7e..bc26c3bb 100644
--- a/src/libs/engine/events/RegisterClientEvent.h
+++ b/src/libs/engine/events/RegisterClientEvent.h
@@ -22,10 +22,10 @@
 #include "interface/ClientInterface.h"
 #include <string>
 using std::string;
-using Om::Shared::ClientInterface;
-using Om::Shared::ClientKey;
+using Ingen::Shared::ClientInterface;
+using Ingen::Shared::ClientKey;
 
-namespace Om {
+namespace Ingen {
 
 
 /** Registers a new client with the OSC system, so it can receive updates.
@@ -49,6 +49,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // REGISTERCLIENTEVENT_H
diff --git a/src/libs/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp
index a383fc3b..0d77dfa4 100644
--- a/src/libs/engine/events/RenameEvent.cpp
+++ b/src/libs/engine/events/RenameEvent.cpp
@@ -24,7 +24,7 @@
 #include "util/Path.h"
 #include "ObjectStore.h"
 
-namespace Om {
+namespace Ingen {
 
 
 RenameEvent::RenameEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& path, const string& name)
@@ -119,4 +119,4 @@ RenameEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/events/RenameEvent.h b/src/libs/engine/events/RenameEvent.h
index bfd726d6..d13efea9 100644
--- a/src/libs/engine/events/RenameEvent.h
+++ b/src/libs/engine/events/RenameEvent.h
@@ -25,7 +25,7 @@ using std::string;
 template<typename T> class TreeNode;
 template<typename T> class ListNode;
 
-namespace Om {
+namespace Ingen {
 
 class GraphObject;
 class Patch;
@@ -61,6 +61,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // RENAMEEVENT_H
diff --git a/src/libs/engine/events/RequestAllObjectsEvent.cpp b/src/libs/engine/events/RequestAllObjectsEvent.cpp
index 0260dd65..62a665b7 100644
--- a/src/libs/engine/events/RequestAllObjectsEvent.cpp
+++ b/src/libs/engine/events/RequestAllObjectsEvent.cpp
@@ -19,7 +19,7 @@
 #include "Ingen.h"
 #include "ObjectSender.h"
 
-namespace Om {
+namespace Ingen {
 
 
 RequestAllObjectsEvent::RequestAllObjectsEvent(CountedPtr<Responder> responder, SampleCount timestamp)
@@ -50,5 +50,5 @@ RequestAllObjectsEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/RequestAllObjectsEvent.h b/src/libs/engine/events/RequestAllObjectsEvent.h
index a37b953f..760a06ea 100644
--- a/src/libs/engine/events/RequestAllObjectsEvent.h
+++ b/src/libs/engine/events/RequestAllObjectsEvent.h
@@ -21,7 +21,7 @@
 #include "QueuedEvent.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 namespace Shared {
 	class ClientInterface;
@@ -45,6 +45,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // REQUESTALLOBJECTSEVENT_H
diff --git a/src/libs/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp
index 860d9f3f..2f41bc35 100644
--- a/src/libs/engine/events/RequestMetadataEvent.cpp
+++ b/src/libs/engine/events/RequestMetadataEvent.cpp
@@ -24,7 +24,7 @@
 #include "ClientBroadcaster.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 
 RequestMetadataEvent::RequestMetadataEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& node_path, const string& key)
@@ -75,5 +75,5 @@ RequestMetadataEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/RequestMetadataEvent.h b/src/libs/engine/events/RequestMetadataEvent.h
index 1da4ffe6..0b1cc267 100644
--- a/src/libs/engine/events/RequestMetadataEvent.h
+++ b/src/libs/engine/events/RequestMetadataEvent.h
@@ -22,7 +22,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 	
 class GraphObject;
 namespace Shared {
@@ -51,6 +51,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // REQUESTMETADATAEVENT_H
diff --git a/src/libs/engine/events/RequestPluginsEvent.cpp b/src/libs/engine/events/RequestPluginsEvent.cpp
index 286badb4..fff549b8 100644
--- a/src/libs/engine/events/RequestPluginsEvent.cpp
+++ b/src/libs/engine/events/RequestPluginsEvent.cpp
@@ -19,7 +19,7 @@
 #include "Ingen.h"
 #include "ClientBroadcaster.h"
 
-namespace Om {
+namespace Ingen {
 
 
 RequestPluginsEvent::RequestPluginsEvent(CountedPtr<Responder> responder, SampleCount timestamp)
@@ -50,5 +50,5 @@ RequestPluginsEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/RequestPluginsEvent.h b/src/libs/engine/events/RequestPluginsEvent.h
index 29bb0958..0a35a1ad 100644
--- a/src/libs/engine/events/RequestPluginsEvent.h
+++ b/src/libs/engine/events/RequestPluginsEvent.h
@@ -21,7 +21,7 @@
 #include "QueuedEvent.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Responder;
 namespace Shared {
@@ -46,6 +46,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // REQUESTPLUGINSEVENT_H
diff --git a/src/libs/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp
index 8cb401dc..e6384875 100644
--- a/src/libs/engine/events/RequestPortValueEvent.cpp
+++ b/src/libs/engine/events/RequestPortValueEvent.cpp
@@ -25,7 +25,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 
 RequestPortValueEvent::RequestPortValueEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& port_path)
@@ -75,5 +75,5 @@ RequestPortValueEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/RequestPortValueEvent.h b/src/libs/engine/events/RequestPortValueEvent.h
index eba37122..9b809b3d 100644
--- a/src/libs/engine/events/RequestPortValueEvent.h
+++ b/src/libs/engine/events/RequestPortValueEvent.h
@@ -23,7 +23,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 	
 class Port;
 namespace Shared { class ClientInterface; }
@@ -51,6 +51,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // REQUESTPORTVALUEEVENT_H
diff --git a/src/libs/engine/events/SetMetadataEvent.cpp b/src/libs/engine/events/SetMetadataEvent.cpp
index a2a02318..9ce03bc9 100644
--- a/src/libs/engine/events/SetMetadataEvent.cpp
+++ b/src/libs/engine/events/SetMetadataEvent.cpp
@@ -24,7 +24,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 
 SetMetadataEvent::SetMetadataEvent(CountedPtr<Responder> responder, SampleCount timestamp, const string& path, const string& key, const string& value)
@@ -75,4 +75,4 @@ SetMetadataEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
diff --git a/src/libs/engine/events/SetMetadataEvent.h b/src/libs/engine/events/SetMetadataEvent.h
index 40ec5978..7ea534a1 100644
--- a/src/libs/engine/events/SetMetadataEvent.h
+++ b/src/libs/engine/events/SetMetadataEvent.h
@@ -22,7 +22,7 @@
 
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class GraphObject;
 
@@ -48,6 +48,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // SETMETADATAEVENT_H
diff --git a/src/libs/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp
index f29a89d1..58bb815b 100644
--- a/src/libs/engine/events/SetPortValueEvent.cpp
+++ b/src/libs/engine/events/SetPortValueEvent.cpp
@@ -22,7 +22,7 @@
 #include "Node.h"
 #include "ObjectStore.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Voice-specific control setting
@@ -98,5 +98,5 @@ SetPortValueEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/SetPortValueEvent.h b/src/libs/engine/events/SetPortValueEvent.h
index 4aca1aaf..ecd1557a 100644
--- a/src/libs/engine/events/SetPortValueEvent.h
+++ b/src/libs/engine/events/SetPortValueEvent.h
@@ -22,7 +22,7 @@
 #include "types.h"
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Port;
 
@@ -51,6 +51,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // SETPORTVALUEEVENT_H
diff --git a/src/libs/engine/events/SetPortValueQueuedEvent.cpp b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
index 71d796b1..bb17c44e 100644
--- a/src/libs/engine/events/SetPortValueQueuedEvent.cpp
+++ b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
@@ -23,7 +23,7 @@
 #include "Node.h"
 #include "ObjectStore.h"
 
-namespace Om {
+namespace Ingen {
 
 
 /** Voice-specific control setting
@@ -110,5 +110,5 @@ SetPortValueQueuedEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/SetPortValueQueuedEvent.h b/src/libs/engine/events/SetPortValueQueuedEvent.h
index 2dbca248..9e83e045 100644
--- a/src/libs/engine/events/SetPortValueQueuedEvent.h
+++ b/src/libs/engine/events/SetPortValueQueuedEvent.h
@@ -22,7 +22,7 @@
 #include <string>
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 class Port;
 
@@ -52,6 +52,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // SETPORTVALUEQUEUEDEVENT_H
diff --git a/src/libs/engine/events/UnregisterClientEvent.cpp b/src/libs/engine/events/UnregisterClientEvent.cpp
index 622b6c9a..0ec3c467 100644
--- a/src/libs/engine/events/UnregisterClientEvent.cpp
+++ b/src/libs/engine/events/UnregisterClientEvent.cpp
@@ -20,7 +20,7 @@
 #include "ClientBroadcaster.h"
 #include "interface/ClientInterface.h"
 
-namespace Om {
+namespace Ingen {
 
 
 UnregisterClientEvent::UnregisterClientEvent(CountedPtr<Responder> responder, SampleCount timestamp, ClientKey key)
@@ -40,5 +40,5 @@ UnregisterClientEvent::post_process()
 }
 
 
-} // namespace Om
+} // namespace Ingen
 
diff --git a/src/libs/engine/events/UnregisterClientEvent.h b/src/libs/engine/events/UnregisterClientEvent.h
index 634fe762..1523394e 100644
--- a/src/libs/engine/events/UnregisterClientEvent.h
+++ b/src/libs/engine/events/UnregisterClientEvent.h
@@ -22,7 +22,7 @@
 #include <string>
 using std::string;
 
-namespace Om {
+namespace Ingen {
 
 namespace Shared {
 	class ClientInterface;
@@ -48,6 +48,6 @@ private:
 };
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // UNREGISTERCLIENTEVENT_H
diff --git a/src/libs/engine/instantiations.cpp b/src/libs/engine/instantiations.cpp
index 714eb4f2..3d0d8ce4 100644
--- a/src/libs/engine/instantiations.cpp
+++ b/src/libs/engine/instantiations.cpp
@@ -29,21 +29,21 @@
 
 
 /* Tree */
-template class Tree<Om::Node*>;
-template class TreeNode<Om::Node*>;
-
-template                          Tree<Om::GraphObject*>::Tree();
-template                          Tree<Om::GraphObject*>::~Tree();
-template void                     Tree<Om::GraphObject*>::insert(TreeNode<Om::GraphObject*>* const n);
-template TreeNode<Om::GraphObject*>* Tree<Om::GraphObject*>::remove(const string& key);
-template Om::GraphObject*            Tree<Om::GraphObject*>::find(const string& key) const;
-template TreeNode<Om::GraphObject*>* Tree<Om::GraphObject*>::find_treenode(const string& key) const;
-
-template Tree<Om::GraphObject*>::iterator Tree<Om::GraphObject*>::begin() const;
-template Tree<Om::GraphObject*>::iterator Tree<Om::GraphObject*>::end() const;
-
-template Tree<Om::GraphObject*>::iterator::~iterator();
-template Om::GraphObject* Tree<Om::GraphObject*>::iterator::operator*() const;
-template Tree<Om::GraphObject*>::iterator&     Tree<Om::GraphObject*>::iterator::operator++();
-template bool          Tree<Om::GraphObject*>::iterator::operator!=(const iterator& iter) const;
+template class Tree<Ingen::Node*>;
+template class TreeNode<Ingen::Node*>;
+
+template                          Tree<Ingen::GraphObject*>::Tree();
+template                          Tree<Ingen::GraphObject*>::~Tree();
+template void                     Tree<Ingen::GraphObject*>::insert(TreeNode<Ingen::GraphObject*>* const n);
+template TreeNode<Ingen::GraphObject*>* Tree<Ingen::GraphObject*>::remove(const string& key);
+template Ingen::GraphObject*            Tree<Ingen::GraphObject*>::find(const string& key) const;
+template TreeNode<Ingen::GraphObject*>* Tree<Ingen::GraphObject*>::find_treenode(const string& key) const;
+
+template Tree<Ingen::GraphObject*>::iterator Tree<Ingen::GraphObject*>::begin() const;
+template Tree<Ingen::GraphObject*>::iterator Tree<Ingen::GraphObject*>::end() const;
+
+template Tree<Ingen::GraphObject*>::iterator::~iterator();
+template Ingen::GraphObject* Tree<Ingen::GraphObject*>::iterator::operator*() const;
+template Tree<Ingen::GraphObject*>::iterator&     Tree<Ingen::GraphObject*>::iterator::operator++();
+template bool          Tree<Ingen::GraphObject*>::iterator::operator!=(const iterator& iter) const;
 
diff --git a/src/libs/engine/tuning.h b/src/libs/engine/tuning.h
index b2c1ef1c..61d43f9f 100644
--- a/src/libs/engine/tuning.h
+++ b/src/libs/engine/tuning.h
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <time.h>
 
-namespace Om {
+namespace Ingen {
 	
 // FIXME: put this in a Config class
 	
@@ -34,6 +34,6 @@ static const size_t maid_queue_size            = 1024;
 static const timespec main_rate       = { 0, 500000000 }; // 1/2 second
 
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // TUNING_H
diff --git a/src/libs/engine/types.h b/src/libs/engine/types.h
index 125651bc..c623ac42 100644
--- a/src/libs/engine/types.h
+++ b/src/libs/engine/types.h
@@ -29,7 +29,7 @@ typedef jack_default_audio_sample_t Sample;
 typedef jack_nframes_t              SampleCount;
 typedef jack_nframes_t              SampleRate;
 
-/** A type that Om can patch (eg can be stored in a port) */
+/** A type that Ingen can process/patch (eg can be stored in a port) */
 enum DataType { FLOAT, MIDI, UNKNOWN };
 
 
diff --git a/src/libs/engine/util.h b/src/libs/engine/util.h
index 0d905eb9..a31ba455 100644
--- a/src/libs/engine/util.h
+++ b/src/libs/engine/util.h
@@ -27,7 +27,7 @@
 
 using std::cerr; using std::endl;
 
-namespace Om {
+namespace Ingen {
 
 /** Set flags to disable denormal processing.
  */
@@ -68,6 +68,6 @@ set_denormal_flags()
 	fesetround(FE_TOWARDZERO);
 }
 
-} // namespace Om
+} // namespace Ingen
 
 #endif // UTIL_H
diff --git a/src/progs/demolition/DemolitionClientInterface.h b/src/progs/demolition/DemolitionClientInterface.h
index 16a67ce9..1cd85ec2 100644
--- a/src/progs/demolition/DemolitionClientInterface.h
+++ b/src/progs/demolition/DemolitionClientInterface.h
@@ -25,7 +25,7 @@
 #include "PluginModel.h"
 using std::string;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
 
 /** ModelClientInterface implementation for the Gtk client.
diff --git a/src/progs/demolition/DemolitionModel.h b/src/progs/demolition/DemolitionModel.h
index 952d41cb..67eb1005 100644
--- a/src/progs/demolition/DemolitionModel.h
+++ b/src/progs/demolition/DemolitionModel.h
@@ -20,10 +20,9 @@
 #include <vector>
 #include "PatchModel.h"
 #include "util/Path.h"
-using Om::Path;
 using std::vector;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
 class DemolitionModel {
 public:
diff --git a/src/progs/demolition/demolition.cpp b/src/progs/demolition/demolition.cpp
index cc2de60c..e5ffded0 100644
--- a/src/progs/demolition/demolition.cpp
+++ b/src/progs/demolition/demolition.cpp
@@ -14,12 +14,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "interface/ClientInterface.h"
+#include "interface/ClientKey.h"
 #include "OSCModelEngineInterface.h"
-#include "OSCModelEngineInterface.h" // FIXME: make conditional
 #include "PatchLibrarian.h"
 #include "DemolitionClientInterface.h"
-#include "interface/ClientInterface.h"
-#include "interface/ClientKey.h"
 #include "util/CountedPtr.h"
 #include <iostream>
 #include <unistd.h>
@@ -29,7 +28,7 @@
 using std::cout;
 using std::endl;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
 void do_something();
 
diff --git a/src/progs/ingenuity/App.cpp b/src/progs/ingenuity/App.cpp
index ffc03074..1ca2fec5 100644
--- a/src/progs/ingenuity/App.cpp
+++ b/src/progs/ingenuity/App.cpp
@@ -48,10 +48,10 @@
 #endif
 using std::cerr; using std::cout; using std::endl;
 using std::string;
-namespace LibOmClient { class PluginModel; }
-using namespace LibOmClient;
+namespace Ingen { namespace Client { class PluginModel; } }
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class OmPort;
 
@@ -221,5 +221,5 @@ App::quit()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
diff --git a/src/progs/ingenuity/App.h b/src/progs/ingenuity/App.h
index 6c951a94..faabc115 100644
--- a/src/progs/ingenuity/App.h
+++ b/src/progs/ingenuity/App.h
@@ -28,13 +28,14 @@
 using std::string; using std::map; using std::list;
 using std::cerr; using std::endl;
 
-namespace LibOmClient { class PatchModel; class PluginModel; }
-using namespace LibOmClient;
+namespace Ingen { namespace Client { class PatchModel; class PluginModel; } }
+using namespace Ingen::Client;
 
-/** \defgroup OmGtk GTK Client
+/** \defgroup Ingenuity GTK Client
  */
 
-namespace OmGtk {
+/** GTK Graphical client */
+namespace Ingenuity {
 
 class PatchWindow;
 class GtkObjectController;
@@ -44,7 +45,7 @@ class PortController;
 class LoadPatchWindow;
 class MessagesWindow;
 class ConfigWindow;
-class OmGtkObject;
+class IngenuityObject;
 class OmModule;
 class OmPort;
 class OmFlowCanvas;
@@ -59,7 +60,7 @@ class Configuration;
  * This is a horrible god-object, but it's shrinking in size as things are
  * moved out.  Hopefully it will go away entirely some day..
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class App
 {
@@ -112,7 +113,7 @@ protected:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // OMGTKAPP_H
 
diff --git a/src/progs/ingenuity/BreadCrumb.h b/src/progs/ingenuity/BreadCrumb.h
index 54b84ad1..9b4c25cd 100644
--- a/src/progs/ingenuity/BreadCrumb.h
+++ b/src/progs/ingenuity/BreadCrumb.h
@@ -22,12 +22,12 @@
 #include "PatchController.h"
 #include "PatchModel.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 /** Breadcrumb button in a PatchWindow.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class BreadCrumb : public Gtk::ToggleButton
 {
@@ -63,6 +63,6 @@ private:
 	//PatchController* m_patch;
 };
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // BREADCRUMB_H
diff --git a/src/progs/ingenuity/ConfigWindow.cpp b/src/progs/ingenuity/ConfigWindow.cpp
index 06b2425f..934dcc6b 100644
--- a/src/progs/ingenuity/ConfigWindow.cpp
+++ b/src/progs/ingenuity/ConfigWindow.cpp
@@ -25,7 +25,7 @@
 using std::cout; using std::cerr; using std::endl;
 
 
-namespace OmGtk {
+namespace Ingenuity {
 
 ConfigWindow::ConfigWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
 : Gtk::Window(cobject),
@@ -83,4 +83,4 @@ ConfigWindow::ok_clicked()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/ConfigWindow.h b/src/progs/ingenuity/ConfigWindow.h
index 66beaeba..7113416c 100644
--- a/src/progs/ingenuity/ConfigWindow.h
+++ b/src/progs/ingenuity/ConfigWindow.h
@@ -26,16 +26,16 @@
 #include <gtkmm.h>
 
 using std::list;
-using LibOmClient::PluginModel;
+using Ingen::Client::PluginModel;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 
 /** 'Configuration' window.
  *
  * Loaded by glade as a derived object.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class ConfigWindow : public Gtk::Window
 {
@@ -58,6 +58,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // CONFIGWINDOW_H
diff --git a/src/progs/ingenuity/Configuration.cpp b/src/progs/ingenuity/Configuration.cpp
index bbf6d618..4cb473cb 100644
--- a/src/progs/ingenuity/Configuration.cpp
+++ b/src/progs/ingenuity/Configuration.cpp
@@ -29,11 +29,11 @@
 
 using std::cerr; using std::cout; using std::endl;
 using std::map; using std::string;
-using LibOmClient::PatchModel;
+using Ingen::Client::PatchModel;
 
-namespace OmGtk {
+namespace Ingenuity {
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
 
 Configuration::Configuration()
@@ -181,4 +181,4 @@ Configuration::set_window_size(const string& id, Coord size)
 }*/
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/Configuration.h b/src/progs/ingenuity/Configuration.h
index 32fcc706..9550c41b 100644
--- a/src/progs/ingenuity/Configuration.h
+++ b/src/progs/ingenuity/Configuration.h
@@ -19,13 +19,13 @@
 
 #include <string>
 
-namespace LibOmClient { class PortModel; }
-using LibOmClient::PortModel;
+namespace Ingen { namespace Client { class PortModel; } }
+using Ingen::Client::PortModel;
 using std::string;
 
 struct Coord { double x; double y; };
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class Controller;
 
@@ -35,7 +35,7 @@ class Controller;
  * Stores settings like color preferences, search paths, etc. 
  * (ie any user-defined preferences to be stoed in the rc file).
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class Configuration
 {
@@ -69,7 +69,7 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // CONFIG_H
 
diff --git a/src/progs/ingenuity/ConnectWindow.cpp b/src/progs/ingenuity/ConnectWindow.cpp
index f60f39fa..4cfb7a9c 100644
--- a/src/progs/ingenuity/ConnectWindow.cpp
+++ b/src/progs/ingenuity/ConnectWindow.cpp
@@ -27,7 +27,7 @@
 #include "PatchController.h"
 #include "PatchModel.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
@@ -56,7 +56,7 @@ ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
 
 
 void
-ConnectWindow::start(CountedPtr<Om::Shared::ClientInterface> client)
+ConnectWindow::start(CountedPtr<Ingen::Shared::ClientInterface> client)
 {
 	_client = client;
 	resize(100, 100);
@@ -104,7 +104,7 @@ void
 ConnectWindow::quit()
 {
 	if (Controller::instance().is_attached()) {
-		Gtk::MessageDialog d(*this, "This will exit OmGtk, but the engine will "
+		Gtk::MessageDialog d(*this, "This will exit Ingenuity, but the engine will "
 			"remain running (if it is remote).\n\nAre you sure you want to quit?",
 			true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true);
 			d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@@ -257,4 +257,4 @@ ConnectWindow::gtk_callback()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/ConnectWindow.h b/src/progs/ingenuity/ConnectWindow.h
index 5808f665..3609c5fc 100644
--- a/src/progs/ingenuity/ConnectWindow.h
+++ b/src/progs/ingenuity/ConnectWindow.h
@@ -23,7 +23,7 @@
 #include "util/CountedPtr.h"
 #include "interface/ClientInterface.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class App;
 class Controller;
@@ -34,14 +34,14 @@ class Controller;
  * This handles actually connecting to the engine and making sure everything
  * is ready before really launching the app (eg wait for the root patch).
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class ConnectWindow : public Gtk::Dialog
 {
 public:
 	ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml);
 	
-	void start(CountedPtr<Om::Shared::ClientInterface> client);
+	void start(CountedPtr<Ingen::Shared::ClientInterface> client);
 private:
 	void server_toggled();
 	void launch_toggled();
@@ -53,7 +53,7 @@ private:
 
 	bool gtk_callback();
 
-	CountedPtr<Om::Shared::ClientInterface> _client;
+	CountedPtr<Ingen::Shared::ClientInterface> _client;
 	Gtk::Image*                             _icon;
 	Gtk::ProgressBar*                       _progress_bar;
 	Gtk::Label*                             _progress_label;
@@ -68,6 +68,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // CONNECT_WINDOW_H
diff --git a/src/progs/ingenuity/ControlGroups.cpp b/src/progs/ingenuity/ControlGroups.cpp
index f98c565e..7c84d898 100644
--- a/src/progs/ingenuity/ControlGroups.cpp
+++ b/src/progs/ingenuity/ControlGroups.cpp
@@ -22,9 +22,9 @@
 #include <iostream>
 using std::cerr; using std::cout; using std::endl;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 // ////////////////////// ControlGroup ///////////////////////////////// //
@@ -438,4 +438,4 @@ ToggleControlGroup::update_value()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/ControlGroups.h b/src/progs/ingenuity/ControlGroups.h
index 279d379c..a5b3d1f5 100644
--- a/src/progs/ingenuity/ControlGroups.h
+++ b/src/progs/ingenuity/ControlGroups.h
@@ -24,18 +24,17 @@
 #include "PortModel.h"
 #include "util/CountedPtr.h"
 
+namespace Ingen { namespace Client { class PortModel; } }
+using namespace Ingen::Client;
 
-namespace LibOmClient { class PortModel; }
-using namespace LibOmClient;
-
-namespace OmGtk {
+namespace Ingenuity {
 
 class ControlPanel;
 
 
 /** A group of controls (for a single Port) in a NodeControlWindow.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class ControlGroup : public Gtk::VBox
 {
@@ -70,7 +69,7 @@ protected:
 
 /** A slider for a continuous control.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class SliderControlGroup : public ControlGroup
 {
@@ -129,7 +128,7 @@ SliderControlGroup::set_value(const float val)
 
 /** A spinbutton for integer controls.
  * 
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class IntegerControlGroup : public ControlGroup
 {
@@ -154,7 +153,7 @@ private:
 
 /** A radio button for toggle controls.
  * 
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class ToggleControlGroup : public ControlGroup
 {
@@ -177,6 +176,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // CONTROLGROUPS_H
diff --git a/src/progs/ingenuity/ControlPanel.cpp b/src/progs/ingenuity/ControlPanel.cpp
index 53a1341c..82d2beba 100644
--- a/src/progs/ingenuity/ControlPanel.cpp
+++ b/src/progs/ingenuity/ControlPanel.cpp
@@ -22,7 +22,7 @@
 #include "PatchController.h"
 #include "Controller.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 	
 ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
@@ -282,4 +282,4 @@ ControlPanel::voice_selected()
 }
 
 	
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/ControlPanel.h b/src/progs/ingenuity/ControlPanel.h
index 1f3264ce..a0cc819d 100644
--- a/src/progs/ingenuity/ControlPanel.h
+++ b/src/progs/ingenuity/ControlPanel.h
@@ -32,14 +32,13 @@
 using std::vector; using std::string; using std::pair;
 using std::cerr; using std::cout; using std::endl;
 
-namespace LibOmClient {
-class PortModel;
-class NodeModel;
-}
-using namespace LibOmClient;
-using Om::Path;
+namespace Ingen { namespace Client {
+	class PortModel;
+	class NodeModel;
+} }
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class NodeController;
 class PortController;
@@ -49,7 +48,7 @@ class PortController;
  *
  * Used by both NodeControlWindow and the main window (for patch controls).
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class ControlPanel : public Gtk::VBox {
 public:
@@ -125,6 +124,6 @@ ControlPanel::set_control(const Path& port_path, const float val)
 }
 */
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // CONTROLPANEL_H
diff --git a/src/progs/ingenuity/Controller.cpp b/src/progs/ingenuity/Controller.cpp
index f293b921..5b8253b8 100644
--- a/src/progs/ingenuity/Controller.cpp
+++ b/src/progs/ingenuity/Controller.cpp
@@ -23,7 +23,7 @@
 #include "Loader.h"
 #include "interface/ClientKey.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 /// Singleton instance	
@@ -171,5 +171,5 @@ Controller::yank_added_patch(const string& path)
 }
 #endif
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
diff --git a/src/progs/ingenuity/Controller.h b/src/progs/ingenuity/Controller.h
index dac00d62..a2c1ce0d 100644
--- a/src/progs/ingenuity/Controller.h
+++ b/src/progs/ingenuity/Controller.h
@@ -24,16 +24,16 @@
 #include "PluginModel.h"
 #include "OSCModelEngineInterface.h"
 
-namespace LibOmClient {
+namespace Ingen { namespace Client {
 class PatchModel;
 class NodeModel;
 class PatchLibrarian;
-}
+} }
 
 using std::string; using std::list;
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class PatchController;
 class Loader;
@@ -47,7 +47,7 @@ class Loader;
  * This needs to be either eliminated or the name changed to OmController.  Probably
  * best to keep around in case multiple engine control support comes around?
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class Controller : public OSCModelEngineInterface
 {
@@ -105,6 +105,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // CONTROLLER_H
diff --git a/src/progs/ingenuity/DSSIController.cpp b/src/progs/ingenuity/DSSIController.cpp
index bf8b11c5..7419f8c1 100644
--- a/src/progs/ingenuity/DSSIController.cpp
+++ b/src/progs/ingenuity/DSSIController.cpp
@@ -24,7 +24,7 @@
 #include "DSSIModule.h"
 #include "Controller.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 DSSIController::DSSIController(CountedPtr<NodeModel> model)
@@ -276,5 +276,5 @@ DSSIController::show_menu(GdkEventButton* event)
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
diff --git a/src/progs/ingenuity/DSSIController.h b/src/progs/ingenuity/DSSIController.h
index 58b477bf..0ad26e76 100644
--- a/src/progs/ingenuity/DSSIController.h
+++ b/src/progs/ingenuity/DSSIController.h
@@ -23,16 +23,15 @@
 #include "NodeController.h"
 
 using std::string;
-using Om::Path;
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace LibOmClient {
+namespace Ingen { namespace Client {
 	class MetadataModel;
 	class NodeModel;
 	class PortModel;
-}
+} }
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class Controller;
 class OmModule;
@@ -44,7 +43,7 @@ class DSSIModule;
 
 /* Controller for a DSSI node.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class DSSIController : public NodeController
 {
@@ -74,6 +73,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // DSSICONTROLLER_H
diff --git a/src/progs/ingenuity/DSSIModule.cpp b/src/progs/ingenuity/DSSIModule.cpp
index 7f3e4370..ebcd114c 100644
--- a/src/progs/ingenuity/DSSIModule.cpp
+++ b/src/progs/ingenuity/DSSIModule.cpp
@@ -17,7 +17,7 @@
 #include "DSSIModule.h"
 #include "DSSIController.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 DSSIModule::DSSIModule(OmFlowCanvas* canvas, DSSIController* node)
@@ -35,4 +35,4 @@ DSSIModule::on_double_click(GdkEventButton* ev)
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/DSSIModule.h b/src/progs/ingenuity/DSSIModule.h
index d488acde..7a1b0035 100644
--- a/src/progs/ingenuity/DSSIModule.h
+++ b/src/progs/ingenuity/DSSIModule.h
@@ -19,13 +19,13 @@
 
 #include "OmModule.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class DSSIController;
 
 /* Module for a DSSI node.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class DSSIModule : public OmModule
 {
@@ -37,7 +37,7 @@ public:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // DSSIMODULE_H
 
diff --git a/src/progs/ingenuity/GladeFactory.cpp b/src/progs/ingenuity/GladeFactory.cpp
index 3045149b..528754fb 100644
--- a/src/progs/ingenuity/GladeFactory.cpp
+++ b/src/progs/ingenuity/GladeFactory.cpp
@@ -20,7 +20,7 @@
 using std::cout; using std::cerr; using std::endl;
 using std::ifstream;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 Glib::ustring GladeFactory::glade_filename = "";
@@ -66,4 +66,4 @@ GladeFactory::new_glade_reference(const string& toplevel_widget)
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/GladeFactory.h b/src/progs/ingenuity/GladeFactory.h
index 896d8d83..2953f23a 100644
--- a/src/progs/ingenuity/GladeFactory.h
+++ b/src/progs/ingenuity/GladeFactory.h
@@ -22,13 +22,13 @@
 
 using std::string;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 /** Creates glade references, so various objects can create widgets.
  * Purely static.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class GladeFactory {
 public:
@@ -43,6 +43,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // GLADEFACTORY_H
diff --git a/src/progs/ingenuity/GtkObjectController.cpp b/src/progs/ingenuity/GtkObjectController.cpp
index dcf65be2..d5fb08a1 100644
--- a/src/progs/ingenuity/GtkObjectController.cpp
+++ b/src/progs/ingenuity/GtkObjectController.cpp
@@ -16,7 +16,7 @@
 
 #include "GtkObjectController.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 	
 GtkObjectController::GtkObjectController(CountedPtr<ObjectModel> model)
@@ -27,5 +27,5 @@ GtkObjectController::GtkObjectController(CountedPtr<ObjectModel> model)
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
diff --git a/src/progs/ingenuity/GtkObjectController.h b/src/progs/ingenuity/GtkObjectController.h
index b6374f8e..735e7b6b 100644
--- a/src/progs/ingenuity/GtkObjectController.h
+++ b/src/progs/ingenuity/GtkObjectController.h
@@ -26,9 +26,9 @@
 
 using std::string;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class Controller;
 
@@ -39,9 +39,9 @@ class Controller;
  * The view may not be created (ie in the case of patches which have never
  * been shown and all their children).
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
-class GtkObjectController : public LibOmClient::ObjectController
+class GtkObjectController : public ObjectController
 {
 public:
 	GtkObjectController(CountedPtr<ObjectModel> model);
@@ -78,6 +78,6 @@ protected:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // GTKOBJECTCONTROLLER_H
diff --git a/src/progs/ingenuity/LashController.cpp b/src/progs/ingenuity/LashController.cpp
index a46fc92f..e5807da7 100644
--- a/src/progs/ingenuity/LashController.cpp
+++ b/src/progs/ingenuity/LashController.cpp
@@ -28,7 +28,7 @@
 using std::cerr; using std::cout; using std::endl;
 using std::string;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 
 LashController::LashController(lash_args_t* args)
@@ -43,7 +43,7 @@ LashController::LashController(lash_args_t* args)
 	}
 	
 	lash_event_t* event = lash_event_new_with_type(LASH_Client_Name);
-	lash_event_set_string(event, "OmGtk");
+	lash_event_set_string(event, "Ingenuity");
 	lash_send_event(m_client, event);			
 }
 
@@ -165,4 +165,4 @@ LashController::save(const string& dir)
 	*/
 }
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/LashController.h b/src/progs/ingenuity/LashController.h
index a2975fd7..0619f32f 100644
--- a/src/progs/ingenuity/LashController.h
+++ b/src/progs/ingenuity/LashController.h
@@ -21,13 +21,13 @@
 #include <lash/lash.h>
 using std::string;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class App;
 
 /* Old and unused LASH controller.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class LashController
 {
@@ -48,6 +48,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // LASHCONTROLLER_H
diff --git a/src/progs/ingenuity/LoadPatchWindow.cpp b/src/progs/ingenuity/LoadPatchWindow.cpp
index f307e6ad..81726f2a 100644
--- a/src/progs/ingenuity/LoadPatchWindow.cpp
+++ b/src/progs/ingenuity/LoadPatchWindow.cpp
@@ -23,7 +23,7 @@
 #include "PatchModel.h"
 #include "Controller.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
@@ -128,4 +128,4 @@ LoadPatchWindow::cancel_clicked()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/LoadPatchWindow.h b/src/progs/ingenuity/LoadPatchWindow.h
index ddfb6446..4f72c6c1 100644
--- a/src/progs/ingenuity/LoadPatchWindow.h
+++ b/src/progs/ingenuity/LoadPatchWindow.h
@@ -22,7 +22,7 @@
 #include <libglademm/xml.h>
 #include <gtkmm.h>
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class PatchController;
 
@@ -35,7 +35,7 @@ class PatchController;
  *
  * This is not for loading subpatches.  See @a LoadSubpatchWindow for that.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class LoadPatchWindow : public Gtk::FileChooserDialog
 {
@@ -68,6 +68,6 @@ private:
 };
  
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // LOADPATCHWINDOW_H
diff --git a/src/progs/ingenuity/LoadPluginWindow.cpp b/src/progs/ingenuity/LoadPluginWindow.cpp
index 54ee9df9..3037dd93 100644
--- a/src/progs/ingenuity/LoadPluginWindow.cpp
+++ b/src/progs/ingenuity/LoadPluginWindow.cpp
@@ -30,7 +30,7 @@
 using std::cout; using std::cerr; using std::endl;
 
 
-namespace OmGtk {
+namespace Ingenuity {
 
 LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
 : Gtk::Window(cobject),
@@ -404,4 +404,4 @@ LoadPluginWindow::on_key_press_event(GdkEventKey* event)
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/LoadPluginWindow.h b/src/progs/ingenuity/LoadPluginWindow.h
index f6a7f076..6f04d25c 100644
--- a/src/progs/ingenuity/LoadPluginWindow.h
+++ b/src/progs/ingenuity/LoadPluginWindow.h
@@ -25,9 +25,9 @@
 #include <gtkmm.h>
 #include "util/CountedPtr.h"
 
-using LibOmClient::PluginModel;
+using Ingen::Client::PluginModel;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class PatchController;
 
@@ -35,7 +35,7 @@ class PatchController;
 
 /** Columns for the plugin list in the load plugin window.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class ModelColumns : public Gtk::TreeModel::ColumnRecord
 {
@@ -62,7 +62,7 @@ public:
 
 /** Column for the criteria combo box in the load plugin window.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class CriteriaColumns : public Gtk::TreeModel::ColumnRecord
 {
@@ -80,7 +80,7 @@ public:
  *
  * Loaded by glade as a derived object.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class LoadPluginWindow : public Gtk::Window
 {
@@ -140,6 +140,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // LOADPLUGINWINDOW_H
diff --git a/src/progs/ingenuity/LoadSubpatchWindow.cpp b/src/progs/ingenuity/LoadSubpatchWindow.cpp
index 15c8c2d8..dbf40c00 100644
--- a/src/progs/ingenuity/LoadSubpatchWindow.cpp
+++ b/src/progs/ingenuity/LoadSubpatchWindow.cpp
@@ -25,7 +25,7 @@
 #include "PatchModel.h"
 #include "Configuration.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 LoadSubpatchWindow::LoadSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
@@ -174,4 +174,4 @@ LoadSubpatchWindow::cancel_clicked()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/LoadSubpatchWindow.h b/src/progs/ingenuity/LoadSubpatchWindow.h
index fd9a23e1..2ec37432 100644
--- a/src/progs/ingenuity/LoadSubpatchWindow.h
+++ b/src/progs/ingenuity/LoadSubpatchWindow.h
@@ -23,7 +23,7 @@
 #include <gtkmm.h>
 
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class PatchController;
 
@@ -32,7 +32,7 @@ class PatchController;
  *
  * Loaded by glade as a derived object.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class LoadSubpatchWindow : public Gtk::FileChooserDialog
 {
@@ -73,6 +73,6 @@ private:
 };
  
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // LOADSUBPATCHWINDOW_H
diff --git a/src/progs/ingenuity/Loader.cpp b/src/progs/ingenuity/Loader.cpp
index 125ecf29..13a4e896 100644
--- a/src/progs/ingenuity/Loader.cpp
+++ b/src/progs/ingenuity/Loader.cpp
@@ -23,7 +23,7 @@
 #include "PatchController.h"
 using std::cout; using std::endl;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 // LoadPatchEvent //
@@ -230,4 +230,4 @@ Loader::save_session(const string& filename)
 }
 */
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/Loader.h b/src/progs/ingenuity/Loader.h
index df7699d6..df9166d2 100644
--- a/src/progs/ingenuity/Loader.h
+++ b/src/progs/ingenuity/Loader.h
@@ -21,19 +21,19 @@
 #include <cassert>
 using std::string;
 
-namespace LibOmClient {
+namespace Ingen { namespace Client {
 	class PatchLibrarian;
 	class PatchModel;
-}
-using LibOmClient::PatchLibrarian;
-using LibOmClient::PatchModel;
+} }
+using Ingen::Client::PatchLibrarian;
+using Ingen::Client::PatchModel;
 
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 /** Event to run in the Loader thread.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class LoaderEvent
 {
@@ -47,7 +47,7 @@ protected:
 
 /** Loader thread patch loading event.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class LoadPatchEvent : public LoaderEvent
 {
@@ -66,7 +66,7 @@ private:
 
 /** Loader thread patch loading event.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class SavePatchEvent : public LoaderEvent
 {
@@ -115,7 +115,7 @@ private:
  * blocking everything else, so the app can respond to the incoming events
  * caused as a result of the patch loading.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class Loader
 {
@@ -149,6 +149,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // LOADERRTHREAD_H
diff --git a/src/progs/ingenuity/MessagesWindow.cpp b/src/progs/ingenuity/MessagesWindow.cpp
index 05e9ae3e..002fb814 100644
--- a/src/progs/ingenuity/MessagesWindow.cpp
+++ b/src/progs/ingenuity/MessagesWindow.cpp
@@ -17,7 +17,7 @@
 #include "MessagesWindow.h"
 #include <string>
 
-namespace OmGtk {
+namespace Ingenuity {
 using std::string;
 
 
@@ -61,4 +61,4 @@ MessagesWindow::clear_clicked()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/MessagesWindow.h b/src/progs/ingenuity/MessagesWindow.h
index 49ee7d9b..e9d836f3 100644
--- a/src/progs/ingenuity/MessagesWindow.h
+++ b/src/progs/ingenuity/MessagesWindow.h
@@ -23,7 +23,7 @@
 using std::string;
 
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 
 /** Messages Window.
@@ -31,7 +31,7 @@ namespace OmGtk {
  * Loaded by libglade as a derived object.
  * This is shown when errors occur (ie during patch loading).
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class MessagesWindow : public Gtk::Window
 {
@@ -50,6 +50,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // MESSAGESWINDOW_H
diff --git a/src/progs/ingenuity/NewSubpatchWindow.cpp b/src/progs/ingenuity/NewSubpatchWindow.cpp
index 087a4052..3f1e19fd 100644
--- a/src/progs/ingenuity/NewSubpatchWindow.cpp
+++ b/src/progs/ingenuity/NewSubpatchWindow.cpp
@@ -20,7 +20,7 @@
 #include "Controller.h"
 #include "PatchModel.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 NewSubpatchWindow::NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
@@ -108,4 +108,4 @@ NewSubpatchWindow::cancel_clicked()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/NewSubpatchWindow.h b/src/progs/ingenuity/NewSubpatchWindow.h
index c3276be1..de6c4150 100644
--- a/src/progs/ingenuity/NewSubpatchWindow.h
+++ b/src/progs/ingenuity/NewSubpatchWindow.h
@@ -23,7 +23,7 @@
 #include <gtkmm.h>
 
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class PatchController;
 
@@ -32,7 +32,7 @@ class PatchController;
  *
  * Loaded by glade as a derived object.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class NewSubpatchWindow : public Gtk::Window
 {
@@ -62,6 +62,6 @@ private:
 };
  
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // NEWSUBPATCHWINDOW_H
diff --git a/src/progs/ingenuity/NodeControlWindow.cpp b/src/progs/ingenuity/NodeControlWindow.cpp
index 2849ca65..21afd234 100644
--- a/src/progs/ingenuity/NodeControlWindow.cpp
+++ b/src/progs/ingenuity/NodeControlWindow.cpp
@@ -23,7 +23,7 @@
 #include <cmath>
 using std::cerr; using std::cout; using std::endl;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 /** Create a node control window and load a new ControlPanel for it.
@@ -124,4 +124,4 @@ NodeControlWindow::on_hide()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/NodeControlWindow.h b/src/progs/ingenuity/NodeControlWindow.h
index b7073a67..dbc1aa49 100644
--- a/src/progs/ingenuity/NodeControlWindow.h
+++ b/src/progs/ingenuity/NodeControlWindow.h
@@ -26,9 +26,9 @@
 #include "ControlPanel.h"
 using std::string; using std::vector;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class ControlGroup;
 class NodeController;
@@ -36,7 +36,7 @@ class NodeController;
 
 /** Window with controls (sliders) for all control-rate ports on a Node.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class NodeControlWindow : public Gtk::Window
 {
@@ -64,6 +64,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // NODECONTROLWINDOW_H
diff --git a/src/progs/ingenuity/NodeController.cpp b/src/progs/ingenuity/NodeController.cpp
index 0ed2aaab..bd98346b 100644
--- a/src/progs/ingenuity/NodeController.cpp
+++ b/src/progs/ingenuity/NodeController.cpp
@@ -35,7 +35,7 @@
 #include "Store.h"
 using std::cerr; using std::endl;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 NodeController::NodeController(CountedPtr<NodeModel> model)
@@ -389,5 +389,5 @@ NodeController::disable_controls_menuitem()
 
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
diff --git a/src/progs/ingenuity/NodeController.h b/src/progs/ingenuity/NodeController.h
index 4aa3ba8d..ca00087c 100644
--- a/src/progs/ingenuity/NodeController.h
+++ b/src/progs/ingenuity/NodeController.h
@@ -24,17 +24,16 @@
 #include "NodeModel.h"
 
 using std::string;
-using Om::Path;
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
 template <class T> class CountedPtr;
 
-namespace LibOmClient {
+namespace Ingen { namespace Client {
 	class MetadataModel;
 	class PortModel;
-}
+} }
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class Controller;
 class OmModule;
@@ -45,7 +44,7 @@ class OmFlowCanvas;
 
 /** Controller for a Node.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class NodeController : public GtkObjectController
 {
@@ -109,6 +108,6 @@ protected:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // NODECONTROLLER_H
diff --git a/src/progs/ingenuity/NodePropertiesWindow.cpp b/src/progs/ingenuity/NodePropertiesWindow.cpp
index 3d8f206f..2ee79527 100644
--- a/src/progs/ingenuity/NodePropertiesWindow.cpp
+++ b/src/progs/ingenuity/NodePropertiesWindow.cpp
@@ -20,7 +20,7 @@
 #include "NodeModel.h"
 #include "PluginModel.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 using std::string;
 
 
@@ -61,5 +61,5 @@ NodePropertiesWindow::set_node(CountedPtr<NodeModel> node_model)
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
diff --git a/src/progs/ingenuity/NodePropertiesWindow.h b/src/progs/ingenuity/NodePropertiesWindow.h
index 6fb687d0..2c36dc5c 100644
--- a/src/progs/ingenuity/NodePropertiesWindow.h
+++ b/src/progs/ingenuity/NodePropertiesWindow.h
@@ -21,17 +21,17 @@
 #include <libglademm.h>
 #include "util/CountedPtr.h"
 
-namespace LibOmClient { class NodeModel; }
-using namespace LibOmClient;
+namespace Ingen { namespace Client { class NodeModel; } }
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 /** 'New Patch' Window.
  *
  * Loaded by libglade as a derived object.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class NodePropertiesWindow : public Gtk::Window
 {
@@ -50,6 +50,6 @@ private:
 	Gtk::Label*           m_plugin_name_label;
 };
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // NODEPROPERTIESWINDOW_H
diff --git a/src/progs/ingenuity/OmFlowCanvas.cpp b/src/progs/ingenuity/OmFlowCanvas.cpp
index 9db3fc79..94dc9b17 100644
--- a/src/progs/ingenuity/OmFlowCanvas.cpp
+++ b/src/progs/ingenuity/OmFlowCanvas.cpp
@@ -29,7 +29,7 @@
 #include "OmModule.h"
 #include "GladeFactory.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 OmFlowCanvas::OmFlowCanvas(PatchController* controller, int width, int height)
@@ -279,4 +279,4 @@ OmFlowCanvas::menu_new_patch()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/OmFlowCanvas.h b/src/progs/ingenuity/OmFlowCanvas.h
index 5c740b72..656cc2c2 100644
--- a/src/progs/ingenuity/OmFlowCanvas.h
+++ b/src/progs/ingenuity/OmFlowCanvas.h
@@ -26,14 +26,14 @@ using namespace LibFlowCanvas;
 
 using LibFlowCanvas::Port;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class OmModule;
 class PatchController;
 
 /** Patch canvas widget.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class OmFlowCanvas : public LibFlowCanvas::FlowCanvas
 {
@@ -82,6 +82,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // OMPATCHBAYAREA_H
diff --git a/src/progs/ingenuity/OmModule.cpp b/src/progs/ingenuity/OmModule.cpp
index 5b9b586b..2de109ea 100644
--- a/src/progs/ingenuity/OmModule.cpp
+++ b/src/progs/ingenuity/OmModule.cpp
@@ -26,7 +26,7 @@
 #include "PatchController.h"
 #include "PatchWindow.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 OmModule::OmModule(OmFlowCanvas* canvas, NodeController* node)
@@ -82,4 +82,4 @@ OmModule::move_to(double x, double y)
 	//store_location();
 }
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/OmModule.h b/src/progs/ingenuity/OmModule.h
index 6533edb6..fcf94191 100644
--- a/src/progs/ingenuity/OmModule.h
+++ b/src/progs/ingenuity/OmModule.h
@@ -24,14 +24,14 @@
 #include "NodeController.h"
 using std::string;
 
-namespace LibOmClient {
-class PortModel;
-class NodeModel;
-class ControlModel;
-}
-using namespace LibOmClient;
+namespace Ingen { namespace Client {
+	class PortModel;
+	class NodeModel;
+	class ControlModel;
+} }
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class PatchController;
 class OmFlowCanvas;
@@ -43,7 +43,7 @@ class OmPort;
  * This base class is extended for various types of modules - SubpatchModule,
  * DSSIModule, etc.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class OmModule : public LibFlowCanvas::Module
 {
@@ -72,6 +72,6 @@ protected:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // OMMODULE_H
diff --git a/src/progs/ingenuity/OmPatchPort.cpp b/src/progs/ingenuity/OmPatchPort.cpp
index 03544f8a..b900a40c 100644
--- a/src/progs/ingenuity/OmPatchPort.cpp
+++ b/src/progs/ingenuity/OmPatchPort.cpp
@@ -24,9 +24,9 @@
 #include "App.h"
 using std::cerr; using std::endl;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 OmPatchPort::OmPatchPort(OmPortModule* module, CountedPtr<PortModel> pm)
 : Port(module, pm->name(), !pm->is_input(), App::instance().configuration()->get_port_color(pm.get())),
@@ -54,4 +54,4 @@ OmPatchPort::set_name(const string& n)
 }
 #endif
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/OmPatchPort.h b/src/progs/ingenuity/OmPatchPort.h
index 3fdbd2a0..112fc160 100644
--- a/src/progs/ingenuity/OmPatchPort.h
+++ b/src/progs/ingenuity/OmPatchPort.h
@@ -22,12 +22,12 @@
 #include <flowcanvas/Port.h>
 #include "util/CountedPtr.h"
 
-namespace LibOmClient { class PortModel; }
-using namespace LibOmClient;
+namespace Ingen { namespace Client { class PortModel; } }
+using namespace Ingen::Client;
 using namespace LibFlowCanvas;
 using std::string; using std::list;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class FlowCanvas;
 class PatchController;
@@ -37,7 +37,7 @@ class OmPortModule;
 
 /** A Port (on a pseudo node) in a patch canvas, to represent a port on that patch.
  * 
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class OmPatchPort : public LibFlowCanvas::Port
 {
@@ -55,6 +55,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // OMPATCHPORT_H
diff --git a/src/progs/ingenuity/OmPort.cpp b/src/progs/ingenuity/OmPort.cpp
index bbc677d4..12607f24 100644
--- a/src/progs/ingenuity/OmPort.cpp
+++ b/src/progs/ingenuity/OmPort.cpp
@@ -24,9 +24,9 @@
 #include "App.h"
 using std::cerr; using std::endl;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 OmPort::OmPort(OmModule* module, CountedPtr<PortModel> pm)
 : Port(module, pm->name(), pm->is_input(), App::instance().configuration()->get_port_color(pm.get())),
@@ -54,4 +54,4 @@ OmPort::set_name(const string& n)
 }
 #endif
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/OmPort.h b/src/progs/ingenuity/OmPort.h
index 00632aad..d5021d79 100644
--- a/src/progs/ingenuity/OmPort.h
+++ b/src/progs/ingenuity/OmPort.h
@@ -22,12 +22,12 @@
 #include <flowcanvas/Port.h>
 #include "util/CountedPtr.h"
 
-namespace LibOmClient { class PortModel; }
-using namespace LibOmClient;
+namespace Ingen { namespace Client { class PortModel; } }
+using namespace Ingen::Client;
 using namespace LibFlowCanvas;
 using std::string; using std::list;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class FlowCanvas;
 class PatchController;
@@ -37,7 +37,7 @@ class OmModule;
 
 /** A Port on an OmModule.
  * 
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class OmPort : public LibFlowCanvas::Port
 {
@@ -55,6 +55,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // OMPORT_H
diff --git a/src/progs/ingenuity/OmPortModule.cpp b/src/progs/ingenuity/OmPortModule.cpp
index 757441cd..c1a54378 100644
--- a/src/progs/ingenuity/OmPortModule.cpp
+++ b/src/progs/ingenuity/OmPortModule.cpp
@@ -26,7 +26,7 @@
 #include "PatchController.h"
 #include "PatchWindow.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 OmPortModule::OmPortModule(OmFlowCanvas* canvas, PortController* port, double x, double y)
@@ -68,4 +68,4 @@ OmPortModule::move_to(double x, double y)
 	//store_location();
 }
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/OmPortModule.h b/src/progs/ingenuity/OmPortModule.h
index 82c37b96..19c72609 100644
--- a/src/progs/ingenuity/OmPortModule.h
+++ b/src/progs/ingenuity/OmPortModule.h
@@ -24,14 +24,14 @@
 #include "PortController.h"
 using std::string;
 
-namespace LibOmClient {
-class PortModel;
-class NodeModel;
-class ControlModel;
-}
-using namespace LibOmClient;
+namespace Ingen { namespace Client {
+	class PortModel;
+	class NodeModel;
+	class ControlModel;
+} }
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class PatchController;
 class PortController;
@@ -44,7 +44,7 @@ class OmPort;
  * This base class is extended for various types of modules - SubpatchModule,
  * DSSIModule, etc.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class OmPortModule : public LibFlowCanvas::Module
 {
@@ -71,6 +71,6 @@ protected:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // OMPORTMODULE_H
diff --git a/src/progs/ingenuity/PatchController.cpp b/src/progs/ingenuity/PatchController.cpp
index e4a58bcc..79084cdc 100644
--- a/src/progs/ingenuity/PatchController.cpp
+++ b/src/progs/ingenuity/PatchController.cpp
@@ -47,10 +47,9 @@
 #include "Store.h"
 
 using std::cerr; using std::cout; using std::endl;
-using Om::Path;
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 PatchController::PatchController(CountedPtr<PatchModel> model)
@@ -744,4 +743,4 @@ PatchController::disable_controls_menuitem()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/PatchController.h b/src/progs/ingenuity/PatchController.h
index b81e7cc7..54c11888 100644
--- a/src/progs/ingenuity/PatchController.h
+++ b/src/progs/ingenuity/PatchController.h
@@ -23,18 +23,18 @@
 #include "PatchModel.h"
 template <class T> class CountedPtr;
 
-namespace LibOmClient {
-class PatchModel;
-class NodeModel;
-class PortModel;
-class ControlModel;
-class ConnectionModel;
-}
+namespace Ingen { namespace Client {
+	class PatchModel;
+	class NodeModel;
+	class PortModel;
+	class ControlModel;
+	class ConnectionModel;
+} }
 
 using std::string;
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class PatchWindow;
 class SubpatchModule;
@@ -55,7 +55,7 @@ class NodeController;
  * those representations, and acts as the recipient of all patch related
  * events (being the controller).
  * 
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class PatchController : public NodeController
 {
@@ -132,6 +132,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // PATCHCONTROLLER_H
diff --git a/src/progs/ingenuity/PatchPropertiesWindow.cpp b/src/progs/ingenuity/PatchPropertiesWindow.cpp
index 6595494e..ec440c15 100644
--- a/src/progs/ingenuity/PatchPropertiesWindow.cpp
+++ b/src/progs/ingenuity/PatchPropertiesWindow.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include "PatchModel.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 using std::string;
 
 
@@ -70,4 +70,4 @@ PatchPropertiesWindow::ok_clicked()
 
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/PatchPropertiesWindow.h b/src/progs/ingenuity/PatchPropertiesWindow.h
index 03328ca4..76f12061 100644
--- a/src/progs/ingenuity/PatchPropertiesWindow.h
+++ b/src/progs/ingenuity/PatchPropertiesWindow.h
@@ -23,17 +23,17 @@
 #include "util/CountedPtr.h"
 using std::string;
 
-namespace LibOmClient { class PatchModel; }
-using LibOmClient::PatchModel;
+namespace Ingen { namespace Client { class PatchModel; } }
+using Ingen::Client::PatchModel;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 
 /** Patch Properties Window.
  *
  * Loaded by libglade as a derived object.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class PatchPropertiesWindow : public Gtk::Window
 {
@@ -55,6 +55,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // PATCHPROPERTIESWINDOW_H
diff --git a/src/progs/ingenuity/PatchTreeWindow.cpp b/src/progs/ingenuity/PatchTreeWindow.cpp
index c80af86e..0c5fdcf0 100644
--- a/src/progs/ingenuity/PatchTreeWindow.cpp
+++ b/src/progs/ingenuity/PatchTreeWindow.cpp
@@ -22,9 +22,7 @@
 #include "PatchModel.h"
 #include "util/Path.h"
 
-using Om::Path;
-
-namespace OmGtk {
+namespace Ingenuity {
 	
 
 PatchTreeWindow::PatchTreeWindow(BaseObjectType* cobject,
@@ -249,4 +247,4 @@ PatchTreeWindow::patch_renamed(const Path& old_path, const Path& new_path)
 }
 
 	
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/PatchTreeWindow.h b/src/progs/ingenuity/PatchTreeWindow.h
index 5fada904..cdc7586a 100644
--- a/src/progs/ingenuity/PatchTreeWindow.h
+++ b/src/progs/ingenuity/PatchTreeWindow.h
@@ -21,11 +21,7 @@
 #include <libglademm.h>
 #include "util/Path.h"
 
-
-using namespace Om;
-using Om::Path;
-
-namespace OmGtk {
+namespace Ingenuity {
 
 class PatchWindow;
 class PatchController;
@@ -34,7 +30,7 @@ class PatchTreeView;
 
 /** Window with a TreeView of all loaded patches.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class PatchTreeWindow : public Gtk::Window
 {
@@ -100,6 +96,6 @@ private:
 }; // struct PatchTreeView
 
 	
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // PATCHTREEWINDOW_H
diff --git a/src/progs/ingenuity/PatchView.cpp b/src/progs/ingenuity/PatchView.cpp
index 062223fa..41e74b1c 100644
--- a/src/progs/ingenuity/PatchView.cpp
+++ b/src/progs/ingenuity/PatchView.cpp
@@ -30,7 +30,7 @@
 #include "PatchTreeWindow.h"
 #include "Controller.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
@@ -128,4 +128,4 @@ PatchView::disable()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/PatchView.h b/src/progs/ingenuity/PatchView.h
index ac1472ce..9772154b 100644
--- a/src/progs/ingenuity/PatchView.h
+++ b/src/progs/ingenuity/PatchView.h
@@ -24,17 +24,17 @@
 
 using std::string;
 
-namespace LibOmClient {
-class PatchModel;
-class NodeModel;
-class PortModel;
-class ControlModel;
-class MetadataModel;
-}
-using namespace LibOmClient;
+namespace Ingen { namespace Client {
+	class PatchModel;
+	class NodeModel;
+	class PortModel;
+	class ControlModel;
+	class MetadataModel;
+} }
+using namespace Ingen::Client;
 
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class PatchController;
 class OmFlowCanvas;
@@ -50,7 +50,7 @@ class OmPort;
 
 /** The patch specific contents of a PatchWindow (ie the canvas and whatever else).
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class PatchView : public Gtk::Box
 {
@@ -82,6 +82,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // PATCHVIEW_H
diff --git a/src/progs/ingenuity/PatchWindow.cpp b/src/progs/ingenuity/PatchWindow.cpp
index 3b6207f7..ba1ed9e7 100644
--- a/src/progs/ingenuity/PatchWindow.cpp
+++ b/src/progs/ingenuity/PatchWindow.cpp
@@ -37,7 +37,7 @@
 #include "Store.h"
 #include "ConnectWindow.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
@@ -509,7 +509,7 @@ PatchWindow::event_close()
 		hide();
 	} else {
 		Gtk::MessageDialog d(*this, "This is the last remaining open patch "
-			"window.  Closing this window will exit OmGtk (the engine will "
+			"window.  Closing this window will exit Ingenuity (the engine will "
 			"remain running).\n\nAre you sure you want to quit?",
 			true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_NONE, true);
 			d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@@ -526,7 +526,7 @@ PatchWindow::event_close()
 void
 PatchWindow::event_quit()
 {
-	Gtk::MessageDialog d(*this, "Would you like to quit just OmGtk\nor kill the engine as well?",
+	Gtk::MessageDialog d(*this, "Would you like to quit just Ingenuity\nor kill the engine as well?",
 			true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
 	d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
 	
@@ -580,4 +580,4 @@ PatchWindow::event_fullscreen_toggled()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/PatchWindow.h b/src/progs/ingenuity/PatchWindow.h
index fcbc040d..291ea56b 100644
--- a/src/progs/ingenuity/PatchWindow.h
+++ b/src/progs/ingenuity/PatchWindow.h
@@ -25,17 +25,17 @@
 
 using std::string; using std::list;
 
-namespace LibOmClient {
-class PatchModel;
-class NodeModel;
-class PortModel;
-class ControlModel;
-class MetadataModel;
-}
-using namespace LibOmClient;
+namespace Ingen { namespace Client {
+	class PatchModel;
+	class NodeModel;
+	class PortModel;
+	class ControlModel;
+	class MetadataModel;
+} }
+using namespace Ingen::Client;
 
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class PatchController;
 class OmFlowCanvas;
@@ -54,7 +54,7 @@ class BreadCrumb;
 
 /** A window for a patch.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class PatchWindow : public Gtk::Window
 {
@@ -137,6 +137,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // PATCHWINDOW_H
diff --git a/src/progs/ingenuity/PortController.cpp b/src/progs/ingenuity/PortController.cpp
index 6fb13543..335e673c 100644
--- a/src/progs/ingenuity/PortController.cpp
+++ b/src/progs/ingenuity/PortController.cpp
@@ -22,7 +22,7 @@
 #include "OmPatchPort.h"
 #include "Store.h"
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 PortController::PortController(CountedPtr<PortModel> model)
@@ -149,5 +149,5 @@ PortController::create_port(OmModule* module)
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
diff --git a/src/progs/ingenuity/PortController.h b/src/progs/ingenuity/PortController.h
index ba8120a1..c4ff83db 100644
--- a/src/progs/ingenuity/PortController.h
+++ b/src/progs/ingenuity/PortController.h
@@ -23,14 +23,14 @@
 #include "OmPortModule.h"
 
 using std::string;
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
-namespace LibOmClient {
+namespace Ingen { namespace Client {
 	class MetadataModel;
 	class PortModel;
-}
+} }
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class Controller;
 class OmPort;
@@ -43,7 +43,7 @@ class OmFlowCanvas;
 
 /** Controller for a port on a (non-patch) node.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class PortController : public GtkObjectController
 {
@@ -77,6 +77,6 @@ private:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // PORTCONTROLLER_H
diff --git a/src/progs/ingenuity/RenameWindow.cpp b/src/progs/ingenuity/RenameWindow.cpp
index dcfc3ead..5521f951 100644
--- a/src/progs/ingenuity/RenameWindow.cpp
+++ b/src/progs/ingenuity/RenameWindow.cpp
@@ -23,7 +23,7 @@
 #include "Store.h"
 using std::string;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml)
@@ -110,4 +110,4 @@ RenameWindow::ok_clicked()
 }
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/RenameWindow.h b/src/progs/ingenuity/RenameWindow.h
index 2ea3aa34..af826f15 100644
--- a/src/progs/ingenuity/RenameWindow.h
+++ b/src/progs/ingenuity/RenameWindow.h
@@ -21,7 +21,7 @@
 #include <libglademm.h>
 
 
-namespace OmGtk {
+namespace Ingenuity {
 
 class GtkObjectController;
 
@@ -30,7 +30,7 @@ class GtkObjectController;
  *
  * Loaded by libglade as a derived object.
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class RenameWindow : public Gtk::Window
 {
@@ -52,6 +52,6 @@ private:
 	Gtk::Button*     m_ok_button;
 };
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // RENAMEWINDOW_H
diff --git a/src/progs/ingenuity/SubpatchModule.cpp b/src/progs/ingenuity/SubpatchModule.cpp
index 9ad0ec5a..3133c7c9 100644
--- a/src/progs/ingenuity/SubpatchModule.cpp
+++ b/src/progs/ingenuity/SubpatchModule.cpp
@@ -27,7 +27,7 @@
 #include "Controller.h"
 using std::cerr; using std::cout; using std::endl;
 
-namespace OmGtk {
+namespace Ingenuity {
 
 
 SubpatchModule::SubpatchModule(OmFlowCanvas* canvas, PatchController* patch)
@@ -99,4 +99,4 @@ SubpatchModule::menu_remove()
 	Controller::instance().destroy(m_patch->model()->path());
 }
 
-} // namespace OmGtk
+} // namespace Ingenuity
diff --git a/src/progs/ingenuity/SubpatchModule.h b/src/progs/ingenuity/SubpatchModule.h
index 0e27896a..13d3d2f7 100644
--- a/src/progs/ingenuity/SubpatchModule.h
+++ b/src/progs/ingenuity/SubpatchModule.h
@@ -24,15 +24,15 @@
 #include "PatchController.h"
 using std::string; using std::list;
 
-namespace LibOmClient {
-class PatchModel;
-class NodeModel;
-class PortModel;
-class PatchWindow;
-}
-using namespace LibOmClient;
+namespace Ingen { namespace Client {
+	class PatchModel;
+	class NodeModel;
+	class PortModel;
+	class PatchWindow;
+} }
+using namespace Ingen::Client;
 
-namespace OmGtk {
+namespace Ingenuity {
 	
 class OmFlowCanvas;
 class NodeControlWindow;
@@ -41,7 +41,7 @@ class PatchController;
 
 /** A module to represent a subpatch
  *
- * \ingroup OmGtk
+ * \ingroup Ingenuity
  */
 class SubpatchModule : public OmModule
 {
@@ -64,6 +64,6 @@ protected:
 };
 
 
-} // namespace OmGtk
+} // namespace Ingenuity
 
 #endif // SUBPATCHMODULE_H
diff --git a/src/progs/ingenuity/main.cpp b/src/progs/ingenuity/main.cpp
index 1662a7ce..8419f009 100644
--- a/src/progs/ingenuity/main.cpp
+++ b/src/progs/ingenuity/main.cpp
@@ -26,15 +26,15 @@
 #endif
 #include "ThreadedSigClientInterface.h"
 #include "OSCListener.h"
-using Om::Shared::ClientInterface;
+using Ingen::Shared::ClientInterface;
 
-using namespace OmGtk;
+using namespace Ingenuity;
 
 
 class OSCSigEmitter : public OSCListener, public ThreadedSigClientInterface {
 public:
 	OSCSigEmitter(size_t queue_size, int listen_port)
-	: Om::Shared::ClientInterface()
+	: Ingen::Shared::ClientInterface()
 	, OSCListener(listen_port)
 	, ThreadedSigClientInterface(queue_size)
 	{
diff --git a/src/progs/patch_loader/new_patch_loader.cpp b/src/progs/patch_loader/new_patch_loader.cpp
index 42c87267..5a561f5d 100644
--- a/src/progs/patch_loader/new_patch_loader.cpp
+++ b/src/progs/patch_loader/new_patch_loader.cpp
@@ -22,9 +22,8 @@
 #include "PatchLibrarian.h"
 
 using std::cout; using std::cerr; using std::endl; 
-using Om::Path;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
 
 int
diff --git a/src/progs/patch_loader/patch_loader.cpp b/src/progs/patch_loader/patch_loader.cpp
index f2ba3b05..1161e92e 100644
--- a/src/progs/patch_loader/patch_loader.cpp
+++ b/src/progs/patch_loader/patch_loader.cpp
@@ -24,9 +24,8 @@
 #include "cmdline.h"  // generated by gengetopt
 
 using std::cout; using std::endl; 
-using Om::Path;
 
-using namespace LibOmClient;
+using namespace Ingen::Client;
 
 int main(int argc, char** argv)
 {
diff --git a/src/progs/server/main.cpp b/src/progs/server/main.cpp
index 2429462a..1ee02bc6 100644
--- a/src/progs/server/main.cpp
+++ b/src/progs/server/main.cpp
@@ -38,8 +38,8 @@ catch_int(int)
 	signal(SIGINT, catch_int);
 	signal(SIGTERM, catch_int);
 
-	std::cout << "[Main] Om interrupted." << std::endl;
-	Om::Ingen::instance().quit();
+	std::cout << "[Main] Ingen interrupted." << std::endl;
+	Ingen::Ingen::instance().quit();
 }
 
 
@@ -78,7 +78,7 @@ load_in_process_engine(const char* port)
 	if ((jack_client = jack_client_open("om_load", JackNoStartServer,
 	                                    &status)) != NULL) {
 		jack_intclient =
-		    jack_internal_client_load(jack_client, "Om",
+		    jack_internal_client_load(jack_client, "Ingen",
 		                               (jack_options_t)(JackLoadName|JackLoadInit),
 		                               &status, "om", port);
 		if (status == 0) {
@@ -125,27 +125,27 @@ main(int argc, char** argv)
 #else
 		cerr << "In-process Jack client support not enabled in this build." << endl;
 		ret = EXIT_FAILURE;
-#endif // JACK_IN_PROCESS_ENGINE
+#endif
 	} else {
 		signal(SIGINT, catch_int);
 		signal(SIGTERM, catch_int);
 
-		Om::set_denormal_flags();
+		Ingen::set_denormal_flags();
 
-		Om::Ingen::instantiate(args_info.port_arg);
+		Ingen::Ingen::instantiate(args_info.port_arg);
 
 #ifdef HAVE_LASH
-		Om::lash_driver = new Om::LashDriver(Om::om, lash_args);
+		Ingen::lash_driver = new Ingen::LashDriver(Ingen::om, lash_args);
 #endif
 
-		Om::Ingen::instance().main();
+		Ingen::Ingen::instance().main();
 
 #ifdef HAVE_LASH
-		delete Om::lash_driver;
+		delete Ingen::lash_driver;
 #endif
 
 		// FIXME: leak
-		//delete Om::om;
+		//delete Ingen::om;
 	}
 	
 	return ret;