diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.hpp
index 3fea4331..5c9b023f 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/AvrEvent.hpp
@@ -7,7 +7,7 @@
 
 namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
 {
-    enum class AvrEventId : unsigned char
+    enum class AvrEventId: unsigned char
     {
         AVR8_BREAK_EVENT = 0x40,
     };
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/Query.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/Query.hpp
index f86b6c2f..1fc64a49 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/Query.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/CommandFrames/Discovery/Query.hpp
@@ -7,7 +7,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::CommandFrames
     /**
      * The query context is the type of query to execute.
      */
-    enum class QueryContext : unsigned char
+    enum class QueryContext: unsigned char
     {
         COMMAND_HANDLERS = 0x00,
         TOOL_NAME = 0x80,
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp
index 95bedd4b..69ea1efb 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/ResponseFrames/Discovery/DiscoveryResponseFrame.hpp
@@ -7,7 +7,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr::ResponseFrame
     /**
      * Discovery commands can only return two responses; A LIST response and a failure.
      */
-    enum class ResponseId : unsigned char
+    enum class ResponseId: unsigned char
     {
         /*
          * According to the protocol docs, response ID 0x81 is for a LIST response, but this doesn't seem to be
diff --git a/src/EventManager/Events/Event.hpp b/src/EventManager/Events/Event.hpp
index 5ec69524..0b9e2d41 100644
--- a/src/EventManager/Events/Event.hpp
+++ b/src/EventManager/Events/Event.hpp
@@ -12,7 +12,7 @@ namespace Bloom::Events
 {
     static_assert(std::atomic<int>::is_always_lock_free);
 
-    enum EventType: std::uint8_t
+    enum class EventType: std::uint8_t
     {
         GENERIC,
         STOP_TARGET_EXECUTION,
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp
index 59183741..06a6e4fe 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/DIP/PinWidget.hpp
@@ -13,7 +13,7 @@
 
 namespace Bloom::Widgets::InsightTargetWidgets::Dip
 {
-    enum Position: std::uint8_t
+    enum class Position: std::uint8_t
     {
         TOP,
         BOTTOM
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp
index f9efcbd6..89cb662d 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/QFP/PinWidget.hpp
@@ -11,7 +11,7 @@
 
 namespace Bloom::Widgets::InsightTargetWidgets::Qfp
 {
-    enum Position: std::uint8_t
+    enum class Position: std::uint8_t
     {
         TOP,
         BOTTOM,
diff --git a/src/Targets/TargetDescription/MemorySegment.hpp b/src/Targets/TargetDescription/MemorySegment.hpp
index c250fb22..8990c6a1 100644
--- a/src/Targets/TargetDescription/MemorySegment.hpp
+++ b/src/Targets/TargetDescription/MemorySegment.hpp
@@ -7,7 +7,7 @@
 
 namespace Bloom::Targets::TargetDescription
 {
-    enum MemorySegmentType
+    enum class MemorySegmentType
     {
         REGISTERS,
         IO,