diff --git a/libraries/yukon/modules.hpp b/libraries/yukon/modules.hpp
index bfa43158..c295b9d0 100644
--- a/libraries/yukon/modules.hpp
+++ b/libraries/yukon/modules.hpp
@@ -13,15 +13,15 @@
 
 namespace pimoroni {
 
-  const ModuleInfo KNOWN_MODULES[] = {
-    LEDStripModule::info(),
-    QuadServoDirectModule::info(),
-    QuadServoRegModule::info(),
-    BigMotorModule::info(),
-    DualMotorModule::info(),
-    DualSwitchedModule::info(),
-    BenchPowerModule::info(),
-    //AudioAmpModule::info(),
-    ProtoPotModule::info(),
+  const ModuleType KNOWN_MODULES[] = {
+    LEDStripModule::type(),
+    QuadServoDirectModule::type(),
+    QuadServoRegModule::type(),
+    BigMotorModule::type(),
+    DualMotorModule::type(),
+    DualSwitchedModule::type(),
+    BenchPowerModule::type(),
+    //AudioAmpModule::type(),
+    ProtoPotModule::type(),
   };
 }
diff --git a/libraries/yukon/modules/audio_amp/audio_amp.cpp b/libraries/yukon/modules/audio_amp/audio_amp.cpp
index 31fd49dc..b6760cd2 100644
--- a/libraries/yukon/modules/audio_amp/audio_amp.cpp
+++ b/libraries/yukon/modules/audio_amp/audio_amp.cpp
@@ -2,6 +2,8 @@
 
 namespace pimoroni {
 
+  static const std::string NAME = "Audio Amp";
+
   // | ADC1  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
   // |-------|-------|-------|-------|----------------------|-----------------------------|
   // | FLOAT | 0     | 1     | 1     | [Proposed] Audio Amp |                             |
diff --git a/libraries/yukon/modules/audio_amp/audio_amp.hpp b/libraries/yukon/modules/audio_amp/audio_amp.hpp
index 8521eaf9..b18d08b3 100644
--- a/libraries/yukon/modules/audio_amp/audio_amp.hpp
+++ b/libraries/yukon/modules/audio_amp/audio_amp.hpp
@@ -5,20 +5,16 @@
 namespace pimoroni {
 
   class AudioAmpModule : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "Audio Amp";
+    virtual std::string name() {
+      return AudioAmpModule::NAME;
     }
 
-    virtual std::string instance_name() {
-      return AudioAmpModule::name();
-    }
-
-    INFO_FUNC(AudioAmpModule)
+    TYPE_FUNCTION(AudioAmpModule)
   };
 
 }
diff --git a/libraries/yukon/modules/bench_power/bench_power.cpp b/libraries/yukon/modules/bench_power/bench_power.cpp
index 2dcb8489..d1fe477a 100644
--- a/libraries/yukon/modules/bench_power/bench_power.cpp
+++ b/libraries/yukon/modules/bench_power/bench_power.cpp
@@ -2,6 +2,8 @@
 
 namespace pimoroni {
 
+  const std::string BenchPowerModule::NAME = "Bench Power";
+
   // | ADC1  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
   // |-------|-------|-------|-------|----------------------|-----------------------------|
   // | LOW   | 1     | 0     | 0     | Bench Power          |                             |
diff --git a/libraries/yukon/modules/bench_power/bench_power.hpp b/libraries/yukon/modules/bench_power/bench_power.hpp
index f826c19c..0204abc6 100644
--- a/libraries/yukon/modules/bench_power/bench_power.hpp
+++ b/libraries/yukon/modules/bench_power/bench_power.hpp
@@ -5,20 +5,16 @@
 namespace pimoroni {
 
   class BenchPowerModule : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "Bench Power";
+    virtual std::string name() {
+      return BenchPowerModule::NAME;
     }
 
-    virtual std::string instance_name() {
-      return BenchPowerModule::name();
-    }
-
-    INFO_FUNC(BenchPowerModule)
+    TYPE_FUNCTION(BenchPowerModule)
   };
 
 }
diff --git a/libraries/yukon/modules/big_motor/big_motor.cpp b/libraries/yukon/modules/big_motor/big_motor.cpp
index f4e24019..ee882627 100644
--- a/libraries/yukon/modules/big_motor/big_motor.cpp
+++ b/libraries/yukon/modules/big_motor/big_motor.cpp
@@ -2,6 +2,8 @@
 
 namespace pimoroni {
 
+  const std::string BigMotorModule::NAME = "Big Motor";
+
   // | ADC1  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
   // |-------|-------|-------|-------|----------------------|-----------------------------|
   // | LOW   | 0     | 0     | 1     | Big Motor            | Not in fault                |
diff --git a/libraries/yukon/modules/big_motor/big_motor.hpp b/libraries/yukon/modules/big_motor/big_motor.hpp
index 3d636d91..2ebe26b8 100644
--- a/libraries/yukon/modules/big_motor/big_motor.hpp
+++ b/libraries/yukon/modules/big_motor/big_motor.hpp
@@ -5,20 +5,16 @@
 namespace pimoroni {
 
   class BigMotorModule : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "Big Motor";
+    virtual std::string name() {
+      return BigMotorModule::NAME;
     }
 
-    virtual std::string instance_name() {
-      return BigMotorModule::name();
-    }
-
-    INFO_FUNC(BigMotorModule)
+    TYPE_FUNCTION(BigMotorModule)
   };
 
 }
diff --git a/libraries/yukon/modules/common.hpp b/libraries/yukon/modules/common.hpp
index 834f1b99..53c981de 100644
--- a/libraries/yukon/modules/common.hpp
+++ b/libraries/yukon/modules/common.hpp
@@ -19,31 +19,25 @@ namespace pimoroni {
   };
 
   class YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static constexpr float ROOM_TEMP = 273.15f + 25.0f;
+    static constexpr float RESISTOR_AT_ROOM_TEMP = 10000.0f;
+    static constexpr float BETA = 3435;
 
-      static constexpr float ROOM_TEMP = 273.15f + 25.0f;
-      static constexpr float RESISTOR_AT_ROOM_TEMP = 10000.0f;
-      static constexpr float BETA = 3435;
-
-    static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3) {
-      return false;
-    }
-
-    virtual std::string instance_name() = 0;
+    virtual std::string name() = 0;
   };
 
