diff --git a/src/instr_bd2.cc b/src/instr_bd2.cc
index 27a8722..b91bf63 100644
--- a/src/instr_bd2.cc
+++ b/src/instr_bd2.cc
@@ -2,7 +2,7 @@
 #include "daisysp.h"
 #include "utils.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         BD2::BD2()
diff --git a/src/instr_bd2.hh b/src/instr_bd2.hh
index 995033b..c49745b 100644
--- a/src/instr_bd2.hh
+++ b/src/instr_bd2.hh
@@ -3,7 +3,7 @@
 
 #include "instr_interface.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         class BD2 : public AbstractInstrument {
diff --git a/src/instr_fm.cc b/src/instr_fm.cc
index 25ff343..45f1618 100644
--- a/src/instr_fm.cc
+++ b/src/instr_fm.cc
@@ -2,7 +2,7 @@
 #include "daisysp.h"
 #include "utils.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         FM::FM()
diff --git a/src/instr_fm.hh b/src/instr_fm.hh
index a7829f4..2e3c39e 100644
--- a/src/instr_fm.hh
+++ b/src/instr_fm.hh
@@ -3,7 +3,7 @@
 
 #include "instr_interface.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         class FM : public AbstractInstrument {
diff --git a/src/instr_grainlet.cc b/src/instr_grainlet.cc
index eb9d60b..1389af6 100644
--- a/src/instr_grainlet.cc
+++ b/src/instr_grainlet.cc
@@ -2,7 +2,7 @@
 #include "daisysp.h"
 #include "utils.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         Grainlet::Grainlet()
diff --git a/src/instr_grainlet.hh b/src/instr_grainlet.hh
index a9cc525..c7b19c7 100644
--- a/src/instr_grainlet.hh
+++ b/src/instr_grainlet.hh
@@ -3,7 +3,7 @@
 
 #include "instr_interface.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         class Grainlet : public AbstractInstrument {
diff --git a/src/instr_hihat.cc b/src/instr_hihat.cc
index 556aaf8..c26a8e3 100644
--- a/src/instr_hihat.cc
+++ b/src/instr_hihat.cc
@@ -2,7 +2,7 @@
 #include "daisysp.h"
 #include "utils.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         HiHat::HiHat()
diff --git a/src/instr_hihat.hh b/src/instr_hihat.hh
index 472e876..125f245 100644
--- a/src/instr_hihat.hh
+++ b/src/instr_hihat.hh
@@ -3,7 +3,7 @@
 
 #include "instr_interface.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         class HiHat : public AbstractInstrument {
