diff --git a/listeners/commandblocked.js b/listeners/commandblocked.js
index fc92a050..6fed8c79 100644
--- a/listeners/commandblocked.js
+++ b/listeners/commandblocked.js
@@ -4,7 +4,7 @@ class CommandBlockedListener extends Listener {
 	constructor() {
 		super('commandBlocked', {
 			emitter: 'commandHandler',
-			eventName: 'commandBlocked'
+			event: 'commandBlocked'
 		});
 	}
 
diff --git a/listeners/guildCreate.js b/listeners/guildCreate.js
index c20b9f2c..aba20968 100644
--- a/listeners/guildCreate.js
+++ b/listeners/guildCreate.js
@@ -7,7 +7,7 @@ class guildCreateListener extends Listener {
 	constructor() {
 		super('guildCreate', {
 			emitter: 'client',
-			eventName: 'guildCreate'
+			event: 'guildCreate'
 		});
 	}
 
diff --git a/listeners/guildDelete.js b/listeners/guildDelete.js
index c6ba9741..7c993c59 100644
--- a/listeners/guildDelete.js
+++ b/listeners/guildDelete.js
@@ -7,7 +7,7 @@ class guildCreateListener extends Listener {
 	constructor() {
 		super('guildDelete', {
 			emitter: 'client',
-			eventName: 'guildDelete'
+			event: 'guildDelete'
 		});
 	}
 
diff --git a/listeners/message.js b/listeners/message.js
index cd855d63..2085e020 100644
--- a/listeners/message.js
+++ b/listeners/message.js
@@ -4,11 +4,11 @@ const reactObject = require('../json/react.json');
 const imgResponseObject = require('../json/imgreply.json');
 const reload = require('auto-reload');
 
-class MessageListener extends Listener {
+class messageListener extends Listener {
 	constructor() {
 		super('message', {
 			emitter: 'client',
-			eventName: 'message'
+			event: 'message'
 		});
 	}
 
@@ -16,14 +16,14 @@ class MessageListener extends Listener {
 		let autoresponse = reload('../json/autoresponse.json');
 		let message_content = message.content.toLowerCase();
 		let customresponse = reload(`../tag/${message.guild.id}.json`);
-
+	
 		if (message.author.bot) return; {
-
+	
 			//  User autoresponse
 			if(customresponse[message_content]) {
 				message.channel.send(customresponse[message_content]);
 			}
-
+	
 			//  If autoresponse is enable send the response
 			if(autoresponse[message.channel.id] == 'enable') {
 			//  Reply with images as attachement
@@ -44,9 +44,9 @@ class MessageListener extends Listener {
 				} else if (message_content.includes('jeff')) {
 					message.react('496028845967802378');
 				}
-			}				
+			}		
 		}
 	}
 }
 
-module.exports = MessageListener;
\ No newline at end of file
+module.exports = messageListener;
\ No newline at end of file
diff --git a/listeners/messageReactionAdd.js b/listeners/messageReactionAdd.js
index 4c2e247e..a1c82574 100644
--- a/listeners/messageReactionAdd.js
+++ b/listeners/messageReactionAdd.js
@@ -6,7 +6,7 @@ class MessageReactionAddListener extends Listener {
 	constructor() {
 		super('messagereactionadd', {
 			emitter: 'client',
-			eventName: 'messageReactionAdd'
+			event: 'messageReactionAdd'
 		});
 	}