-  typedef bool (*module_callback)(uint, bool, bool, bool) ;
+  typedef bool (&func_is_module)(uint, bool, bool, bool);
 
-  struct ModuleInfo {
-    std::type_index type;
-    std::string name;
-    module_callback is_module;
+  struct ModuleType {
+    const std::type_index TYPE;
+    const std::string &NAME;
+    func_is_module is_module;
   };
 
-#define INFO_FUNC(module_name) \
-    static ModuleInfo info() { \
-      return { typeid(module_name), module_name::name(), &module_name::is_module }; \
-      }
+#define TYPE_FUNCTION(module_class) \
+  static ModuleType type() { \
+    return { typeid(module_class), module_class::NAME, module_class::is_module }; \
+  }
 
 }
diff --git a/libraries/yukon/modules/dual_motor/dual_motor.cpp b/libraries/yukon/modules/dual_motor/dual_motor.cpp
index f69a0fc6..6138ebe3 100644
--- a/libraries/yukon/modules/dual_motor/dual_motor.cpp
+++ b/libraries/yukon/modules/dual_motor/dual_motor.cpp
@@ -2,6 +2,8 @@
 
 namespace pimoroni {
 
+  const std::string DualMotorModule::NAME = "Dual Motor";
+
   // | ADC1  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
   // |-------|-------|-------|-------|----------------------|-----------------------------|
   // | HIGH  | 1     | 1     | 1     | Dual Motor           |                             |
diff --git a/libraries/yukon/modules/dual_motor/dual_motor.hpp b/libraries/yukon/modules/dual_motor/dual_motor.hpp
index b2c6c2d2..91cff08a 100644
--- a/libraries/yukon/modules/dual_motor/dual_motor.hpp
+++ b/libraries/yukon/modules/dual_motor/dual_motor.hpp
@@ -5,20 +5,16 @@
 namespace pimoroni {
 
   class DualMotorModule : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "Dual Motor";
+    virtual std::string name() {
+      return DualMotorModule::NAME;
     }
 
-    virtual std::string instance_name() {
-      return DualMotorModule::name();
-    }
-
-    INFO_FUNC(DualMotorModule)
+    TYPE_FUNCTION(DualMotorModule)
   };
 
 }
