diff --git a/commands/guild-info/server-info.js b/commands/guild-info/server-info.js
index fb0c66ca..54749b54 100644
--- a/commands/guild-info/server-info.js
+++ b/commands/guild-info/server-info.js
@@ -3,7 +3,7 @@ const { MessageEmbed } = require('discord.js');
 const filterLevels = ['Off', 'No Role', 'Everyone'];
 const verificationLevels = ['None', 'Low', 'Medium', '(╯°□°）╯︵ ┻━┻', '┻━┻ ﾐヽ(ಠ益ಠ)ノ彡┻━┻'];
 
-module.exports = class GuildInfoCommand extends Command {
+module.exports = class ServerInfoCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'server-info',
diff --git a/commands/random-res/8-ball.js b/commands/random-res/8-ball.js
index 9be81e49..b54dbd17 100644
--- a/commands/random-res/8-ball.js
+++ b/commands/random-res/8-ball.js
@@ -2,7 +2,7 @@ const Command = require('../../structures/Command');
 const { stripIndents } = require('common-tags');
 const answers = require('../../assets/json/8-ball');
 
-module.exports = class MagicBallCommand extends Command {
+module.exports = class EightBallCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: '8-ball',
diff --git a/commands/random-res/coin.js b/commands/random-res/coin.js
index 79eaa01d..a023966c 100644
--- a/commands/random-res/coin.js
+++ b/commands/random-res/coin.js
@@ -1,7 +1,7 @@
 const Command = require('../../structures/Command');
 const sides = ['heads', 'tails'];
 
-module.exports = class CoinFlipCommand extends Command {
+module.exports = class CoinCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'coin',
diff --git a/commands/random/word-of-the-day.js b/commands/random/word-of-the-day.js
index 358edced..02bf07f3 100644
--- a/commands/random/word-of-the-day.js
+++ b/commands/random/word-of-the-day.js
@@ -3,7 +3,7 @@ const { MessageEmbed } = require('discord.js');
 const snekfetch = require('snekfetch');
 const { WORDNIK_KEY } = process.env;
 
-module.exports = class DefineCommand extends Command {
+module.exports = class WordOfTheDayCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'word-of-the-day',
diff --git a/commands/roleplay/high-five.js b/commands/roleplay/high-five.js
index d8784262..83d80f1b 100644
--- a/commands/roleplay/high-five.js
+++ b/commands/roleplay/high-five.js
@@ -8,7 +8,7 @@ const gifs = [
 	'https://i.imgur.com/2DdIR5H.gif'
 ];
 
-module.exports = class HighFivesCommand extends Command {
+module.exports = class HighFiveCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'high-five',
diff --git a/commands/roleplay/hit-with-shovel.js b/commands/roleplay/hit-with-shovel.js
index 99481bec..f378cd70 100644
--- a/commands/roleplay/hit-with-shovel.js
+++ b/commands/roleplay/hit-with-shovel.js
@@ -1,7 +1,7 @@
 const Command = require('../../structures/Command');
 const { stripIndents } = require('common-tags');
 
-module.exports = class HitwithShovelCommand extends Command {
+module.exports = class HitWithShovelCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'hit-with-shovel',
diff --git a/commands/search/bot-info.js b/commands/search/bot-info.js
index 3d8d6f6f..b8780c74 100644
--- a/commands/search/bot-info.js
+++ b/commands/search/bot-info.js
@@ -3,7 +3,7 @@ const { MessageEmbed } = require('discord.js');
 const snekfetch = require('snekfetch');
 const { DBOTS_KEY } = process.env;
 
-module.exports = class BotSearchCommand extends Command {
+module.exports = class BotInfoCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'bot-info',
diff --git a/commands/search/itunes.js b/commands/search/itunes.js
index eacaebd1..760001d0 100644
--- a/commands/search/itunes.js
+++ b/commands/search/itunes.js
@@ -4,7 +4,7 @@ const snekfetch = require('snekfetch');
 const { list } = require('../../structures/Util');
 const countries = ['us', 'jp'];
 
-module.exports = class iTunesCommand extends Command {
+module.exports = class ITunesCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'itunes',
diff --git a/commands/text-edit/cow-say.js b/commands/text-edit/cow-say.js
index f4468a6c..d7cd7d61 100644
--- a/commands/text-edit/cow-say.js
+++ b/commands/text-edit/cow-say.js
@@ -1,7 +1,7 @@
 const Command = require('../../structures/Command');
 const { stripIndent } = require('common-tags');
 
-module.exports = class CowsayCommand extends Command {
+module.exports = class CowSayCommand extends Command {
 	constructor(client) {
 		super(client, {
 			name: 'cow-say',