diff --git a/src/instr_interface.hh b/src/instr_interface.hh
index 5009499..fb844f4 100644
--- a/src/instr_interface.hh
+++ b/src/instr_interface.hh
@@ -3,7 +3,7 @@
 
 #include "main_osp.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
         class AbstractInstrument {
         public:
diff --git a/src/instr_kick.cc b/src/instr_kick.cc
index dc4ca12..a914098 100644
--- a/src/instr_kick.cc
+++ b/src/instr_kick.cc
@@ -2,7 +2,7 @@
 #include "daisysp.h"
 #include "utils.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         Kick::Kick()
diff --git a/src/instr_kick.hh b/src/instr_kick.hh
index ece8365..df76429 100644
--- a/src/instr_kick.hh
+++ b/src/instr_kick.hh
@@ -3,7 +3,7 @@
 
 #include "instr_interface.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         class Kick : public AbstractInstrument {
diff --git a/src/instr_noise.cc b/src/instr_noise.cc
index f7bbc19..3fcd01e 100644
--- a/src/instr_noise.cc
+++ b/src/instr_noise.cc
@@ -1,7 +1,7 @@
 #include "instr_noise.hh"
 #include "daisysp.h"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         Noise::Noise() {
diff --git a/src/instr_noise.hh b/src/instr_noise.hh
index 6606c41..d7d8037 100644
--- a/src/instr_noise.hh
+++ b/src/instr_noise.hh
@@ -3,7 +3,7 @@
 
 #include "instr_interface.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         class Noise : public AbstractInstrument {
diff --git a/src/instr_zosc.cc b/src/instr_zosc.cc
index 21f926b..5e222ec 100644
--- a/src/instr_zosc.cc
+++ b/src/instr_zosc.cc
@@ -2,7 +2,7 @@
 #include "daisysp.h"
 #include "utils.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         ZOsc::ZOsc()
diff --git a/src/instr_zosc.hh b/src/instr_zosc.hh
index e1d7b70..e903749 100644
--- a/src/instr_zosc.hh
+++ b/src/instr_zosc.hh
@@ -3,7 +3,7 @@
 
 #include "instr_interface.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Instrument {
 
         class ZOsc : public AbstractInstrument {
diff --git a/src/main_osp.hh b/src/main_osp.hh
index 54b543c..3213b60 100644
--- a/src/main_osp.hh
+++ b/src/main_osp.hh
@@ -6,7 +6,7 @@
 #include "daisysp.h"
 #include "types.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     namespace Constants {
         namespace Hardware {
             constexpr int PIN_BUTTON_RECORD = 27;
diff --git a/src/midiclock.cc b/src/midiclock.cc
index 9d88571..b302621 100644
--- a/src/midiclock.cc
+++ b/src/midiclock.cc
@@ -1,7 +1,7 @@
 #include "midiclock.hh"
 #include <cmath>
 
-namespace Heck {
+namespace Heck::OSP {
     void MidiClock::tick_advance()
     {
         if (enabled) {
diff --git a/src/midiclock.hh b/src/midiclock.hh
index 7a926ba..3007b4c 100644
--- a/src/midiclock.hh
+++ b/src/midiclock.hh
@@ -1,7 +1,7 @@
 #ifndef HECK_OSP_MIDICLOCK_HH
 #define HECK_OSP_MIDICLOCK_HH
 
-namespace Heck {
+namespace Heck::OSP {
     struct MidiClock {
     public:
         void tick_advance();
diff --git a/src/sequencer.cc b/src/sequencer.cc
index f614e05..df988e6 100644
--- a/src/sequencer.cc
+++ b/src/sequencer.cc
@@ -1,6 +1,6 @@
 #include "sequencer.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     Sequencer::Sequencer()
     {
         clear_sequence();
diff --git a/src/sequencer.hh b/src/sequencer.hh
index 20f6032..ea911b2 100644
--- a/src/sequencer.hh
+++ b/src/sequencer.hh
@@ -6,7 +6,7 @@
 
 namespace ld = daisy;
 
-namespace Heck {
+namespace Heck::OSP {
     struct Sequencer {
         // its a MIDI CC step sequencer
         constexpr static int MIDI_MAX = 127;
diff --git a/src/track.hh b/src/track.hh
index 445a96a..b644c00 100644
--- a/src/track.hh
+++ b/src/track.hh
@@ -6,7 +6,7 @@
 #include "utils.hh"
 #include "main_osp.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     struct Track {
     public:
         void init(Instrument::AbstractInstrument& instr)
diff --git a/src/types.hh b/src/types.hh
index e2974db..44eb2f4 100644
--- a/src/types.hh
+++ b/src/types.hh
@@ -5,7 +5,7 @@
 #include "daisy_seed.h"
 #include "daisysp.h"
 
-namespace Heck {
+namespace Heck::OSP {
 
     // fundamental types
     using u8 = uint8_t;
diff --git a/src/utils.cc b/src/utils.cc
index 6411f63..20be2e7 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -1,6 +1,6 @@
 #include "utils.hh"
 
-namespace Heck {
+namespace Heck::OSP {
 
     void GetMidiTypeAsString(const ld::MidiEvent& msg, char* str)
     {
@@ -93,7 +93,7 @@ namespace Heck {
     }
 } // namespace Heck
 
-namespace Heck {
+namespace Heck::OSP {
     void SWTimer::set_period(u32 time_units)
     {
         time_period_ = time_units;
diff --git a/src/utils.hh b/src/utils.hh
index efa5f99..bdf7eb7 100644
--- a/src/utils.hh
+++ b/src/utils.hh
@@ -1,10 +1,10 @@
-#ifndef HECK_DAISY_UTILS_HH
-#define HECK_DAISY_UTILS_HH
+#ifndef HECK_OSP_UTILS_HH
+#define HECK_OSP_UTILS_HH
 
 #include "daisy_seed.h"
 #include "types.hh"
 
-namespace Heck {
+namespace Heck::OSP {
     void GetMidiTypeAsString(const ld::MidiEvent& msg, char* str);
     void GetMidiRTTypeAsString(const ld::MidiEvent& msg, char* str);
 
@@ -13,7 +13,7 @@ namespace Heck {
 } // namespace Heck
 
 
-namespace Heck {
+namespace Heck::OSP {
     class SWTimer {
     public:
         using Callback = std::function<void(u32 time)>;
@@ -29,7 +29,7 @@ namespace Heck {
     };
 } // namespace Heck
 
-namespace Heck {
+namespace Heck::OSP {
     template<typename T> class Observer {
 
     public: