diff --git a/commands/avataredit/beautiful.js b/commands/avataredit/beautiful.js
index 1fa0f973..0af375d8 100644
--- a/commands/avataredit/beautiful.js
+++ b/commands/avataredit/beautiful.js
@@ -6,7 +6,7 @@ module.exports = class BeautifulCommand extends Command {
         super(client, {
             name: 'beautiful',
             aliases: [
-                'grunklestan'
+                'grunkle-stan'
             ],
             group: 'avataredit',
             memberName: 'beautiful',
diff --git a/commands/avataredit/bobross.js b/commands/avataredit/bobross.js
index c9572ec6..a0e02897 100644
--- a/commands/avataredit/bobross.js
+++ b/commands/avataredit/bobross.js
@@ -4,12 +4,12 @@ const Jimp = require('jimp');
 module.exports = class BobRossCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'bobross',
+            name: 'bob-ross',
             aliases: [
                 'ross'
             ],
             group: 'avataredit',
-            memberName: 'bobross',
+            memberName: 'bob-ross',
             description: 'Make Bob Ross draw an avatar.',
             args: [
                 {
diff --git a/commands/avataredit/greyscale.js b/commands/avataredit/greyscale.js
index a81400db..9862dcb5 100644
--- a/commands/avataredit/greyscale.js
+++ b/commands/avataredit/greyscale.js
@@ -5,6 +5,9 @@ module.exports = class GreyscaleCommand extends Command {
     constructor(client) {
         super(client, {
             name: 'greyscale',
+            aliases: [
+                'grayscale'
+            ],
             group: 'avataredit',
             memberName: 'greyscale',
             description: 'Greyscale a user\'s avatar colors.',
diff --git a/commands/avataredit/rip.js b/commands/avataredit/rip.js
index b22a2f44..2d690566 100644
--- a/commands/avataredit/rip.js
+++ b/commands/avataredit/rip.js
@@ -7,7 +7,7 @@ module.exports = class RIPCommand extends Command {
             name: 'rip',
             aliases: [
                 'grave',
-                'gravestone'
+                'grave-stone'
             ],
             group: 'avataredit',
             memberName: 'rip',
diff --git a/commands/avataredit/steamcard.js b/commands/avataredit/steamcard.js
index 93387511..fae4650d 100644
--- a/commands/avataredit/steamcard.js
+++ b/commands/avataredit/steamcard.js
@@ -4,12 +4,12 @@ const Jimp = require('jimp');
 module.exports = class SteamCardCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'steamcard',
+            name: 'steam-card',
             aliases: [
                 'card'
             ],
             group: 'avataredit',
-            memberName: 'steamcard',
+            memberName: 'steam-card',
             description: 'Put an avatar on a Steam Card.',
             args: [
                 {
diff --git a/commands/games/mathgame.js b/commands/games/mathgame.js
index ecc7b08a..d1af6336 100644
--- a/commands/games/mathgame.js
+++ b/commands/games/mathgame.js
@@ -6,9 +6,9 @@ const operations = ['+', '-', '*'];
 module.exports = class MathGameCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'mathgame',
+            name: 'math-game',
             group: 'games',
-            memberName: 'mathgame',
+            memberName: 'math-game',
             description: 'See how fast you can answer a math problem in a given time limit.',
             args: [
                 {
diff --git a/commands/games/rockpaperscissors.js b/commands/games/rockpaperscissors.js
index 1d834847..c428820b 100644
--- a/commands/games/rockpaperscissors.js
+++ b/commands/games/rockpaperscissors.js
@@ -4,12 +4,12 @@ const responses = ['Paper', 'Rock', 'Scissors'];
 module.exports = class RockPaperScissorsCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'rps',
+            name: 'rock-paper-scissors',
             aliases: [
-                'rockpaperscissors'
+                'rps'
             ],
             group: 'games',
-            memberName: 'rps',
+            memberName: 'rock-paper-scissors',
             description: 'Play Rock-Paper-Scissors.',
             args: [
                 {
diff --git a/commands/games/typinggame.js b/commands/games/typinggame.js
index 8c54ddfd..e68942a5 100644
--- a/commands/games/typinggame.js
+++ b/commands/games/typinggame.js
@@ -5,9 +5,9 @@ const sentences = require('./sentences');
 module.exports = class TypingGameCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'typinggame',
+            name: 'typing-game',
             group: 'games',
-            memberName: 'typinggame',
+            memberName: 'typing-game',
             description: 'See how fast you can type a sentence in a given time limit.',
             args: [
                 {
diff --git a/commands/guildinfo/guildinfo.js b/commands/guildinfo/guildinfo.js
index 4d42e172..4eacb7a8 100644
--- a/commands/guildinfo/guildinfo.js
+++ b/commands/guildinfo/guildinfo.js
@@ -10,8 +10,8 @@ module.exports = class GuildInfoCommand extends Command {
             name: 'server',
             aliases: [
                 'guild',
-                'serverinfo',
-                'guildinfo'
+                'server-info',
+                'guild-info'
             ],
             group: 'guildinfo',
             memberName: 'server',
diff --git a/commands/moderation/ban.js b/commands/moderation/ban.js
index 26eb17bb..098d1706 100644
--- a/commands/moderation/ban.js
+++ b/commands/moderation/ban.js
@@ -40,13 +40,11 @@ module.exports = class BanCommand extends Command {
         if(!msg.channel.permissionsFor(this.client.user).has('BAN_MEMBERS'))
             return msg.say('This Command requires the `Ban Members` Permission.');
         const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog'));
-        if(!modlogs)
-            return msg.say('This Command requires a channel set with the `modchannel` command.');
+        if(!modlogs) return msg.say('This Command requires a channel set with the `modchannel` command.');
         if(!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
             return msg.say('This Command requires the `Embed Links` Permission.');
         const { member, reason } = args;
-        if(!member.bannable)
-            return msg.say('This member is not bannable. Perhaps they have a higher role than me?');
+        if(!member.bannable) return msg.say('This member is not bannable. Perhaps they have a higher role than me?');
         try {
             try {
                 await member.send(stripIndents`
diff --git a/commands/moderation/kick.js b/commands/moderation/kick.js
index 0a27dd12..a40b3569 100644
--- a/commands/moderation/kick.js
+++ b/commands/moderation/kick.js
@@ -37,13 +37,11 @@ module.exports = class KickCommand extends Command {
         if(!msg.channel.permissionsFor(this.client.user).has('KICK_MEMBERS'))
             return msg.say('This Command requires the `Kick Members` Permission.');
         const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog'));
-        if(!modlogs)
-            return msg.say('This Command requires a channel set with the `modchannel` command.');
+        if(!modlogs) return msg.say('This Command requires a channel set with the `modchannel` command.');
         if(!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
             return msg.say('This Command requires the `Embed Links` Permission.');
         const { member, reason } = args;
-        if(!member.kickable)
-            return msg.say('This member is not kickable. Perhaps they have a higher role than me?');
+        if(!member.kickable) return msg.say('This member is not kickable. Perhaps they have a higher role than me?');
         try {
             try {
                 await member.send(stripIndents`
diff --git a/commands/moderation/softban.js b/commands/moderation/softban.js
index d894e902..b81f0139 100644
--- a/commands/moderation/softban.js
+++ b/commands/moderation/softban.js
@@ -39,13 +39,11 @@ module.exports = class SoftbanCommand extends Command {
         if(!msg.channel.permissionsFor(this.client.user).has('KICK_MEMBERS'))
             return msg.say('This Command requires the `Kick Members` Permission.');
         const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog'));
-        if(!modlogs)
-            return msg.say('This Command requires a channel set with the `modchannel` command.');
+        if(!modlogs) return msg.say('This Command requires a channel set with the `modchannel` command.');
         if(!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
             return msg.say('This Command requires the `Embed Links` Permission.');
         const { member, reason } = args;
-        if(!member.bannable)
-            return msg.say('This member is not bannable. Perhaps they have a higher role than me?');
+        if(!member.bannable) return msg.say('This member is not bannable. Perhaps they have a higher role than me?');
         try {
             try {
                 await member.send(stripIndents`
diff --git a/commands/moderation/unban.js b/commands/moderation/unban.js
index d8aa1238..405ce433 100644
--- a/commands/moderation/unban.js
+++ b/commands/moderation/unban.js
@@ -44,14 +44,12 @@ module.exports = class UnbanCommand extends Command {
         if(!msg.channel.permissionsFor(this.client.user).has('BAN_MEMBERS'))
             return msg.say('This Command requires the `Ban Members` Permission.');
         const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog'));
-        if(!modlogs)
-            return msg.say('This Command requires a channel set with the `modchannel` command.');
+        if(!modlogs) return msg.say('This Command requires a channel set with the `modchannel` command.');
         if(!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
             return msg.say('This Command requires the `Embed Links` Permission.');
         const { id, reason } = args;
         const bans = await msg.guild.fetchBans();
-        if(!bans.has(id))
-            return msg.say('This ID is not in the Guild Banlist.');
+        if(!bans.has(id)) return msg.say('This ID is not in the Guild Banlist.');
         const member = bans.get(id);
         try {
             await msg.guild.unban(member);
diff --git a/commands/moderation/warn.js b/commands/moderation/warn.js
index d8d56ac3..6523989d 100644
--- a/commands/moderation/warn.js
+++ b/commands/moderation/warn.js
@@ -35,8 +35,7 @@ module.exports = class WarnCommand extends Command {
 
     async run(msg, args) {
         const modlogs = msg.guild.channels.get(msg.guild.settings.get('modLog'));
-        if(!modlogs)
-            return msg.say('This Command requires a channel set with the `modchannel` command.');
+        if(!modlogs) return msg.say('This Command requires a channel set with the `modchannel` command.');
         if(!modlogs.permissionsFor(this.client.user).has('EMBED_LINKS'))
             return msg.say('This Command requires the `Embed Links` Permission.');
         const { member, reason } = args;
diff --git a/commands/random/easteregg.js b/commands/random/easteregg.js
index 7720dc49..3a41b13c 100644
--- a/commands/random/easteregg.js
+++ b/commands/random/easteregg.js
@@ -4,12 +4,12 @@ const eastereggs = require('./eastereggs');
 module.exports = class EasterEggCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'easteregg',
+            name: 'easter-egg',
             aliases: [
                 'tag'
             ],
             group: 'random',
-            memberName: 'easteregg',
+            memberName: 'easter-egg',
             description: 'Can you discover all the easter eggs?',
             args: [
                 {
diff --git a/commands/random/giveflower.js b/commands/random/giveflower.js
index ad7db22e..06e8bc9b 100644
--- a/commands/random/giveflower.js
+++ b/commands/random/giveflower.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class GiveFlowerCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'giveflower',
+            name: 'give-flower',
             group: 'random',
-            memberName: 'giveflower',
+            memberName: 'give-flower',
             description: 'Gives Xiao Pai a flower.'
         });
     }
diff --git a/commands/random/strawpoll.js b/commands/random/strawpoll.js
index 8e8d0ed6..7b6da18d 100644
--- a/commands/random/strawpoll.js
+++ b/commands/random/strawpoll.js
@@ -35,10 +35,8 @@ module.exports = class StrawpollCommand extends Command {
 
     async run(msg, args) {
         const { title, options } = args;
-        if(options.length < 2)
-            return msg.say('You provided less than two choices.');
-        if(options.length > 31)
-            return msg.say('You provided more than thirty choices.');
+        if(options.length < 2) return msg.say('You provided less than two choices.');
+        if(options.length > 31) return msg.say('You provided more than thirty choices.');
         try {
             const { body } = await request
                 .post('https://strawpoll.me/api/v2/polls')
diff --git a/commands/random/wouldyourather.js b/commands/random/wouldyourather.js
index 5acf2565..a313ae1e 100644
--- a/commands/random/wouldyourather.js
+++ b/commands/random/wouldyourather.js
@@ -5,12 +5,12 @@ const request = require('superagent');
 module.exports = class WouldYouRatherCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'wouldyourather',
+            name: 'would-you-rather',
             aliases: [
                 'wyrather'
             ],
             group: 'random',
-            memberName: 'wouldyourather',
+            memberName: 'would-you-rather',
             description: 'Gets a random would you rather question.'
         });
     }
diff --git a/commands/randomimg/xiaopai.js b/commands/randomimg/xiaopai.js
index 95ffb42f..022d78a0 100644
--- a/commands/randomimg/xiaopai.js
+++ b/commands/randomimg/xiaopai.js
@@ -4,7 +4,7 @@ const xiaos = require('./xiaos');
 module.exports = class XiaoCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'xiaopai',
+            name: 'xiao-pai',
             aliases: [
                 'xiao'
             ],
diff --git a/commands/response/8ball.js b/commands/response/8ball.js
index 1afb1083..398fcd90 100644
--- a/commands/response/8ball.js
+++ b/commands/response/8ball.js
@@ -5,9 +5,9 @@ const answers = require('./8ballanswers');
 module.exports = class MagicBallCommand extends Command {
     constructor(client) {
         super(client, {
-            name: '8ball',
+            name: '8-ball',
             group: 'response',
-            memberName: '8ball',
+            memberName: '8-ball',
             description: 'Predicts your future.',
             args: [
                 {
diff --git a/commands/response/coin.js b/commands/response/coin.js
index 27ec3224..ed9146d5 100644
--- a/commands/response/coin.js
+++ b/commands/response/coin.js
@@ -6,7 +6,7 @@ module.exports = class CoinFlipCommand extends Command {
         super(client, {
             name: 'coin',
             aliases: [
-                'coinflip',
+                'coin-flip',
                 'flip'
             ],
             group: 'response',
diff --git a/commands/response/factcore.js b/commands/response/factcore.js
index 08b4df91..cfb10ee9 100644
--- a/commands/response/factcore.js
+++ b/commands/response/factcore.js
@@ -4,9 +4,9 @@ const facts = require('./facts');
 module.exports = class FactCoreCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'factcore',
+            name: 'fact-core',
             group: 'response',
-            memberName: 'factcore',
+            memberName: 'fact-core',
             description: 'Says a random Fact Core quote.'
         });
     }
diff --git a/commands/response/quantumcoin.js b/commands/response/quantumcoin.js
index aff1650b..fe7707bb 100644
--- a/commands/response/quantumcoin.js
+++ b/commands/response/quantumcoin.js
@@ -4,12 +4,12 @@ const sides = ['on nothing', 'on NaN', 'on 0', 'in the air', 'on null'];
 module.exports = class QuantumCoinCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'quantumcoin',
+            name: 'quantum-coin',
             aliases: [
                 'qcoin'
             ],
             group: 'response',
-            memberName: 'quantumcoin',
+            memberName: 'quantum-coin',
             description: 'Flips a coin that lands on nothing.'
         });
     }
diff --git a/commands/response/ratewaifu.js b/commands/response/ratewaifu.js
index a13f2c98..8d7aeee1 100644
--- a/commands/response/ratewaifu.js
+++ b/commands/response/ratewaifu.js
@@ -3,12 +3,12 @@ const { Command } = require('discord.js-commando');
 module.exports = class RateWaifuCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'ratewaifu',
+            name: 'rate-waifu',
             aliases: [
                 'waifu'
             ],
             group: 'response',
-            memberName: 'ratewaifu',
+            memberName: 'rate-waifu',
             description: 'Rates your Waifu.',
             args: [
                 {
diff --git a/commands/roleplay/falconpunch.js b/commands/roleplay/falconpunch.js
index 5959eae4..b39ce84b 100644
--- a/commands/roleplay/falconpunch.js
+++ b/commands/roleplay/falconpunch.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class FalconPunchCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'falconpunch',
+            name: 'falcon-punch',
             group: 'roleplay',
-            memberName: 'falconpunch',
+            memberName: 'falcon-punch',
             description: 'Falcon Punches something/someone.',
             args: [
                 {
diff --git a/commands/roleplay/fistbump.js b/commands/roleplay/fistbump.js
index 77f72a07..48eb0e28 100644
--- a/commands/roleplay/fistbump.js
+++ b/commands/roleplay/fistbump.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class FistBumpCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'fistbump',
+            name: 'fist-bump',
             group: 'roleplay',
-            memberName: 'fistbump',
+            memberName: 'fist-bump',
             description: 'Fistbumps something/someone.',
             args: [
                 {
diff --git a/commands/roleplay/highfive.js b/commands/roleplay/highfive.js
index 6625d1c4..6d0c960d 100644
--- a/commands/roleplay/highfive.js
+++ b/commands/roleplay/highfive.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class HighFivesCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'highfive',
+            name: 'high-five',
             group: 'roleplay',
-            memberName: 'highfive',
+            memberName: 'high-five',
             description: 'High Fives something/someone.',
             args: [
                 {
diff --git a/commands/roleplay/hitwithshovel.js b/commands/roleplay/hitwithshovel.js
index de986dec..b427c359 100644
--- a/commands/roleplay/hitwithshovel.js
+++ b/commands/roleplay/hitwithshovel.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class HitwithShovelCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'hitwithshovel',
+            name: 'hit-with-shovel',
             group: 'roleplay',
-            memberName: 'hitwithsovel',
+            memberName: 'hit-with-shovel',
             description: 'Hits something/someone with a shovel.',
             args: [
                 {
diff --git a/commands/roleplay/inhales.js b/commands/roleplay/inhale.js
similarity index 100%
rename from commands/roleplay/inhales.js
rename to commands/roleplay/inhale.js
diff --git a/commands/roleplay/marries.js b/commands/roleplay/marry.js
similarity index 100%
rename from commands/roleplay/marries.js
rename to commands/roleplay/marry.js
diff --git a/commands/search/botinfo.js b/commands/search/botinfo.js
index 392068ba..bbadcada 100644
--- a/commands/search/botinfo.js
+++ b/commands/search/botinfo.js
@@ -5,9 +5,9 @@ const request = require('superagent');
 module.exports = class BotSearchCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'botinfo',
+            name: 'bot-info',
             group: 'search',
-            memberName: 'botinfo',
+            memberName: 'bot-info',
             description: 'Searches Discord Bots for info on a bot.',
             args: [
                 {
diff --git a/commands/search/discrim.js b/commands/search/discrim.js
index 9b7790e2..e675cf1e 100644
--- a/commands/search/discrim.js
+++ b/commands/search/discrim.js
@@ -7,7 +7,7 @@ module.exports = class DiscrimCommand extends Command {
             name: 'discrim',
             aliases: [
                 'discriminator',
-                'searchdiscrim'
+                'search-discrim'
             ],
             group: 'search',
             memberName: 'discrim',
diff --git a/commands/search/yugioh.js b/commands/search/yugioh.js
index 39e09e35..9dad35c1 100644
--- a/commands/search/yugioh.js
+++ b/commands/search/yugioh.js
@@ -5,9 +5,9 @@ const request = require('superagent');
 module.exports = class YuGiOhCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'yugioh',
+            name: 'yu-gi-oh',
             group: 'search',
-            memberName: 'yugioh',
+            memberName: 'yu-gi-oh',
             description: 'Gets info on a Yu-Gi-Oh! Card.',
             args: [
                 {
diff --git a/commands/textedit/cowsay.js b/commands/textedit/cowsay.js
index 4aa8d752..75439249 100644
--- a/commands/textedit/cowsay.js
+++ b/commands/textedit/cowsay.js
@@ -4,9 +4,9 @@ const { stripIndent } = require('common-tags');
 module.exports = class CowsayCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'cowsay',
+            name: 'cow-say',
             group: 'textedit',
-            memberName: 'cowsay',
+            memberName: 'cow-say',
             description: 'Converts text to cowsay.',
             args: [
                 {
diff --git a/commands/textedit/upsidedown.js b/commands/textedit/upsidedown.js
index c32d2e06..f57eadf7 100644
--- a/commands/textedit/upsidedown.js
+++ b/commands/textedit/upsidedown.js
@@ -5,12 +5,12 @@ const dictionary = require('./udmappings');
 module.exports = class UpsideDownCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'upsidedown',
+            name: 'upside-down',
             aliases: [
                 'udown'
             ],
             group: 'textedit',
-            memberName: 'upsidedown',
+            memberName: 'upside-down',
             description: 'Flips text upside-down.',
             args: [
                 {
diff --git a/commands/textedit/webhook.js b/commands/textedit/webhook.js
index b794e6e0..422c245a 100644
--- a/commands/textedit/webhook.js
+++ b/commands/textedit/webhook.js
@@ -7,7 +7,7 @@ module.exports = class WebhookCommand extends Command {
             name: 'webhook',
             aliases: [
                 'rin',
-                'rinsay'
+                'rin-say'
             ],
             group: 'textedit',
             memberName: 'webhook',
diff --git a/commands/userinfo/userinfo.js b/commands/userinfo/userinfo.js
index 769fd1e3..afb63802 100644
--- a/commands/userinfo/userinfo.js
+++ b/commands/userinfo/userinfo.js
@@ -9,9 +9,9 @@ module.exports = class UserInfoCommand extends Command {
         super(client, {
             name: 'user',
             aliases: [
-                'userinfo',
+                'user-info',
                 'member',
-                'memberinfo'
+                'member-info'
             ],
             group: 'userinfo',
             memberName: 'user',
diff --git a/commands/util/clearsetting.js b/commands/util/clearsetting.js
index 236140ef..3748e191 100644
--- a/commands/util/clearsetting.js
+++ b/commands/util/clearsetting.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class ClearSettingCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'clearsetting',
+            name: 'clear-setting',
             group: 'util',
-            memberName: 'clearsetting',
+            memberName: 'clear-setting',
             description: 'Removes a custom-set Mod Channel, Member Channel, Staff Role, or Single Role.',
             guildOnly: true,
             args: [
diff --git a/commands/util/memberchannel.js b/commands/util/memberchannel.js
index 6b9517fe..a15fb1cd 100644
--- a/commands/util/memberchannel.js
+++ b/commands/util/memberchannel.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class MemberLogCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'memberchannel',
+            name: 'member-channel',
             group: 'util',
-            memberName: 'memberchannel',
+            memberName: 'member-channel',
             description: 'Sets the channel for the member logs to be sent.',
             guildOnly: true,
             args: [
diff --git a/commands/util/modchannel.js b/commands/util/modchannel.js
index 0968c823..b1bc5c61 100644
--- a/commands/util/modchannel.js
+++ b/commands/util/modchannel.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class ModChannelCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'modchannel',
+            name: 'mod-channel',
             group: 'util',
-            memberName: 'modchannel',
+            memberName: 'mod-channel',
             description: 'Sets the channel for the mod logs to be sent.',
             guildOnly: true,
             args: [
diff --git a/commands/util/shardinfo.js b/commands/util/shardinfo.js
index fd26dad1..081a95ba 100644
--- a/commands/util/shardinfo.js
+++ b/commands/util/shardinfo.js
@@ -6,18 +6,22 @@ require('moment-duration-format');
 module.exports = class ShardInfoCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'shardinfo',
+            name: 'shard-info',
             aliases: [
                 'shard'
             ],
             group: 'util',
-            memberName: 'shardinfo',
+            memberName: 'shard-info',
             description: 'Gives some bot info for the Shard you specify.',
             args: [
                 {
                     key: 'shard',
                     prompt: 'Which Shard would you like to get data for?',
-                    type: 'integer'
+                    type: 'integer',
+                    validate: shard => {
+                        if(shard < this.client.options.shardCount || shard > -1) return true;
+                        return 'Invalid Shard ID';
+                    }
                 }
             ]
         });
@@ -28,8 +32,6 @@ module.exports = class ShardInfoCommand extends Command {
             if(!msg.channel.permissionsFor(this.client.user).has('EMBED_LINKS'))
                 return msg.say('This Command requires the `Embed Links` Permission.');
         const { shard } = args;
-        if(shard > this.client.options.shardCount - 1 || shard < 0)
-            return msg.say('The Shard ID is not valid.');
         const memory = await this.client.shard.broadcastEval('Math.round(process.memoryUsage().heapUsed / 1024 / 1024)');
         const uptime = await this.client.shard.fetchClientValues('uptime');
         const guilds = await this.client.shard.fetchClientValues('guilds.size');
diff --git a/commands/util/singlerole.js b/commands/util/singlerole.js
index a630774f..e8d4a27f 100644
--- a/commands/util/singlerole.js
+++ b/commands/util/singlerole.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class SingleRoleCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'singlerole',
+            name: 'single-role',
             group: 'util',
-            memberName: 'singlerole',
+            memberName: 'single-role',
             description: 'Sets a single role that is able to use commands.',
             guildOnly: true,
             args: [
diff --git a/commands/util/staffrole.js b/commands/util/staffrole.js
index d2393ac3..5a0a479e 100644
--- a/commands/util/staffrole.js
+++ b/commands/util/staffrole.js
@@ -3,9 +3,9 @@ const { Command } = require('discord.js-commando');
 module.exports = class StaffRoleCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'staffrole',
+            name: 'staff-role',
             group: 'util',
-            memberName: 'staffrole',
+            memberName: 'staff-role',
             description: 'Sets the role that can use Mod Commands without perms.',
             guildOnly: true,
             args: [
diff --git a/package.json b/package.json
index f22ec8a3..b8cee2e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xiaobot",
-  "version": "18.4.0",
+  "version": "18.5.0",
   "description": "A Discord Bot",
   "main": "shardingmanager.js",
   "scripts": {