diff --git a/assets/images/3000years.png b/assets/images/3000-years.png
similarity index 100%
rename from assets/images/3000years.png
rename to assets/images/3000-years.png
diff --git a/assets/images/bobross.png b/assets/images/bob-ross.png
similarity index 100%
rename from assets/images/bobross.png
rename to assets/images/bob-ross.png
diff --git a/assets/images/steamcard.png b/assets/images/steam-card.png
similarity index 100%
rename from assets/images/steamcard.png
rename to assets/images/steam-card.png
diff --git a/assets/images/xiaopai1.png b/assets/images/xiao1.png
similarity index 100%
rename from assets/images/xiaopai1.png
rename to assets/images/xiao1.png
diff --git a/assets/images/xiaopai10.png b/assets/images/xiao10.png
similarity index 100%
rename from assets/images/xiaopai10.png
rename to assets/images/xiao10.png
diff --git a/assets/images/xiaopai2.png b/assets/images/xiao2.png
similarity index 100%
rename from assets/images/xiaopai2.png
rename to assets/images/xiao2.png
diff --git a/assets/images/xiaopai3.png b/assets/images/xiao3.png
similarity index 100%
rename from assets/images/xiaopai3.png
rename to assets/images/xiao3.png
diff --git a/assets/images/xiaopai4.png b/assets/images/xiao4.png
similarity index 100%
rename from assets/images/xiaopai4.png
rename to assets/images/xiao4.png
diff --git a/assets/images/xiaopai5.png b/assets/images/xiao5.png
similarity index 100%
rename from assets/images/xiaopai5.png
rename to assets/images/xiao5.png
diff --git a/assets/images/xiaopai6.png b/assets/images/xiao6.png
similarity index 100%
rename from assets/images/xiaopai6.png
rename to assets/images/xiao6.png
diff --git a/assets/images/xiaopai7.png b/assets/images/xiao7.png
similarity index 100%
rename from assets/images/xiaopai7.png
rename to assets/images/xiao7.png
diff --git a/assets/images/xiaopai8.png b/assets/images/xiao8.png
similarity index 100%
rename from assets/images/xiaopai8.png
rename to assets/images/xiao8.png
diff --git a/assets/images/xiaopai9.png b/assets/images/xiao9.png
similarity index 100%
rename from assets/images/xiaopai9.png
rename to assets/images/xiao9.png
diff --git a/assets/json/8ball.json b/assets/json/8-ball.json
similarity index 100%
rename from assets/json/8ball.json
rename to assets/json/8-ball.json
diff --git a/assets/json/clearsetting.json b/assets/json/clear-setting.json
similarity index 100%
rename from assets/json/clearsetting.json
rename to assets/json/clear-setting.json
diff --git a/assets/json/easteregg.json b/assets/json/easter-egg.json
similarity index 100%
rename from assets/json/easteregg.json
rename to assets/json/easter-egg.json
diff --git a/assets/json/factcore.json b/assets/json/fact-core.json
similarity index 100%
rename from assets/json/factcore.json
rename to assets/json/fact-core.json
diff --git a/assets/json/magicconch.json b/assets/json/magic-conch.json
similarity index 100%
rename from assets/json/magicconch.json
rename to assets/json/magic-conch.json
diff --git a/assets/json/typinggame.json b/assets/json/typing-game.json
similarity index 100%
rename from assets/json/typinggame.json
rename to assets/json/typing-game.json
diff --git a/assets/json/upsidedown.json b/assets/json/upside-down.json
similarity index 100%
rename from assets/json/upsidedown.json
rename to assets/json/upside-down.json
diff --git a/commands/avataredit/3000-years.js b/commands/avataredit/3000-years.js
index 6b2245e4..0a34b174 100644
--- a/commands/avataredit/3000-years.js
+++ b/commands/avataredit/3000-years.js
@@ -40,7 +40,7 @@ module.exports = class YearsCommand extends Command {
                 ctx.drawImage(base, 0, 0);
                 ctx.drawImage(avatar, 461, 127, 200, 200);
             };
-            base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', '3000years.png'));
+            base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', '3000-years.png'));
             const { body } = await snekfetch.get(avatarURL);
             avatar.src = body;
             generate();
diff --git a/commands/avataredit/bob-ross.js b/commands/avataredit/bob-ross.js
index 4e00ff0c..1dff78d0 100644
--- a/commands/avataredit/bob-ross.js
+++ b/commands/avataredit/bob-ross.js
@@ -44,7 +44,7 @@ module.exports = class BobRossCommand extends Command {
                 ctx.rotate(-3 * Math.PI / 180);
                 ctx.drawImage(base, 0, 0);
             };
-            base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'bobross.png'));
+            base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'bob-ross.png'));
             const { body } = await snekfetch.get(avatarURL);
             avatar.src = body;
             generate();
diff --git a/commands/avataredit/steam-card.js b/commands/avataredit/steam-card.js
index afdd18c3..7edfe769 100644
--- a/commands/avataredit/steam-card.js
+++ b/commands/avataredit/steam-card.js
@@ -45,7 +45,7 @@ module.exports = class SteamCardCommand extends Command {
                 ctx.font = '30px Open Sans';
 			    ctx.fillText(username, 35, 48);
             };
