diff --git a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
index 37aba9e2..9e246054 100644
--- a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
+++ b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
@@ -376,12 +376,12 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
         return output;
     }
 
-    std::optional<FuseBitDescriptor> TargetDescriptionFile::getDwenFuseBitDescriptor() const {
-        return this->getFuseBitDescriptorByName("dwen");
+    std::optional<FuseBitsDescriptor> TargetDescriptionFile::getDwenFuseBitsDescriptor() const {
+        return this->getFuseBitsDescriptorByName("dwen");
     }
 
-    std::optional<FuseBitDescriptor> TargetDescriptionFile::getSpienFuseBitDescriptor() const {
-        return this->getFuseBitDescriptorByName("spien");
+    std::optional<FuseBitsDescriptor> TargetDescriptionFile::getSpienFuseBitsDescriptor() const {
+        return this->getFuseBitsDescriptorByName("spien");
     }
 
     void TargetDescriptionFile::loadDebugPhysicalInterfaces() {
@@ -627,7 +627,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
         }
     }
 
-    std::optional<FuseBitDescriptor> TargetDescriptionFile::getFuseBitDescriptorByName(
+    std::optional<FuseBitsDescriptor> TargetDescriptionFile::getFuseBitsDescriptorByName(
         const std::string& fuseBitName
     ) const {
         if (!this->modulesMappedByName.contains("fuse")) {
@@ -655,7 +655,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
             }
 
             if (fuse.bitFieldsMappedByName.contains(fuseBitName)) {
-                return FuseBitDescriptor(
+                return FuseBitsDescriptor(
                     fuseTypesByName.at(fuseTypeName),
                     fuse.bitFieldsMappedByName.at(fuseBitName).mask
                 );
diff --git a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.hpp b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.hpp
index 49268144..b9326e26 100644
--- a/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.hpp
+++ b/src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.hpp
@@ -90,7 +90,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
          * @return
          *  std::nullopt if the DWEN bit field could not be found in the TDF.
          */
-        [[nodiscard]] std::optional<FuseBitDescriptor> getDwenFuseBitDescriptor() const;
+        [[nodiscard]] std::optional<FuseBitsDescriptor> getDwenFuseBitsDescriptor() const;
 
         /**
          * Constructs a FuseBitDescriptor for the SPI enable (SPIEN) fuse bit, with information extracted from
@@ -99,7 +99,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
          * @return
          *  std::nullopt if the SPIEN bit field could not be found in the TDF.
          */
-        [[nodiscard]] std::optional<FuseBitDescriptor> getSpienFuseBitDescriptor() const;
+        [[nodiscard]] std::optional<FuseBitsDescriptor> getSpienFuseBitsDescriptor() const;
 
         /**
          * Returns a set of all supported physical interfaces for debugging.
@@ -188,7 +188,9 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit::TargetDescription
          */
         void loadTargetRegisterDescriptors();
 
-        [[nodiscard]] std::optional<FuseBitDescriptor> getFuseBitDescriptorByName(const std::string& fuseBitName) const;
+        [[nodiscard]] std::optional<FuseBitsDescriptor> getFuseBitsDescriptorByName(
+            const std::string& fuseBitName
+        ) const;
 
         [[nodiscard]] std::optional<Targets::TargetDescription::MemorySegment> getFlashMemorySegment() const;
         [[nodiscard]] std::optional<Targets::TargetDescription::MemorySegment> getRamMemorySegment() const;
diff --git a/src/Targets/Microchip/AVR/Fuse.hpp b/src/Targets/Microchip/AVR/Fuse.hpp
index 83ebdf44..969d752f 100644
--- a/src/Targets/Microchip/AVR/Fuse.hpp
+++ b/src/Targets/Microchip/AVR/Fuse.hpp
@@ -19,18 +19,18 @@ namespace Bloom::Targets::Microchip::Avr
         Fuse(FuseType type, std::uint8_t value): type(type), value(value) {}
     };
 
-    struct FuseBitDescriptor
+    struct FuseBitsDescriptor
     {
         /**
-         * The type of the fuse byte in which the fuse bit resides.
+         * The type of the fuse byte in which the fuse bits resides.
          */
         FuseType fuseType;
 
         /**
-         * Fuse bit mask
+         * Fuse bits mask
          */
         std::uint8_t bitMask;
 
-        FuseBitDescriptor(FuseType fuseType, std::uint8_t bitMask): fuseType(fuseType), bitMask(bitMask) {}
+        FuseBitsDescriptor(FuseType fuseType, std::uint8_t bitMask): fuseType(fuseType), bitMask(bitMask) {}
     };
 }