diff --git a/commands/general/say.js b/commands/general/say.js
index e985f5d..0c3039e 100644
--- a/commands/general/say.js
+++ b/commands/general/say.js
@@ -23,13 +23,11 @@ class SayCommand extends Command {
     async exec(message, args) {
         let text = args.text;
 
-        if (!text) return;
-
         //      Load all the different files
         const verb = require('../../dictionary/verbs.json')
         const noun = require('../../dictionary/noun.json')
-        const adverbs = require('../../dictionary/adjectives.json')
-        const adjective = require('../../dictionary/adverbs.json')
+        const adjective = require('../../dictionary/adjectives.json')
+        const adverbs = require('../../dictionary/adverbs.json')
         const activities = require('../../dictionary/activities.json')
         const celebreties = require('../../dictionary/celebreties.json')
         const countries = require('../../dictionary/countries.json')
@@ -53,12 +51,12 @@ class SayCommand extends Command {
 //      Replace with a random word from the json
         do {
         text = text.replace(/\[verb\]/, verb[randNumber(verb)])
-        text = text.replace(/\[adverbs\]/, adverbs[randNumber(adverbs)])
+        text = text.replace(/\[adverb\]/, adverbs[randNumber(adverbs)])
         text = text.replace(/\[noun\]/, noun[randNumber(noun)])
         text = text.replace(/\[adjective\]/, adjective[randNumber(adjective)])
-        text = text.replace(/\[activities\]/, activities[randNumber(activities)])
-        text = text.replace(/\[celebrities\]/, celebreties[randNumber(celebreties)])
-        text = text.replace(/\[countries\]/, countries[randNumber(countries)])
+        text = text.replace(/\[activity\]/, activities[randNumber(activities)])
+        text = text.replace(/\[celebrity\]/, celebreties[randNumber(celebreties)])
+        text = text.replace(/\[country\]/, countries[randNumber(countries)])
         text = text.replace(/\[diseases\]/, diseases[randNumber(diseases)])
         text = text.replace(/\[elements\]/, elements[randNumber(elements)])
         text = text.replace(/\[hobbies\]/, hobbies[randNumber(hobbies)])
diff --git a/commands/general/sayd.js b/commands/general/sayd.js
index 227e872..612f24e 100644
--- a/commands/general/sayd.js
+++ b/commands/general/sayd.js
@@ -27,8 +27,8 @@ class SayCommand extends Command {
         //      Load all the different files
         const verb = require('../../dictionary/verbs.json')
         const noun = require('../../dictionary/noun.json')
-        const adverbs = require('../../dictionary/adjectives.json')
-        const adjective = require('../../dictionary/adverbs.json')
+        const adjective = require('../../dictionary/adjectives.json')
+        const adverbs = require('../../dictionary/adverbs.json')
         const activities = require('../../dictionary/activities.json')
         const celebreties = require('../../dictionary/celebreties.json')
         const countries = require('../../dictionary/countries.json')
@@ -52,12 +52,12 @@ class SayCommand extends Command {
 //      Replace with a random word from the json
         do {
         text = text.replace(/\[verb\]/, verb[randNumber(verb)])
-        text = text.replace(/\[adverbs\]/, adverbs[randNumber(adverbs)])
+        text = text.replace(/\[adverb\]/, adverbs[randNumber(adverbs)])
         text = text.replace(/\[noun\]/, noun[randNumber(noun)])
         text = text.replace(/\[adjective\]/, adjective[randNumber(adjective)])
-        text = text.replace(/\[activities\]/, activities[randNumber(activities)])
-        text = text.replace(/\[celebrities\]/, celebreties[randNumber(celebreties)])
-        text = text.replace(/\[countries\]/, countries[randNumber(countries)])
+        text = text.replace(/\[activity\]/, activities[randNumber(activities)])
+        text = text.replace(/\[celebrity\]/, celebreties[randNumber(celebreties)])
+        text = text.replace(/\[country\]/, countries[randNumber(countries)])
         text = text.replace(/\[diseases\]/, diseases[randNumber(diseases)])
         text = text.replace(/\[elements\]/, elements[randNumber(elements)])
         text = text.replace(/\[hobbies\]/, hobbies[randNumber(hobbies)])