diff --git a/src/Discord.Net.Commands/Attributes/NameAttribute.cs b/src/Discord.Net.Commands/Attributes/NameAttribute.cs
new file mode 100644
index 000000000..3ea0abe24
--- /dev/null
+++ b/src/Discord.Net.Commands/Attributes/NameAttribute.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Discord.Commands
+{
+    // Override public name of command/module
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
+    public class NameAttribute : Attribute
+    {
+        public string Text { get; }
+        public NameAttribute(string text)
+        {
+            Text = text;
+        }
+    }
+}
diff --git a/src/Discord.Net.Commands/Command.cs b/src/Discord.Net.Commands/Command.cs
index 36cbdcc0f..f46fafb27 100644
--- a/src/Discord.Net.Commands/Command.cs
+++ b/src/Discord.Net.Commands/Command.cs
@@ -31,6 +31,10 @@ namespace Discord.Commands
             Name = source.Name;
             Text = groupPrefix + attribute.Text;
 
+            var nameAttr = source.GetCustomAttribute<NameAttribute>();
+            if (nameAttr != null)
+                Name = nameAttr.Text;
+
             var description = source.GetCustomAttribute<DescriptionAttribute>();
             if (description != null)
                 Description = description.Text;
diff --git a/src/Discord.Net.Commands/Module.cs b/src/Discord.Net.Commands/Module.cs
index f965d78ab..ecbf0b400 100644
--- a/src/Discord.Net.Commands/Module.cs
+++ b/src/Discord.Net.Commands/Module.cs
@@ -25,6 +25,10 @@ namespace Discord.Commands
             Name = source.Name;
             Instance = instance;
 
+            var nameAttr = source.GetCustomAttribute<NameAttribute>();
+            if (nameAttr != null)
+                Name = nameAttr.Text;
+
             var summaryAttr = source.GetCustomAttribute<SummaryAttribute>();
             if (summaryAttr != null)
                 Summary = summaryAttr.Text;