diff --git a/SabreTools.DatItems/Adjuster.cs b/SabreTools.DatItems/Adjuster.cs
index 6ce07171..8592feb2 100644
--- a/SabreTools.DatItems/Adjuster.cs
+++ b/SabreTools.DatItems/Adjuster.cs
@@ -46,16 +46,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Archive.cs b/SabreTools.DatItems/Archive.cs
index a2e4b5e4..441cff85 100644
--- a/SabreTools.DatItems/Archive.cs
+++ b/SabreTools.DatItems/Archive.cs
@@ -26,17 +26,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
-
+        public override void SetName(string name) => Name = name;
         #endregion
 
         #region Constructors
diff --git a/SabreTools.DatItems/BiosSet.cs b/SabreTools.DatItems/BiosSet.cs
index 552c83ec..61565b34 100644
--- a/SabreTools.DatItems/BiosSet.cs
+++ b/SabreTools.DatItems/BiosSet.cs
@@ -43,16 +43,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Chip.cs b/SabreTools.DatItems/Chip.cs
index a3aaafec..f7f6089e 100644
--- a/SabreTools.DatItems/Chip.cs
+++ b/SabreTools.DatItems/Chip.cs
@@ -55,16 +55,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Configuration.cs b/SabreTools.DatItems/Configuration.cs
index 7b149003..d2241921 100644
--- a/SabreTools.DatItems/Configuration.cs
+++ b/SabreTools.DatItems/Configuration.cs
@@ -70,16 +70,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs
index 99710956..70138fb2 100644
--- a/SabreTools.DatItems/DatItem.cs
+++ b/SabreTools.DatItems/DatItem.cs
@@ -129,18 +129,13 @@ namespace SabreTools.DatItems
         /// Gets the name to use for a DatItem
         /// </summary>
         /// <returns>Name if available, null otherwise</returns>
-        public virtual string GetName()
-        {
-            return null;
-        }
+        public virtual string GetName() => null;
 
         /// <summary>
         /// Sets the name to use for a DatItem
         /// </summary>
         /// <param name="name">Name to set for the item</param>
-        public virtual void SetName(string name)
-        {
-        }
+        public virtual void SetName(string name) { }
 
         #endregion
 
