diff --git a/database.js b/database.js
index ab1b792..8c90ba0 100644
--- a/database.js
+++ b/database.js
@@ -1,6 +1,6 @@
-import defineRoleEmojiPair from './models/roleEmojiPair.js';
-import defineVoiceChannel from './models/voiceChannel.js';
-import defineMessage from './models/message.js';
+import defineRoleEmojiPair from './models/roleEmojiPairs.js';
+import defineVoiceChannel from './models/voiceChannels.js';
+import defineMessage from './models/messages.js';
 import { Sequelize } from 'sequelize';
 import { config } from 'dotenv';
 config();
diff --git a/models/messages.js b/models/messages.js
index 928d5e1..45f1340 100644
--- a/models/messages.js
+++ b/models/messages.js
@@ -1,15 +1,10 @@
 import { DataTypes } from "sequelize";
 
 export default function(sequelize) {
-	return sequelize.define('Message', {
+	return sequelize.define('Messages', {
 		id: {
 			type: DataTypes.STRING,
 			primaryKey: true,
 		},
-		roleEmojiPair: {
-			deferrable: Deferrable.INITIALLY_IMMEDIATE,
-			model: 'RoleEmojiPair',
-			key: 'id',
-		},
 	});
 }
diff --git a/models/roleEmojiPairs.js b/models/roleEmojiPairs.js
index 7bfe3f1..7814483 100644
--- a/models/roleEmojiPairs.js
+++ b/models/roleEmojiPairs.js
@@ -1,12 +1,20 @@
-import { DataTypes } from "sequelize";
+import { DataTypes, Deferrable } from "sequelize";
 
 export default function(sequelize) {
-	return sequelize.define('RoleEmojiPair', {
+	return sequelize.define('RoleEmojiPairs', {
 		id: {
 			defaultValue: DataTypes.UUIDV4,
 			type: DataTypes.UUID,
 			primaryKey: true,
 		},
+		message: {
+			type: DataTypes.STRING,
+			references: {
+				deferrable: Deferrable.INITIALLY_IMMEDIATE,
+				model: 'Messages',
+				key: 'id',
+			},
+		},
 		role: {
 			type: DataTypes.STRING,
 		},