diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index 311782a68b1..c1e03a6aca6 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="admin.user.suspend_modal_title"}}
   <div class='until-controls'>
     <label>
-      {{auto-update-input
+      {{future-date-input
         class="suspend-until"
         label="admin.user.suspend_duration"
         input=suspendUntil}}
diff --git a/app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6 b/app/assets/javascripts/discourse/components/future-date-input-selector.js.es6
similarity index 96%
rename from app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6
rename to app/assets/javascripts/discourse/components/future-date-input-selector.js.es6
index 0ad58a506cc..f4c9a00fc86 100644
--- a/app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/future-date-input-selector.js.es6
@@ -15,7 +15,7 @@ export const SET_BASED_ON_LAST_POST = 'set_based_on_last_post';
 export const FORMAT = 'YYYY-MM-DD HH:mm';
 
 export default Combobox.extend({
-  classNames: ['auto-update-input-selector'],
+  classNames: ['future-date-input-selector'],
   isCustom: Ember.computed.equal("value", PICK_DATE_AND_TIME),
 
   @computed()
@@ -128,13 +128,13 @@ export default Combobox.extend({
     let output = "";
 
     if (!Ember.isEmpty(icons)) {
-      output += `<span class='auto-update-input-selector-icons'>${icons}</span>`;
+      output += `<span class='future-date-input-selector-icons'>${icons}</span>`;
     }
 
     output += `<span>${state.text}</span>`;
 
     if (time) {
-      output += `<span class='auto-update-input-selector-datetime'>${time}</span>`;
+      output += `<span class='future-date-input-selector-datetime'>${time}</span>`;
     }
 
     return output;
diff --git a/app/assets/javascripts/discourse/components/auto-update-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js.es6
similarity index 98%
rename from app/assets/javascripts/discourse/components/auto-update-input.js.es6
rename to app/assets/javascripts/discourse/components/future-date-input.js.es6
index 900ecfa34e3..c7f63d528db 100644
--- a/app/assets/javascripts/discourse/components/auto-update-input.js.es6
+++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6
@@ -3,7 +3,7 @@ import {
   FORMAT,
   PICK_DATE_AND_TIME,
   SET_BASED_ON_LAST_POST
-} from "discourse/components/auto-update-input-selector";
+} from "discourse/components/future-date-input-selector";
 
 import { PUBLISH_TO_CATEGORY_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';
 
diff --git a/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
similarity index 94%
rename from app/assets/javascripts/discourse/templates/components/auto-update-input.hbs
rename to app/assets/javascripts/discourse/templates/components/future-date-input.hbs
index 9538d49a181..3f5f9848933 100644
--- a/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
@@ -1,8 +1,8 @@
-<div class="auto-update-input">
+<div class="future-date-input">
   <div class="control-group">
     <label>{{displayLabel}}</label>
 
-    {{auto-update-input-selector
+    {{future-date-input-selector
         valueAttribute="id"
         minimumResultsForSearch=-1
         statusType=statusType
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
index 83a8913ab05..bc01b06634f 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -6,7 +6,7 @@
 
     <div>
       {{#if showTimeOnly}}
-        {{auto-update-input
+        {{future-date-input
             input=updateTime
             statusType=selection
             basedOnLastPost=false}}
@@ -18,13 +18,13 @@
             excludeCategoryId=excludeCategoryId}}
         </div>
 
-        {{auto-update-input
+        {{future-date-input
             input=updateTime
             statusType=selection
             categoryId=topicTimer.category_id
             basedOnLastPost=false}}
       {{else if autoClose}}
-        {{auto-update-input
+        {{future-date-input
             input=updateTime
             statusType=selection
             basedOnLastPost=topicTimer.based_on_last_post
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 233519fcc8c..10b5c883110 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -135,7 +135,7 @@ div.ac-wrap {
   }
 }
 
-.auto-update-input {
+.future-date-input {
   .examples {
     color: lighten($primary, 40%);
   }
diff --git a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
index 25195f0edbf..1c17981d7be 100644
--- a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
+++ b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
@@ -16,7 +16,7 @@
     margin-right: 10px;
   }
 
-  .auto-update-input {
+  .future-date-input {
     input {
       margin: 0;
     }
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 857c4e9e04b..7c7300ebec7 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -298,7 +298,7 @@
 }
 
 .edit-category-modal {
-  .auto-update-input, .num-featured-topics-fields, .position-fields {
+  .future-date-input, .num-featured-topics-fields, .position-fields {
     input[type=text] {
       width: 50px;
     }
diff --git a/app/assets/stylesheets/common/components/auto-update-input-selector.scss b/app/assets/stylesheets/common/components/future-date-input-selector.scss
similarity index 55%
rename from app/assets/stylesheets/common/components/auto-update-input-selector.scss
rename to app/assets/stylesheets/common/components/future-date-input-selector.scss
index 65207f3c1cd..60bab06f26b 100644
--- a/app/assets/stylesheets/common/components/auto-update-input-selector.scss
+++ b/app/assets/stylesheets/common/components/future-date-input-selector.scss
@@ -1,9 +1,9 @@
-.auto-update-input-selector-datetime {
+.future-date-input-selector-datetime {
   float: right;
   color: lighten($primary, 40%);
   font-size: 13px;
 }
 
-.auto-update-input-selector-icons {
+.future-date-input-selector-icons {
   margin-right: 10px;
 }
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 972e18a0763..88044ba265f 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -305,7 +305,7 @@
       display: block;
       bottom: 8px;
     }
-    .auto-update-input .examples {
+    .future-date-input .examples {
       margin-top: 0;
       padding-bottom: 8px;
     }
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index da8a3357fb8..3cd5f0ca3a7 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -207,7 +207,7 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
 }
 
 .edit-topic-timer-modal {
-  .auto-update-input {
+  .future-date-input {
     .alert-info {
       margin: 0 -10px -10px -10px;
       padding: 10px;