diff --git a/SabreTools.DatItems/DataArea.cs b/SabreTools.DatItems/DataArea.cs
index b1bb0b37..e117adfc 100644
--- a/SabreTools.DatItems/DataArea.cs
+++ b/SabreTools.DatItems/DataArea.cs
@@ -57,16 +57,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/DeviceReference.cs b/SabreTools.DatItems/DeviceReference.cs
index 249fdee4..0bc8dbbf 100644
--- a/SabreTools.DatItems/DeviceReference.cs
+++ b/SabreTools.DatItems/DeviceReference.cs
@@ -26,16 +26,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/DipSwitch.cs b/SabreTools.DatItems/DipSwitch.cs
index b0478a25..c18a93b0 100644
--- a/SabreTools.DatItems/DipSwitch.cs
+++ b/SabreTools.DatItems/DipSwitch.cs
@@ -96,16 +96,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Disk.cs b/SabreTools.DatItems/Disk.cs
index fdfe42db..deb7d94a 100644
--- a/SabreTools.DatItems/Disk.cs
+++ b/SabreTools.DatItems/Disk.cs
@@ -153,16 +153,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/DiskArea.cs b/SabreTools.DatItems/DiskArea.cs
index 041ca630..7c89da3e 100644
--- a/SabreTools.DatItems/DiskArea.cs
+++ b/SabreTools.DatItems/DiskArea.cs
@@ -27,16 +27,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Extension.cs b/SabreTools.DatItems/Extension.cs
index a89e31ab..a6a538b2 100644
--- a/SabreTools.DatItems/Extension.cs
+++ b/SabreTools.DatItems/Extension.cs
@@ -26,16 +26,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Info.cs b/SabreTools.DatItems/Info.cs
index 3e5b2105..202d305c 100644
--- a/SabreTools.DatItems/Info.cs
+++ b/SabreTools.DatItems/Info.cs
@@ -33,16 +33,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Instance.cs b/SabreTools.DatItems/Instance.cs
index 6864511e..4923b25f 100644
--- a/SabreTools.DatItems/Instance.cs
+++ b/SabreTools.DatItems/Instance.cs
@@ -33,16 +33,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Location.cs b/SabreTools.DatItems/Location.cs
index 2d53ce5e..b65f34eb 100644
--- a/SabreTools.DatItems/Location.cs
+++ b/SabreTools.DatItems/Location.cs
@@ -46,16 +46,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Media.cs b/SabreTools.DatItems/Media.cs
index adbc35a3..494c83a1 100644
--- a/SabreTools.DatItems/Media.cs
+++ b/SabreTools.DatItems/Media.cs
@@ -82,16 +82,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Part.cs b/SabreTools.DatItems/Part.cs
index 68e178e7..8392fb6b 100644
--- a/SabreTools.DatItems/Part.cs
+++ b/SabreTools.DatItems/Part.cs
@@ -35,16 +35,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/PartFeature.cs b/SabreTools.DatItems/PartFeature.cs
index 9cd9e051..1b984ce6 100644
--- a/SabreTools.DatItems/PartFeature.cs
+++ b/SabreTools.DatItems/PartFeature.cs
@@ -33,16 +33,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/RamOption.cs b/SabreTools.DatItems/RamOption.cs
index cf9d968a..c5a328ca 100644
--- a/SabreTools.DatItems/RamOption.cs
+++ b/SabreTools.DatItems/RamOption.cs
@@ -43,16 +43,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Release.cs b/SabreTools.DatItems/Release.cs
index 4c1de94f..1a73e777 100644
--- a/SabreTools.DatItems/Release.cs
+++ b/SabreTools.DatItems/Release.cs
@@ -57,16 +57,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Rom.cs b/SabreTools.DatItems/Rom.cs
index e3ca3796..46f2e53a 100644
--- a/SabreTools.DatItems/Rom.cs
+++ b/SabreTools.DatItems/Rom.cs
@@ -342,16 +342,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Sample.cs b/SabreTools.DatItems/Sample.cs
index 5413f63b..4f95acc5 100644
--- a/SabreTools.DatItems/Sample.cs
+++ b/SabreTools.DatItems/Sample.cs
@@ -26,16 +26,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Setting.cs b/SabreTools.DatItems/Setting.cs
index 41bf248a..0ff26c2f 100644
--- a/SabreTools.DatItems/Setting.cs
+++ b/SabreTools.DatItems/Setting.cs
@@ -53,16 +53,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/SharedFeature.cs b/SabreTools.DatItems/SharedFeature.cs
index 3666fee8..505f5ed8 100644
--- a/SabreTools.DatItems/SharedFeature.cs
+++ b/SabreTools.DatItems/SharedFeature.cs
@@ -33,16 +33,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/Slot.cs b/SabreTools.DatItems/Slot.cs
index bbef2de9..7fffa8c3 100644
--- a/SabreTools.DatItems/Slot.cs
+++ b/SabreTools.DatItems/Slot.cs
@@ -36,16 +36,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/SlotOption.cs b/SabreTools.DatItems/SlotOption.cs
index 22c15d99..a953c243 100644
--- a/SabreTools.DatItems/SlotOption.cs
+++ b/SabreTools.DatItems/SlotOption.cs
@@ -43,16 +43,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion
 
diff --git a/SabreTools.DatItems/SoftwareList.cs b/SabreTools.DatItems/SoftwareList.cs
index 84328b5a..0f993874 100644
--- a/SabreTools.DatItems/SoftwareList.cs
+++ b/SabreTools.DatItems/SoftwareList.cs
@@ -47,16 +47,10 @@ namespace SabreTools.DatItems
         #region Accessors
 
         /// <inheritdoc/>
-        public override string GetName()
-        {
-            return Name;
-        }
+        public override string GetName() => Name;
 
         /// <inheritdoc/>
-        public override void SetName(string name)
-        {
-            Name = name;
-        }
+        public override void SetName(string name) => Name = name;
 
         #endregion