diff --git a/README.md b/README.md
index ce62ea1a..7cf4e77d 100644
--- a/README.md
+++ b/README.md
@@ -865,11 +865,11 @@ Total: 559
 * **dating:** Find the person of your dreams with this dating system!
 * **portal-send:** Send a message to a portal channel.
 * **prune:** Deletes up to 99 messages from the current channel.
+* **remind:** Sets a reminder.
 * **rename-all:** Renames every member of the server. (Owner-Only)
 * **screenshot:** Takes a screenshot of any webpage.
 * **smilebasic:** Responds with a ZIP file for a SmileBASIC project.
 * **strawpoll:** Generates a Strawpoll with the options you provide.
-* **timer:** Sets a timer for anywhere from 1 second to 10 minutes.
 
 ### Roleplay:
 
diff --git a/commands/other/timer.js b/commands/other/remind.js
similarity index 74%
rename from commands/other/timer.js
rename to commands/other/remind.js
index e775aca6..e1c4763c 100644
--- a/commands/other/timer.js
+++ b/commands/other/remind.js
@@ -1,14 +1,14 @@
 const Command = require('../../structures/Command');
 const moment = require('moment');
 
-module.exports = class TimerCommand extends Command {
+module.exports = class RemindCommand extends Command {
 	constructor(client) {
 		super(client, {
-			name: 'timer',
-			aliases: ['remind', 'remind-me'],
+			name: 'remind',
+			aliases: ['timer', 'remind-me'],
 			group: 'other',
-			memberName: 'timer',
-			description: 'Sets a timer.',
+			memberName: 'remind',
+			description: 'Sets a reminder.',
 			args: [
 				{
 					key: 'time',
@@ -21,7 +21,7 @@ module.exports = class TimerCommand extends Command {
 
 	async run(msg, { time }) {
 		const exists = await this.client.timers.exists(msg.channel.id, msg.author.id);
-		if (exists) return msg.reply('Only one timer can be set per channel per user.');
+		if (exists) return msg.reply('Only one reminder can be set per channel per user.');
 		const timeMs = time.startDate.getTime() - Date.now();
 		const display = moment().add(timeMs, 'ms').fromNow();
 		const title = time.eventTitle || 'something';