diff --git a/src/Targets/Microchip/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR8/Avr8.cpp
index f3601150..edbe353a 100644
--- a/src/Targets/Microchip/AVR8/Avr8.cpp
+++ b/src/Targets/Microchip/AVR8/Avr8.cpp
@@ -283,7 +283,8 @@ namespace Targets::Microchip::Avr8
             "cpu_gpr",
             TargetPeripheralDescriptor{
                 "cpu_gpr",
-                "CPU General Purpose",
+                "GPRs",
+                "CPU General Purpose Registers",
                 {},
                 {}
             }
diff --git a/src/Targets/RiscV/RiscV.cpp b/src/Targets/RiscV/RiscV.cpp
index f0253795..3a3b1db3 100644
--- a/src/Targets/RiscV/RiscV.cpp
+++ b/src/Targets/RiscV/RiscV.cpp
@@ -463,7 +463,8 @@ namespace Targets::RiscV
     ) {
         auto cpuPeripheralDescriptor = TargetPeripheralDescriptor{
             "cpu",
-            "RISC-V CPU",
+            "CPU",
+            "RISC-V GPRs and CSRs",
             {},
             {}
         };
diff --git a/src/Targets/TargetDescription/TargetDescriptionFile.cpp b/src/Targets/TargetDescription/TargetDescriptionFile.cpp
index d7edf508..787f6cdd 100644
--- a/src/Targets/TargetDescription/TargetDescriptionFile.cpp
+++ b/src/Targets/TargetDescription/TargetDescriptionFile.cpp
@@ -984,6 +984,7 @@ namespace Targets::TargetDescription
         auto output = TargetPeripheralDescriptor{
             peripheral.key,
             peripheral.name,
+            peripheralModule.description,
             {},
             {}
         };
diff --git a/src/Targets/TargetPeripheralDescriptor.cpp b/src/Targets/TargetPeripheralDescriptor.cpp
index 25687928..557bb3bd 100644
--- a/src/Targets/TargetPeripheralDescriptor.cpp
+++ b/src/Targets/TargetPeripheralDescriptor.cpp
@@ -12,12 +12,14 @@ namespace Targets
     TargetPeripheralDescriptor::TargetPeripheralDescriptor(
         const std::string& key,
         const std::string& name,
+        const std::string& description,
         std::map<std::string, TargetRegisterGroupDescriptor, std::less<void>>&& registerGroupDescriptorsByKey,
         std::vector<TargetPeripheralSignalDescriptor>&& signalDescriptors
     )
         : id(static_cast<TargetPeripheralId>(Services::StringService::generateUniqueInteger(key)))
         , key(key)
         , name(name)
+        , description(description)
         , registerGroupDescriptorsByKey(std::move(registerGroupDescriptorsByKey))
         , signalDescriptors(std::move(signalDescriptors))
     {}
@@ -68,6 +70,7 @@ namespace Targets
         auto output = TargetPeripheralDescriptor{
             this->key,
             this->name,
+            this->description,
             {},
             {}
         };
diff --git a/src/Targets/TargetPeripheralDescriptor.hpp b/src/Targets/TargetPeripheralDescriptor.hpp
index d9199dd1..a98b5759 100644
--- a/src/Targets/TargetPeripheralDescriptor.hpp
+++ b/src/Targets/TargetPeripheralDescriptor.hpp
@@ -22,12 +22,14 @@ namespace Targets
         const TargetPeripheralId id;
         const std::string key;
         std::string name;
+        std::string description;
         std::map<std::string, TargetRegisterGroupDescriptor, std::less<void>> registerGroupDescriptorsByKey;
         std::vector<TargetPeripheralSignalDescriptor> signalDescriptors;
 
         TargetPeripheralDescriptor(
             const std::string& key,
             const std::string& name,
+            const std::string& description,
             std::map<std::string, TargetRegisterGroupDescriptor, std::less<void>>&& registerGroupDescriptorsByKey,
             std::vector<TargetPeripheralSignalDescriptor>&& signalDescriptors
         );