-            base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'steamcard.png'));
+            base.src = await fs.readFileAsync(path.join(__dirname, '..', '..', 'assets', 'images', 'steam-card.png'));
             const { body } = await snekfetch.get(avatarURL);
             avatar.src = body;
             generate();
diff --git a/commands/games/typing-game.js b/commands/games/typing-game.js
index 4cce751b..68ce74a9 100644
--- a/commands/games/typing-game.js
+++ b/commands/games/typing-game.js
@@ -1,6 +1,6 @@
 const { Command } = require('discord.js-commando');
 const { RichEmbed } = require('discord.js');
-const sentences = require('../../assets/json/typinggame');
+const sentences = require('../../assets/json/typing-game');
 
 module.exports = class TypingGameCommand extends Command {
     constructor(client) {
diff --git a/commands/random/easter-egg.js b/commands/random/easter-egg.js
index e67c1eec..14c5a44c 100644
--- a/commands/random/easter-egg.js
+++ b/commands/random/easter-egg.js
@@ -1,5 +1,5 @@
 const { Command } = require('discord.js-commando');
-const eastereggs = require('../../assets/json/easteregg');
+const eastereggs = require('../../assets/json/easter-egg');
 
 module.exports = class EasterEggCommand extends Command {
     constructor(client) {
diff --git a/commands/randomimg/xiao-pai.js b/commands/randomimg/xiao.js
similarity index 83%
rename from commands/randomimg/xiao-pai.js
rename to commands/randomimg/xiao.js
index 5053302a..ba65a463 100644
--- a/commands/randomimg/xiao-pai.js
+++ b/commands/randomimg/xiao.js
@@ -4,10 +4,10 @@ const path = require('path');
 module.exports = class XiaoCommand extends Command {
     constructor(client) {
         super(client, {
-            name: 'xiao-pai',
-            aliases: ['xiao'],
+            name: 'xiao',
+            aliases: ['xiao-pai'],
             group: 'randomimg',
-            memberName: 'xiao-pai',
+            memberName: 'xiao',
             description: 'Sends a random image of Xiao Pai.'
         });
     }
@@ -17,7 +17,7 @@ module.exports = class XiaoCommand extends Command {
             if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES'))
                 return msg.say('This Command requires the `Attach Files` Permission.');
         const xiao = Math.floor(Math.random() * 10) + 1;
-        return msg.say({ files: [path.join(__dirname, '..', '..', 'assets', 'images', `xiaopai${xiao}.png`)] })
+        return msg.say({ files: [path.join(__dirname, '..', '..', 'assets', 'images', `xiao${xiao}.png`)] })
             .catch(err => msg.say(`${err.name}: ${err.message}`));
     }
 };
diff --git a/commands/response/8-ball.js b/commands/response/8-ball.js
index 0405f7c5..58236d0a 100644
--- a/commands/response/8-ball.js
+++ b/commands/response/8-ball.js
@@ -1,6 +1,6 @@
 const { Command } = require('discord.js-commando');
 const { stripIndents } = require('common-tags');
-const answers = require('../../assets/json/8ball');
+const answers = require('../../assets/json/8-ball');
 
 module.exports = class MagicBallCommand extends Command {
     constructor(client) {
diff --git a/commands/response/fact-core.js b/commands/response/fact-core.js
index 5ba0726f..a69cc085 100644
--- a/commands/response/fact-core.js
+++ b/commands/response/fact-core.js
@@ -1,5 +1,5 @@
 const { Command } = require('discord.js-commando');
-const facts = require('../../assets/json/factcore');
+const facts = require('../../assets/json/fact-core');
 
 module.exports = class FactCoreCommand extends Command {
     constructor(client) {
diff --git a/commands/response/magic-conch.js b/commands/response/magic-conch.js
index 41e76cdf..44762915 100644
--- a/commands/response/magic-conch.js
+++ b/commands/response/magic-conch.js
@@ -1,6 +1,6 @@
 const { Command } = require('discord.js-commando');
 const { stripIndents } = require('common-tags');
-const answers = require('../../assets/json/magicconch');
+const answers = require('../../assets/json/magic-conch');
 
 module.exports = class MagicConchCommand extends Command {
     constructor(client) {
diff --git a/commands/settings/clear-setting.js b/commands/settings/clear-setting.js
index 3a659568..d95fbee2 100644
--- a/commands/settings/clear-setting.js
+++ b/commands/settings/clear-setting.js
@@ -1,5 +1,5 @@
 const { Command } = require('discord.js-commando');
-const settings = require('../../assets/json/clearsetting');
+const settings = require('../../assets/json/clear-setting');
 
 module.exports = class ClearSettingCommand extends Command {
     constructor(client) {
diff --git a/commands/textedit/upside-down.js b/commands/textedit/upside-down.js
index 66283f79..be469c0d 100644
--- a/commands/textedit/upside-down.js
+++ b/commands/textedit/upside-down.js
@@ -1,6 +1,6 @@
 const { Command } = require('discord.js-commando');
 const { letterTrans } = require('custom-translate');
-const dictionary = require('../../assets/json/upsidedown');
+const dictionary = require('../../assets/json/upside-down');
 
 module.exports = class UpsideDownCommand extends Command {
     constructor(client) {