diff --git a/app/assets/javascripts/discourse/app/components/relative-time.js b/app/assets/javascripts/discourse/app/components/relative-time-picker.js
similarity index 87%
rename from app/assets/javascripts/discourse/app/components/relative-time.js
rename to app/assets/javascripts/discourse/app/components/relative-time-picker.js
index 2527b09cf40..c79d96c8042 100644
--- a/app/assets/javascripts/discourse/app/components/relative-time.js
+++ b/app/assets/javascripts/discourse/app/components/relative-time-picker.js
@@ -39,10 +39,10 @@ export default Component.extend({
   @discourseComputed
   intervals() {
     return [
-      { id: "mins", name: I18n.t("relative_time.minutes") },
-      { id: "hours", name: I18n.t("relative_time.hours") },
-      { id: "days", name: I18n.t("relative_time.days") },
-      { id: "months", name: I18n.t("relative_time.months") },
+      { id: "mins", name: I18n.t("relative_time_picker.minutes") },
+      { id: "hours", name: I18n.t("relative_time_picker.hours") },
+      { id: "days", name: I18n.t("relative_time_picker.days") },
+      { id: "months", name: I18n.t("relative_time_picker.months") },
     ];
   },
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
index 17dafbfb846..b152d422be7 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
@@ -24,7 +24,7 @@
   {{#if useDuration}}
     <div class="controls">
       <label class="control-label">Duration</label>
-      {{relative-time onChange=(action "durationChanged") durationMinutes=(readonly topicTimer.duration_minutes)}}
+      {{relative-time-picker onChange=(action "durationChanged") durationMinutes=(readonly topicTimer.duration_minutes)}}
     </div>
   {{/if}}
   {{#if willCloseImmediately}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/relative-time.hbs b/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
similarity index 88%
rename from app/assets/javascripts/discourse/app/templates/components/relative-time.hbs
rename to app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
index a8bd91a2fa9..240b5a639e7 100644
--- a/app/assets/javascripts/discourse/app/templates/components/relative-time.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
@@ -1,4 +1,4 @@
-<div class="relative-time">
+<div class="relative-time-picker">
   {{input class="relative-time-duration" min="0.1" step="0.01" type="number" value=duration onChange=(action "onChangeDuration")}}
   {{combo-box
     content=intervals
diff --git a/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
index 52bd9613dac..438942bcb39 100644
--- a/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
@@ -29,7 +29,7 @@
     {{#if option.isRelativeTimeShortcut}}
       {{#if relativeTimeSelected}}
         <div class="control-group custom-date-time-wrap">
-          {{relative-time onChange=(action "relativeTimeChanged")}}
+          {{relative-time-picker onChange=(action "relativeTimeChanged")}}
         </div>
       {{/if}}
     {{/if}}
diff --git a/app/assets/stylesheets/common/components/_index.scss b/app/assets/stylesheets/common/components/_index.scss
index dd37f9edbef..57eb631bd2d 100644
--- a/app/assets/stylesheets/common/components/_index.scss
+++ b/app/assets/stylesheets/common/components/_index.scss
@@ -17,7 +17,7 @@
 @import "ignored-user-list";
 @import "keyboard_shortcuts";
 @import "navs";
-@import "relative-time";
+@import "relative-time-picker";
 @import "share-and-invite-modal";
 @import "svg";
 @import "tap-tile";
diff --git a/app/assets/stylesheets/common/components/relative-time.scss b/app/assets/stylesheets/common/components/relative-time-picker.scss
similarity index 89%
rename from app/assets/stylesheets/common/components/relative-time.scss
rename to app/assets/stylesheets/common/components/relative-time-picker.scss
index 579a477f371..a2e4eff4e38 100644
--- a/app/assets/stylesheets/common/components/relative-time.scss
+++ b/app/assets/stylesheets/common/components/relative-time-picker.scss
@@ -1,4 +1,4 @@
-.relative-time {
+.relative-time-picker {
   display: flex;
   flex-wrap: wrap;
 
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 81a96d6071b..e04325b0906 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -575,7 +575,7 @@ en:
         title: "Why are you rejecting this user?"
         send_email: "Send rejection email"
 
-    relative_time:
+    relative_time_picker:
       minutes: "minute(s)"
       hours: "hour(s)"
       days: "day(s)"