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

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

31 files changed, 167 insertions, 105 deletions

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