diff --git a/libraries/yukon/modules/dual_switched/dual_switched.cpp b/libraries/yukon/modules/dual_switched/dual_switched.cpp
index d76266b7..3746c83f 100644
--- a/libraries/yukon/modules/dual_switched/dual_switched.cpp
+++ b/libraries/yukon/modules/dual_switched/dual_switched.cpp
@@ -2,6 +2,8 @@
 
 namespace pimoroni {
 
+  const std::string DualSwitchedModule::NAME = "Dual Switched Output";
+
   // | ADC1  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
   // |-------|-------|-------|-------|----------------------|-----------------------------|
   // | FLOAT | 1     | 0     | 1     | Dual Switched Output |                             |
diff --git a/libraries/yukon/modules/dual_switched/dual_switched.hpp b/libraries/yukon/modules/dual_switched/dual_switched.hpp
index f35292d2..e24d6d68 100644
--- a/libraries/yukon/modules/dual_switched/dual_switched.hpp
+++ b/libraries/yukon/modules/dual_switched/dual_switched.hpp
@@ -5,20 +5,16 @@
 namespace pimoroni {
 
   class DualSwitchedModule : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "Dual Switched Output";
+    virtual std::string name() {
+      return DualSwitchedModule::NAME;
     }
 
-    virtual std::string instance_name() {
-      return DualSwitchedModule::name();
-    }
-
-    INFO_FUNC(DualSwitchedModule)
+    TYPE_FUNCTION(DualSwitchedModule)
   };
 
 }
diff --git a/libraries/yukon/modules/led_strip/led_strip.cpp b/libraries/yukon/modules/led_strip/led_strip.cpp
index 546381e8..fbc91ead 100644
--- a/libraries/yukon/modules/led_strip/led_strip.cpp
+++ b/libraries/yukon/modules/led_strip/led_strip.cpp
@@ -2,6 +2,8 @@
 
 namespace pimoroni {
 
+  const std::string LEDStripModule::NAME = "LED Strip";
+
   // | ADC1  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
   // |-------|-------|-------|-------|----------------------|-----------------------------|
   // | LOW   | 1     | 1     | 1     | LED Strip            |                             |
diff --git a/libraries/yukon/modules/led_strip/led_strip.hpp b/libraries/yukon/modules/led_strip/led_strip.hpp
index e8227775..77aed1d1 100644
--- a/libraries/yukon/modules/led_strip/led_strip.hpp
+++ b/libraries/yukon/modules/led_strip/led_strip.hpp
@@ -5,20 +5,16 @@
 namespace pimoroni {
 
   class LEDStripModule : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "LED Strip";
+    virtual std::string name() {
+      return LEDStripModule::NAME + " (NeoPixel)";
     }
 
-    virtual std::string instance_name() {
-      return LEDStripModule::name() + " (NeoPixel)";
-    }
-
-    INFO_FUNC(LEDStripModule)
+    TYPE_FUNCTION(LEDStripModule)
   };
 
 }
