diff --git a/RombaSharp/Features/DisplayHelp.cs b/RombaSharp/Features/DisplayHelp.cs
index 044d9789..0ad5c33e 100644
--- a/RombaSharp/Features/DisplayHelp.cs
+++ b/RombaSharp/Features/DisplayHelp.cs
@@ -18,7 +18,7 @@ namespace RombaSharp.Features
             Features = new Dictionary<string, Feature>();
         }
 
-        public override bool ProcessArgs(string[] args, Help help)
+        public override bool ProcessArgs(string[] args, FeatureSet help)
         {
             // If we had something else after help
             if (args.Length > 1)
diff --git a/RombaSharp/Features/DisplayHelpDetailed.cs b/RombaSharp/Features/DisplayHelpDetailed.cs
index d2a658b2..d54119f9 100644
--- a/RombaSharp/Features/DisplayHelpDetailed.cs
+++ b/RombaSharp/Features/DisplayHelpDetailed.cs
@@ -18,7 +18,7 @@ namespace RombaSharp.Features
             Features = new Dictionary<string, Feature>();
         }
 
-        public override bool ProcessArgs(string[] args, Help help)
+        public override bool ProcessArgs(string[] args, FeatureSet help)
         {
             // If we had something else after help
             if (args.Length > 1)
diff --git a/RombaSharp/Program.cs b/RombaSharp/Program.cs
index fad768ab..af329ee0 100644
--- a/RombaSharp/Program.cs
+++ b/RombaSharp/Program.cs
@@ -23,7 +23,7 @@ namespace RombaSharp
         /// <summary>
         /// Help object that determines available functionality
         /// </summary>
-        private static Help _help;
+        private static FeatureSet _help;
 
         /// <summary>
         /// Logging object
@@ -169,7 +169,7 @@ namespace RombaSharp
         /// Generate a Help object for this program
         /// </summary>
         /// <returns>Populated Help object</returns>
-        private static Help RetrieveHelp()
+        private static FeatureSet RetrieveHelp()
         {
             // Create and add the header to the Help object
             string barrier = "-----------------------------------------";
@@ -182,7 +182,7 @@ namespace RombaSharp
             };
 
             // Create the base help object with header
-            Help help = new Help(helpHeader);
+            FeatureSet help = new FeatureSet(helpHeader);
 
             // Add all of the features
             help.Add(new DisplayHelp());
diff --git a/SabreTools.Help/Help.cs b/SabreTools.Help/FeatureSet.cs
similarity index 99%
rename from SabreTools.Help/Help.cs
rename to SabreTools.Help/FeatureSet.cs
index 76a0173f..a79534d5 100644
--- a/SabreTools.Help/Help.cs
+++ b/SabreTools.Help/FeatureSet.cs
@@ -4,7 +4,7 @@ using System.Linq;
 
 namespace SabreTools.Help
 {
-    public class Help
+    public class FeatureSet
     {
         #region Private variables
 
@@ -16,13 +16,13 @@ namespace SabreTools.Help
 
         #region Constructors
 
-        public Help()
+        public FeatureSet()
         {
             _header = new List<string>();
             _features = new Dictionary<string, Feature>();
         }
 
-        public Help(List<string> header)
+        public FeatureSet(List<string> header)
         {
             _header = header;
             _features = new Dictionary<string, Feature>();
diff --git a/SabreTools.Help/TopLevel.cs b/SabreTools.Help/TopLevel.cs
index e8f3cb93..c354a33b 100644
--- a/SabreTools.Help/TopLevel.cs
+++ b/SabreTools.Help/TopLevel.cs
@@ -46,7 +46,7 @@ namespace SabreTools.Help
         /// <summary>
         /// Process args list based on current feature
         /// </summary>
-        public virtual bool ProcessArgs(string[] args, Help help)
+        public virtual bool ProcessArgs(string[] args, FeatureSet help)
         {
             for (int i = 1; i < args.Length; i++)
             {
diff --git a/SabreTools/Features/DisplayHelp.cs b/SabreTools/Features/DisplayHelp.cs
index 4542e0e1..559a67dc 100644
--- a/SabreTools/Features/DisplayHelp.cs
+++ b/SabreTools/Features/DisplayHelp.cs
@@ -18,7 +18,7 @@ namespace SabreTools.Features
             Features = new Dictionary<string, Feature>();
         }
 
-        public override bool ProcessArgs(string[] args, Help.Help help)
+        public override bool ProcessArgs(string[] args, FeatureSet help)
         {
             // If we had something else after help
             if (args.Length > 1)
diff --git a/SabreTools/Features/DisplayHelpDetailed.cs b/SabreTools/Features/DisplayHelpDetailed.cs
index f90c0c32..0e47be75 100644
--- a/SabreTools/Features/DisplayHelpDetailed.cs
+++ b/SabreTools/Features/DisplayHelpDetailed.cs
@@ -18,7 +18,7 @@ namespace SabreTools.Features
             Features = new Dictionary<string, Feature>();
         }
 
-        public override bool ProcessArgs(string[] args, Help.Help help)
+        public override bool ProcessArgs(string[] args, FeatureSet help)
         {
             // If we had something else after help
             if (args.Length > 1)
diff --git a/SabreTools/Program.cs b/SabreTools/Program.cs
index 81573a78..207a0a63 100644
--- a/SabreTools/Program.cs
+++ b/SabreTools/Program.cs
@@ -15,7 +15,7 @@ namespace SabreTools
         /// <summary>
         /// Help object that determines available functionality
         /// </summary>
-        private static Help.Help _help;
+        private static FeatureSet _help;
 
         /// <summary>
         /// Logging object
@@ -149,7 +149,7 @@ namespace SabreTools
         /// Generate a Help object for this program
         /// </summary>
         /// <returns>Populated Help object</returns>
-        private static Help.Help RetrieveHelp()
+        private static FeatureSet RetrieveHelp()
         {
             // Create and add the header to the Help object
             string barrier = "-----------------------------------------";
@@ -162,7 +162,7 @@ namespace SabreTools
             };
 
             // Create the base help object with header
-            Help.Help help = new Help.Help(helpHeader);
+            FeatureSet help = new FeatureSet(helpHeader);
 
             // Add all of the features
             help.Add(new DisplayHelp());