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

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

76 files changed, 302 insertions, 316 deletions

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;