diff --git a/libraries/yukon/modules/proto/proto.cpp b/libraries/yukon/modules/proto/proto.cpp
index 8429ee5d..f3f38171 100644
--- a/libraries/yukon/modules/proto/proto.cpp
+++ b/libraries/yukon/modules/proto/proto.cpp
@@ -2,6 +2,8 @@
 
 namespace pimoroni {
 
+  const std::string ProtoPotModule::NAME = "Proto Potentiometer";
+
   // | ADC1  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
   // |-------|-------|-------|-------|----------------------|-----------------------------|
   // | LOW   | 1     | 1     | 0     | Proto Potentiometer  | Pot in low position         |
@@ -11,6 +13,8 @@ namespace pimoroni {
     return slow1 == HIGH && slow2 == HIGH && slow3 == LOW;
   }
 
+  const std::string ProtoPotModule2::NAME = "Proto Potentiometer 2";
+
   bool ProtoPotModule2::is_module(uint adc_level, bool slow1, bool slow2, bool slow3) {
     return slow1 == HIGH && slow2 == HIGH && slow3 == LOW;
   }
diff --git a/libraries/yukon/modules/proto/proto.hpp b/libraries/yukon/modules/proto/proto.hpp
index f0fdcdea..c3192cc4 100644
--- a/libraries/yukon/modules/proto/proto.hpp
+++ b/libraries/yukon/modules/proto/proto.hpp
@@ -5,37 +5,29 @@
 namespace pimoroni {
 
   class ProtoPotModule : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "Proto Potentiometer";
+    virtual std::string name() {
+      return ProtoPotModule::NAME;
     }
 
-    virtual std::string instance_name() {
-      return ProtoPotModule::name();
-    }
-
-    INFO_FUNC(ProtoPotModule)
+    TYPE_FUNCTION(ProtoPotModule)
   };
 
   class ProtoPotModule2 : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "Proto Potentiometer 2";
+    virtual std::string name() {
+      return ProtoPotModule2::NAME;
     }
 
-    virtual std::string instance_name() {
-      return ProtoPotModule2::name();
-    }
-
-    INFO_FUNC(ProtoPotModule2)
+    TYPE_FUNCTION(ProtoPotModule2)
   };
 
 }
diff --git a/libraries/yukon/modules/quad_servo/quad_servo_direct.cpp b/libraries/yukon/modules/quad_servo/quad_servo_direct.cpp
index 6f26b59a..8beed972 100644
--- a/libraries/yukon/modules/quad_servo/quad_servo_direct.cpp
+++ b/libraries/yukon/modules/quad_servo/quad_servo_direct.cpp
@@ -2,6 +2,8 @@
 
 namespace pimoroni {
 
+  const std::string QuadServoDirectModule::NAME = "Quad Servo Direct";
+
   // | ADC1  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
   // |-------|-------|-------|-------|----------------------|-----------------------------|
   // | LOW   | 0     | 0     | 0     | Quad Servo Direct    | A1 input near 0V            |
diff --git a/libraries/yukon/modules/quad_servo/quad_servo_direct.hpp b/libraries/yukon/modules/quad_servo/quad_servo_direct.hpp
index 69269878..723833ab 100644
--- a/libraries/yukon/modules/quad_servo/quad_servo_direct.hpp
+++ b/libraries/yukon/modules/quad_servo/quad_servo_direct.hpp
@@ -5,20 +5,16 @@
 namespace pimoroni {
 
   class QuadServoDirectModule : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "Quad Servo Direct";
+    virtual std::string name() {
+      return QuadServoDirectModule::NAME;
     }
 
-    virtual std::string instance_name() {
-      return QuadServoDirectModule::name();
-    }
-
-    INFO_FUNC(QuadServoDirectModule)
+    TYPE_FUNCTION(QuadServoDirectModule)
   };
 
 }
diff --git a/libraries/yukon/modules/quad_servo/quad_servo_reg.cpp b/libraries/yukon/modules/quad_servo/quad_servo_reg.cpp
index 021d97d5..ad6f848c 100644
--- a/libraries/yukon/modules/quad_servo/quad_servo_reg.cpp
+++ b/libraries/yukon/modules/quad_servo/quad_servo_reg.cpp
@@ -2,6 +2,8 @@
 
 namespace pimoroni {
 
+  const std::string QuadServoRegModule::NAME = "Quad Servo Regulated";
+
   // | ADC1  | SLOW1 | SLOW2 | SLOW3 | Module               | Condition (if any)          |
   // |-------|-------|-------|-------|----------------------|-----------------------------|
   // | FLOAT | 0     | 1     | 0     | Quad Servo Regulated |                             |
diff --git a/libraries/yukon/modules/quad_servo/quad_servo_reg.hpp b/libraries/yukon/modules/quad_servo/quad_servo_reg.hpp
index 3addcb12..2a01a233 100644
--- a/libraries/yukon/modules/quad_servo/quad_servo_reg.hpp
+++ b/libraries/yukon/modules/quad_servo/quad_servo_reg.hpp
@@ -5,20 +5,16 @@
 namespace pimoroni {
 
   class QuadServoRegModule : public YukonModule {
-    public:
-      //static const std::string NAME = "Unnamed";
+  public:
+    static const std::string NAME;
 
     static bool is_module(uint adc_level, bool slow1, bool slow2, bool slow3);
 
-    static std::string name() {
-      return "Quad Servo Regulated";
+    virtual std::string name() {
+      return QuadServoRegModule::NAME;
     }
 
-    virtual std::string instance_name() {
-      return QuadServoRegModule::name();
-    }
-
-    INFO_FUNC(QuadServoRegModule)
+    TYPE_FUNCTION(QuadServoRegModule)
   };
 
 }
diff --git a/libraries/yukon/yukon.cpp b/libraries/yukon/yukon.cpp
index ff72be98..519d3512 100644
--- a/libraries/yukon/yukon.cpp
+++ b/libraries/yukon/yukon.cpp
@@ -252,25 +252,25 @@ namespace pimoroni {
     return slot;
   }
 
-  std::vector<uint> Yukon::find_slots_with_module(ModuleInfo module_type) {
+  std::vector<uint> Yukon::find_slots_with_module(const ModuleType& module_type) {
     if(is_main_output()) {
       throw std::runtime_error("Cannot find slots with modules whilst the main output is active\n");
     }
 
-    logging.info("> Finding slots with '" + module_type.name + "' module\n");
+    logging.info("> Finding slots with '" + module_type.NAME + "' module\n");
 
     std::vector<uint> slot_ids;
     for(auto it = slot_assignments.begin(); it != slot_assignments.end(); it++) {
       SLOT slot = it->first;
       logging.info("[Slot" + std::to_string(slot.ID) + "] ");
-      const ModuleInfo* detected = __detect_module(slot); // Need to have a return type that can be null
+      const ModuleType* detected = __detect_module(slot);
 
-      if(detected != nullptr && detected->type == module_type.type) {
-        logging.info("Found '" + detected->name + "' module\n");
+      if(detected != nullptr && detected->TYPE == module_type.TYPE) {
+        logging.info("Found '" + detected->NAME + "' module\n");
         slot_ids.push_back(slot.ID);
       }
       else {
-        logging.info("No '" + module_type.name + "' module\n");
+        logging.info("No '" + module_type.NAME + "' module\n");
       }
     }
 
@@ -314,9 +314,9 @@ namespace pimoroni {
     }
   }
 
-  const ModuleInfo* Yukon::__match_module(uint adc_level, bool slow1, bool slow2, bool slow3) {
+  const ModuleType* Yukon::__match_module(uint adc_level, bool slow1, bool slow2, bool slow3) {
     for(uint i = 0; i < count_of(KNOWN_MODULES); i++) {
-      const ModuleInfo& m = KNOWN_MODULES[i];
+      const ModuleType& m = KNOWN_MODULES[i];
       //printf("%s\n", std::get<0>(KNOWN_MODULES[i]).name());
       //printf("%s\n", std::get<1>(KNOWN_MODULES[i]).c_str());
       //printf("%d\n", std::get<2>(KNOWN_MODULES[i])(adc_level, slow1, slow2, slow3));
@@ -328,7 +328,7 @@ namespace pimoroni {
     return nullptr;
   }
 
-  const ModuleInfo* Yukon::__detect_module(SLOT slot) {
+  const ModuleType* Yukon::__detect_module(SLOT slot) {
     set_slow_config(slot.SLOW1, false);
     set_slow_config(slot.SLOW2, false);
     set_slow_config(slot.SLOW3, false);
@@ -356,13 +356,13 @@ namespace pimoroni {
       adc_level = ADC_HIGH;
     }
 
-    const ModuleInfo* detected = __match_module(adc_level, slow1, slow2, slow3);
+    const ModuleType* detected = __match_module(adc_level, slow1, slow2, slow3);
 
     __deselect_address();
 
     return detected;
   }
-  const ModuleInfo* Yukon::detect_module(uint slot_id) {
+  const ModuleType* Yukon::detect_module(uint slot_id) {
     if(is_main_output()) {
       throw std::runtime_error("Cannot detect modules whilst the main output is active\n");
     }
@@ -372,7 +372,7 @@ namespace pimoroni {
     return __detect_module(slot);
   }
 
-  const ModuleInfo* Yukon::detect_module(SLOT slot) {
+  const ModuleType* Yukon::detect_module(SLOT slot) {
     if(is_main_output()) {
       throw std::runtime_error("Cannot detect modules whilst the main output is active\n");
     }
@@ -401,11 +401,11 @@ namespace pimoroni {
       YukonModule* module = it->second;
 
       logging.info("[Slot" + std::to_string(slot.ID) + "] ");
-      const ModuleInfo* detected = __detect_module(slot);
+      const ModuleType* detected = __detect_module(slot);
 
       if(detected == nullptr) {
         if(module != nullptr) {
-          logging.info("No module detected! Expected a '" + module->instance_name() + "' module.\n");
+          logging.info("No module detected! Expected a '" + module->name() + "' module.\n");
           if(!allow_undetected) {//if slot not in allow_undetected:
             raise_undetected = true;
           }
@@ -417,18 +417,18 @@ namespace pimoroni {
       }
       else {
         if(module != nullptr) {
-          if(std::type_index(typeid(*module)) == detected->type) {
-            logging.info("'" + module->instance_name() + "' module detected and registered.\n");
+          if(std::type_index(typeid(*module)) == detected->TYPE) {
+            logging.info("'" + module->name() + "' module detected and registered.\n");
           }
           else {
-            logging.info("Module discrepency! Expected a '" + module->instance_name() + "}' module, but detected a '" + detected->name + "' module.\n");
+            logging.info("Module discrepency! Expected a '" + module->name() + "}' module, but detected a '" + detected->NAME + "' module.\n");
             if(!allow_discrepencies) { //if slot not in allow_discrepencies:
               raise_discrepency = true;
             }
           }
         }
         else {
-          logging.info("'" + detected->name + "' module detected but not registered.\n");
+          logging.info("'" + detected->NAME + "' module detected but not registered.\n");
           if(!allow_unregistered) { //if slot not in allow_unregistered:
             raise_unregistered = true;
           }
@@ -472,7 +472,7 @@ namespace pimoroni {
       YukonModule* module = it->second;
 
       if(module != nullptr) {
-        logging.info("[Slot" + std::to_string(slot.ID) + " '" + module->instance_name() + "'] Initialising ... ");
+        logging.info("[Slot" + std::to_string(slot.ID) + " '" + module->name() + "'] Initialising ... ");
         //TODO module.initialise(slot, self.read_slot_adc1, self.read_slot_adc2)
         logging.info("done\n");
       }
diff --git a/libraries/yukon/yukon.hpp b/libraries/yukon/yukon.hpp
index 8036a89f..b49cdc8b 100644
--- a/libraries/yukon/yukon.hpp
+++ b/libraries/yukon/yukon.hpp
@@ -190,7 +190,7 @@ namespace pimoroni {
     SLOT __check_slot(uint slot_id);
     SLOT __check_slot(SLOT slot);
 
-    std::vector<uint> find_slots_with_module(ModuleInfo module_type);
+    std::vector<uint> find_slots_with_module(const ModuleType& module_type);
 
     void register_with_slot(YukonModule* module, uint slot_id);
     void register_with_slot(YukonModule* module, SLOT slot);
@@ -198,10 +198,10 @@ namespace pimoroni {
     void deregister_slot(uint slot_id);
     void deregister_slot(SLOT slot);
 
-    const ModuleInfo* __match_module(uint adc_level, bool slow1, bool slow2, bool slow3);
-    const ModuleInfo* __detect_module(SLOT slot);
-    const ModuleInfo* detect_module(uint slot_id);
-    const ModuleInfo* detect_module(SLOT slot);
+    const ModuleType* __match_module(uint adc_level, bool slow1, bool slow2, bool slow3);
+    const ModuleType* __detect_module(SLOT slot);
+    const ModuleType* detect_module(uint slot_id);
+    const ModuleType* detect_module(SLOT slot);
 
     void __expand_slot_list(std::vector<SLOT> slot_list);
     void __verify_modules(bool allow_unregistered, bool allow_undetected, bool allow_discrepencies, bool allow_no_modules);