diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
index 5e309522b..4c73c9e3d 100644
--- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars
+++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars
@@ -163,7 +163,7 @@
         {{ render 'admin_report_counts' likes }}
         {{ render 'admin_report_counts' flags }}
         {{ render 'admin_report_counts' bookmarks }}
-        {{ render 'admin_report_counts' favorites }}
+        {{ render 'admin_report_counts' starred }}
         {{ render 'admin_report_counts' emails }}
       {{/unless}}
     </table>
diff --git a/app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js b/app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js
index 6860f8509..f900082d3 100644
--- a/app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js
+++ b/app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js
@@ -11,7 +11,7 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
     'g l': '/latest',
     'g n': '/new',
     'g u': '/unread',
-    'g f': '/favorited',
+    'g f': '/starred',
     'g c': '/categories',
     'g t': '/top'
   },
@@ -22,8 +22,8 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
     'd': 'article.selected button.delete',                        // delete selected post
     'e': 'article.selected button.edit',                          // edit selected post
 
-    // favorite topic
-    'f': '#topic-footer-buttons button.favorite, #topic-list tr.topic-list-item.selected a.star',
+    // star topic
+    'f': '#topic-footer-buttons button.star, #topic-list tr.topic-list-item.selected a.star',
 
     'l': 'article.selected button.like',                          // like selected post
     'm m': 'div.notification-options li[data-id="0"] a',          // mark topic as muted
diff --git a/app/assets/javascripts/discourse/controllers/header_controller.js b/app/assets/javascripts/discourse/controllers/header_controller.js
index 54a845de2..cacc847e5 100644
--- a/app/assets/javascripts/discourse/controllers/header_controller.js
+++ b/app/assets/javascripts/discourse/controllers/header_controller.js
@@ -11,7 +11,7 @@ Discourse.HeaderController = Discourse.Controller.extend({
   showExtraInfo: null,
   notifications: null,
 
-  showFavoriteButton: function() {
+  showStarButton: function() {
     return Discourse.User.current() && !this.get('topic.isPrivateMessage');
   }.property('topic.isPrivateMessage'),
 
diff --git a/app/assets/javascripts/discourse/controllers/topic_controller.js b/app/assets/javascripts/discourse/controllers/topic_controller.js
index 6b3724a4b..bf2902c7f 100644
--- a/app/assets/javascripts/discourse/controllers/topic_controller.js
+++ b/app/assets/javascripts/discourse/controllers/topic_controller.js
@@ -325,7 +325,7 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
     return false;
   },
 
-  showFavoriteButton: function() {
+  showStarButton: function() {
     return Discourse.User.current() && !this.get('isPrivateMessage');
   }.property('isPrivateMessage'),
 
diff --git a/app/assets/javascripts/discourse/models/nav_item.js.erb b/app/assets/javascripts/discourse/models/nav_item.js.erb
index 60e3f20f0..6e61c8d77 100644
--- a/app/assets/javascripts/discourse/models/nav_item.js.erb
+++ b/app/assets/javascripts/discourse/models/nav_item.js.erb
@@ -83,7 +83,7 @@ Discourse.NavItem.reopenClass({
 
     opts = {
       name: name,
-      hasIcon: name === "unread" || name === "favorited",
+      hasIcon: name === "unread" || name === "starred",
       filters: split.splice(1),
       category: opts.category
     };
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index 75994b925..be8c0202f 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -155,13 +155,13 @@ Discourse.Topic = Discourse.Model.extend({
     });
   },
 
-  favoriteTooltipKey: function() {
-    return this.get('starred') ? 'favorite.help.unstar' : 'favorite.help.star';
+  starTooltipKey: function() {
+    return this.get('starred') ? 'starred.help.unstar' : 'starred.help.star';
   }.property('starred'),
 
-  favoriteTooltip: function() {
-    return I18n.t(this.get('favoriteTooltipKey'));
-  }.property('favoriteTooltipKey'),
+  starTooltip: function() {
+    return I18n.t(this.get('starTooltipKey'));
+  }.property('starTooltipKey'),
 
   estimatedReadingTime: function() {
     var wordCount = this.get('word_count');
diff --git a/app/assets/javascripts/discourse/models/user_action.js b/app/assets/javascripts/discourse/models/user_action.js
index 7b24300f6..2bdb3acb0 100644
--- a/app/assets/javascripts/discourse/models/user_action.js
+++ b/app/assets/javascripts/discourse/models/user_action.js
@@ -16,7 +16,7 @@ var UserActionTypes = {
   replies: 6,
   mentions: 7,
   quotes: 9,
-  favorites: 10,
+  starred: 10,
   edits: 11,
   messages_sent: 12,
   messages_received: 13
@@ -144,7 +144,7 @@ Discourse.UserAction = Discourse.Model.extend({
         case UserActionTypes.likes_given:
         case UserActionTypes.likes_received:
           return "likes";
-        case UserActionTypes.favorites:
+        case UserActionTypes.starred:
           return "stars";
         case UserActionTypes.edits:
           return "edits";
@@ -218,14 +218,14 @@ Discourse.UserAction.reopenClass({
 
   TO_COLLAPSE: [UserActionTypes.likes_given,
                 UserActionTypes.likes_received,
-                UserActionTypes.favorites,
+                UserActionTypes.starred,
                 UserActionTypes.edits,
                 UserActionTypes.bookmarks],
 
   TO_SHOW: [
     UserActionTypes.likes_given,
     UserActionTypes.likes_received,
-    UserActionTypes.favorites,
+    UserActionTypes.starred,
     UserActionTypes.edits,
     UserActionTypes.bookmarks,
     UserActionTypes.messages_sent,
diff --git a/app/assets/javascripts/discourse/routes/user_topic_list_routes.js b/app/assets/javascripts/discourse/routes/user_topic_list_routes.js
index c89e1a444..5e55e370c 100644
--- a/app/assets/javascripts/discourse/routes/user_topic_list_routes.js
+++ b/app/assets/javascripts/discourse/routes/user_topic_list_routes.js
@@ -41,10 +41,10 @@ Discourse.UserActivityTopicsRoute = Discourse.UserTopicListRoute.extend({
   }
 });
 
-Discourse.UserActivityFavoritesRoute = Discourse.UserTopicListRoute.extend({
-  userActionType: Discourse.UserAction.TYPES.favorites,
+Discourse.UserActivityStarredRoute = Discourse.UserTopicListRoute.extend({
+  userActionType: Discourse.UserAction.TYPES.starred,
 
   model: function() {
-    return Discourse.TopicList.find('favorited', {user_id: this.modelFor('user').get('id') });
+    return Discourse.TopicList.find('starred', {user_id: this.modelFor('user').get('id') });
   }
 });
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index 971678472..2f1e5cdcb 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -6,8 +6,8 @@
     {{#if showExtraInfo}}
       <div class="extra-info-wrapper">
         <div class="extra-info">
-          {{#if showFavoriteButton}}
-            <a {{bindAttr class=":star topic.starred:starred"}} {{action toggleStar}} href='#' {{bindAttr title="topic.favoriteTooltip"}}></a>
+          {{#if showStarButton}}
+            <a {{bindAttr class=":star topic.starred:starred"}} {{action toggleStar}} href='#' {{bindAttr title="topic.starTooltip"}}></a>
           {{/if}}
           <h1>
           {{boundCategoryLink topic.category}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
index 4093476eb..a401736b6 100644
--- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
@@ -1,6 +1,6 @@
 {{#if controller.currentUser.id}}
   <td class='star'>
-    <a {{bindAttr class=":star :fa :fa-star starred:starred"}} {{action toggleStar this}} href='#' {{bindAttr title="favoriteTooltip"}}></a>
+    <a {{bindAttr class=":star :fa :fa-star starred:starred"}} {{action toggleStar this}} href='#' {{bindAttr title="starTooltip"}}></a>
   </td>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars b/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars
index 9955d207b..faf41abf5 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.js.handlebars
@@ -7,7 +7,7 @@
         <li>{{{i18n keyboard_shortcuts_help.jump_to.latest}}}</li>
         <li>{{{i18n keyboard_shortcuts_help.jump_to.new}}}</li>
         <li>{{{i18n keyboard_shortcuts_help.jump_to.unread}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.favorited}}}</li>
+        <li>{{{i18n keyboard_shortcuts_help.jump_to.starred}}}</li>
         <li>{{{i18n keyboard_shortcuts_help.jump_to.categories}}}</li>
       </ul>
 
@@ -30,7 +30,7 @@
     <div class="span6">
       <h4>{{i18n keyboard_shortcuts_help.actions.title}}</h4>
       <ul>
-        <li>{{{i18n keyboard_shortcuts_help.actions.favorite}}}</li>
+        <li>{{{i18n keyboard_shortcuts_help.actions.star}}}</li>
         <li>{{{i18n keyboard_shortcuts_help.actions.share_topic}}}</li>
         <li>{{{i18n keyboard_shortcuts_help.actions.share_post}}}</li>
         <li>{{{i18n keyboard_shortcuts_help.actions.reply_topic}}}</li>
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index 7d87a3193..afd10cfb7 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -7,8 +7,8 @@
       <div class='container'>
         <div class='inner'>
 
-          {{#if showFavoriteButton}}
-            <a {{bindAttr class=":star starred:starred"}} {{action toggleStar}} href='#' {{bindAttr title="favoriteTooltip"}}></a>
+          {{#if showStarButton}}
+            <a {{bindAttr class=":star starred:starred"}} {{action toggleStar}} href='#' {{bindAttr title="starTooltip"}}></a>
           {{/if}}
 
           {{#if editingTopic}}
diff --git a/app/assets/javascripts/discourse/views/buttons/notifications_button.js b/app/assets/javascripts/discourse/views/buttons/notifications_button.js
index 00ef949c8..0eadf40a5 100644
--- a/app/assets/javascripts/discourse/views/buttons/notifications_button.js
+++ b/app/assets/javascripts/discourse/views/buttons/notifications_button.js
@@ -1,5 +1,5 @@
 /**
-  A button for favoriting a topic
+  A button to display notification options.
 
   @class NotificationsButton
   @extends Discourse.DropdownButtonView
diff --git a/app/assets/javascripts/discourse/views/buttons/favorite_button.js b/app/assets/javascripts/discourse/views/buttons/star_button.js
similarity index 66%
rename from app/assets/javascripts/discourse/views/buttons/favorite_button.js
rename to app/assets/javascripts/discourse/views/buttons/star_button.js
index c1af90666..080330084 100644
--- a/app/assets/javascripts/discourse/views/buttons/favorite_button.js
+++ b/app/assets/javascripts/discourse/views/buttons/star_button.js
@@ -1,15 +1,15 @@
 /**
-  A button for favoriting a topic
+  A button for starring a topic
 
-  @class FavoriteButton
+  @class StarButton
   @extends Discourse.ButtonView
   @namespace Discourse
   @module Discourse
 **/
-Discourse.FavoriteButton = Discourse.ButtonView.extend({
-  classNames: ['favorite'],
-  textKey: 'favorite.title',
-  helpKeyBinding: 'controller.favoriteTooltipKey',
+Discourse.StarButton = Discourse.ButtonView.extend({
+  classNames: ['star'],
+  textKey: 'starred.title',
+  helpKeyBinding: 'controller.starTooltipKey',
   attributeBindings: ['disabled'],
 
   shouldRerender: Discourse.View.renderIfChanged('controller.starred'),
diff --git a/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js b/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
index e599648d2..46361bdfd 100644
--- a/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
+++ b/app/assets/javascripts/discourse/views/topic_footer_buttons_view.js
@@ -25,7 +25,7 @@ Discourse.TopicFooterButtonsView = Discourse.ContainerView.extend({
         if (this.get('topic.details.can_invite_to')) {
           this.attachViewClass(Discourse.InviteReplyButton);
         }
-        this.attachViewClass(Discourse.FavoriteButton);
+        this.attachViewClass(Discourse.StarButton);
         this.attachViewClass(Discourse.ShareButton);
         this.attachViewClass(Discourse.ClearPinButton);
       }
diff --git a/app/assets/javascripts/discourse/views/user/activity_filter_view.js b/app/assets/javascripts/discourse/views/user/activity_filter_view.js
index 3207eced3..439f75f5a 100644
--- a/app/assets/javascripts/discourse/views/user/activity_filter_view.js
+++ b/app/assets/javascripts/discourse/views/user/activity_filter_view.js
@@ -67,7 +67,7 @@ Discourse.ActivityFilterView = Ember.Component.extend({
         return "pencil";
       case Discourse.UserAction.TYPES.replies:
         return "reply";
-      case Discourse.UserAction.TYPES.favorites:
+      case Discourse.UserAction.TYPES.starred:
         return "star";
     }
   }.property("content.action_type")
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 41838293a..3c392ef27 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -47,7 +47,7 @@
     margin-right: 4px;
     font: 15px/0.9 "FontAwesome";
   }
-  .has-icon .favorited:before {
+  .has-icon .starred:before {
     content: "\f005";
   }
   .has-icon .unread:before {
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 84b474d9c..9bec01bf9 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -28,7 +28,7 @@
     margin-right: 4px;
     font: 15px/0.9 "FontAwesome";
   }
-  .has-icon .favorited:before {
+  .has-icon .starred:before {
     content: "\f005";
   }
   .has-icon .unread:before {
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 36bd6ace9..685976496 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -11,7 +11,7 @@ class AdminDashboardData
     'users_by_trust_level',
     'likes',
     'bookmarks',
-    'favorites',
+    'starred',
     'emails',
     'user_to_user_private_messages',
     'system_private_messages',
diff --git a/app/models/report.rb b/app/models/report.rb
index 3d83d84d0..3caec73f0 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -81,7 +81,7 @@ class Report
     end
   end
 
-  def self.report_favorites(report)
+  def self.report_starred(report)
     basic_report_about report, Topic, :starred_counts_per_day
     query = TopicUser.where(starred: true)
     report.total = query.count
diff --git a/app/models/topic.rb b/app/models/topic.rb
index dc838e557..83aef6bc5 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -137,10 +137,10 @@ class Topic < ActiveRecord::Base
            WHERE #{condition[0]})", condition[1])
   }
 
-  # Helps us limit how many favorites can be made in a day
-  class FavoriteLimiter < RateLimiter
+  # Helps us limit how many topics can be starred in a day
+  class StarLimiter < RateLimiter
     def initialize(user)
-      super(user, "favorited:#{Date.today.to_s}", SiteSetting.max_favorites_per_day, 1.day.to_i)
+      super(user, "starred:#{Date.today.to_s}", SiteSetting.max_stars_per_day, 1.day.to_i)
     end
   end
 
@@ -547,9 +547,9 @@ class Topic < ActiveRecord::Base
                 WHERE id = ?", id
 
       if starred
-        FavoriteLimiter.new(user).performed!
+        StarLimiter.new(user).performed!
       else
-        FavoriteLimiter.new(user).rollback!
+        StarLimiter.new(user).rollback!
       end
     end
   end
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index c9417838f..ab281de02 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -220,7 +220,7 @@ SQL
     builder.exec
   end
 
-  def self.synchronize_favorites
+  def self.synchronize_starred
     exec_sql("
     DELETE FROM user_actions ua
     WHERE action_type = :star
@@ -248,7 +248,7 @@ SQL
 
   def self.ensure_consistency!
     self.synchronize_target_topic_ids
-    self.synchronize_favorites
+    self.synchronize_starred
   end
 
   protected
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 32ea58fa7..7492ecdde 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -531,7 +531,7 @@ cs:
     go_back: 'jít zpět'
     current_user: 'jít na vaši uživatelskou stránku'
 
-    favorite:
+    starred:
       title: 'Oblíbené'
       help:
         star: 'přidat toto téma do oblíbených'
@@ -539,7 +539,7 @@ cs:
 
     topics:
       none:
-        favorited: "Zatím nemáte žádná oblíbená témata. Pro přidání tématu do oblíbených, klikněte na hvězdičku vedle názvu tématu."
+        starred: "Zatím nemáte žádná oblíbená témata. Pro přidání tématu do oblíbených, klikněte na hvězdičku vedle názvu tématu."
         unread: "Nemáte žádná nepřečtená témata."
         new: "Nemáte žádná nová témata ke čtení."
         read: "Zatím jste nečetli žádná témata."
@@ -554,7 +554,7 @@ cs:
         read: "Nejsou tu žádná další přečtená témata."
         new: "Nejsou tu žádná další nová témata k přečtení."
         unread: "Nejsou tu žádná další nepřečtená témata."
-        favorited: "Nejsou tu žádná další oblíbená témata k přečtení."
+        starred: "Nejsou tu žádná další oblíbená témata k přečtení."
         category: "V kategorii {{category}} nejsou žádná další témata."
 
     rank_details:
@@ -1001,7 +1001,7 @@ cs:
       hot:
         title: "Populární"
         help: "populární témata z poslední doby"
-      favorited:
+      starred:
         title: "Oblíbená"
         help: "témata, která jste označili jako oblíbená"
       read:
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 92cd0818d..124b9cbb8 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -586,7 +586,7 @@ da:
     go_back: 'gå tilbage'
     current_user: 'gå til brugerside'
 
-    favorite:
+    starred:
       title: 'Favorit'
       help:
         star: 'tilføj dette emne til din favorit-liste'
@@ -594,7 +594,7 @@ da:
 
     topics:
       none:
-        favorited: "Du har ikke nogen favorit-emner endnu. For at gøre et emne til favorit, tryk på stjernen ved siden af emnets titel."
+        starred: "Du har ikke nogen favorit-emner endnu. For at gøre et emne til favorit, tryk på stjernen ved siden af emnets titel."
         unread: "Du har ingen ulæste emner."
         new: "Du har ingen nye emner."
         read: "Du har ikke læst nogen emner endnu."
@@ -609,7 +609,7 @@ da:
         read: "Der er ikke flere læste emner."
         new: "Der er ikke flere nye emner."
         unread: "Der er ikke flere ulæste emner."
-        favorited: "Der er ikke flere favorit-emner."
+        starred: "Der er ikke flere favorit-emner."
         category: "Der er ikke flere emner i kategorien {{category}}."
 
     rank_details:
@@ -1082,7 +1082,7 @@ da:
       hot:
         title: "Populære"
         help: "de mest populære emner"
-      favorited:
+      starred:
         title: "Favoritter"
         help: "emner du har markeret som favoritter"
       read:
@@ -1496,7 +1496,7 @@ da:
         latest: '<b>g</b> så <b>l</b> Seneste'
         new: '<b>g</b> så <b>n</b> Ny'
         unread: '<b>g</b> så <b>u</b> Ulæste'
-        favorited: '<b>g</b> så <b>f</b> Favoritter'
+        starred: '<b>g</b> så <b>f</b> Favoritter'
         categories: '<b>g</b> så <b>c</b> Kategorier'
       navigation:
         title: 'Navigation'
@@ -1512,7 +1512,7 @@ da:
         help: '<b>?</b> Åbn hjælp til tastaturgenveje'
       actions:
         title: 'Handlinger'
-        favorite: '<b>f</b> Markér emne som favorit'
+        star: '<b>f</b> Markér emne som favorit'
         share_topic: '<b>s</b> Del emne'
         share_post: '<b>shift s</b> Del indlæg'
         reply_topic: '<b>r</b> Svar på emne'
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index fb1442f55..1c6279906 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -541,7 +541,7 @@ de:
     go_back: 'Zurück'
     current_user: 'Gehe zu deinem Nutzerprofil'
 
-    favorite:
+    starred:
       title: 'Favoriten'
       help:
         star: 'Füge dieses Thema deinen Favoriten hinzu'
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 89b2695c0..43aeb0abd 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -178,7 +178,7 @@ en:
       "6": "Replies"
       "7": "Mentions"
       "9": "Quotes"
-      "10": "Favorites"
+      "10": "Starred"
       "11": "Edits"
       "12": "Sent Items"
       "13": "Inbox"
@@ -587,15 +587,15 @@ en:
     not_logged_in_user: 'user page with summary of current activity and preferences'
     current_user: 'go to your user page'
 
-    favorite:
-      title: 'Favorite'
+    starred:
+      title: 'Starred'
       help:
-        star: 'add this topic to your favorites list'
-        unstar: 'remove this topic from your favorites list'
+        star: 'add this topic to your starred list'
+        unstar: 'remove this topic from your starred list'
 
     topics:
       none:
-        favorited: "You haven't favorited any topics yet. To favorite a topic, click or tap the star next to the title."
+        starred: "You haven't starred any topics yet. To star a topic, click or tap the star next to the title."
         unread: "You have no unread topics."
         new: "You have no new topics."
         read: "You haven't read any topics yet."
@@ -610,7 +610,7 @@ en:
         read: "There are no more read topics."
         new: "There are no more new topics."
         unread: "There are no more unread topics."
-        favorited: "There are no more favorited topics."
+        starred: "There are no more starred topics."
         category: "There are no more {{category}} topics."
 
     rank_details:
@@ -1083,9 +1083,9 @@ en:
       hot:
         title: "Hot"
         help: "a selection of the hottest topics"
-      favorited:
-        title: "Favorited"
-        help: "topics you marked as favorites"
+      starred:
+        title: "Starred"
+        help: "topics you starred"
       read:
         title: "Read"
         help: "topics you've read, in the order that you last read them"
@@ -1500,7 +1500,7 @@ en:
         latest: '<b>g</b> then <b>l</b> Latest'
         new: '<b>g</b> then <b>n</b> New'
         unread: '<b>g</b> then <b>u</b> Unread'
-        favorited: '<b>g</b> then <b>f</b> Favorited'
+        starred: '<b>g</b> then <b>f</b> Starred'
         categories: '<b>g</b> then <b>c</b> Categories'
       navigation:
         title: 'Navigation'
@@ -1516,7 +1516,7 @@ en:
         help: '<b>?</b> Open keyboard shortcuts help'
       actions:
         title: 'Actions'
-        favorite: '<b>f</b> Favorite topic'
+        star: '<b>f</b> Star topic'
         share_topic: '<b>s</b> Share topic'
         share_post: '<b>shift s</b> Share post'
         reply_topic: '<b>r</b> Reply to topic'
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index e311fc372..88e588023 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -489,13 +489,13 @@ es:
     go_back: 'volver'
     current_user: 'ir a tu página de usuario'
 
-    favorite:
+    starred:
       title: 'Favoritos'
       help: 'agregar este tema a tu lista de favoritos'
 
     topics:
       none:
-        favorited: "Todavía no has marcado ningún tema como favorito. Para marcar uno, haz click o toca con el dedo la estrella que está junto al título del tema."
+        starred: "Todavía no has marcado ningún tema como favorito. Para marcar uno, haz click o toca con el dedo la estrella que está junto al título del tema."
         unread: "No existen temas que sigas y que ya no hayas leído."
         new: "No tienes temas nuevos por leer."
         read: "Todavía no has leído ningún tema."
@@ -508,7 +508,7 @@ es:
         read: "No hay más temas leídos."
         new: "No hay temas nuevos para leer."
         unread: "No hay más temas que no hayas leídos."
-        favorited: "No hay más temas favoritos para leer."
+        starred: "No hay más temas favoritos para leer."
         category: "No hay más temas en la categoría {{category}}."
 
 
@@ -783,7 +783,7 @@ es:
       latest:
         title: "Populares"
         help: "los temas más recientes más populares"
-      favorited:
+      starred:
         title: "Favoritos"
         help: "temas que has marcado como favoritos"
       read:
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index fd71efada..184e82b6e 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -586,7 +586,7 @@ fr:
     go_back: 'retour'
     current_user: 'voir la page de l''utilisateur'
 
-    favorite:
+    starred:
       title: 'Favoris'
       help:
         star: 'ajouter cette discussion à vos favoris'
@@ -594,7 +594,7 @@ fr:
 
     topics:
       none:
-        favorited: "Vous n'avez aucune discussion favorite pour le moment. Pour ajouter une discussion aux favoris, cliquez sur l'étoile suivant le titre."
+        starred: "Vous n'avez aucune discussion favorite pour le moment. Pour ajouter une discussion aux favoris, cliquez sur l'étoile suivant le titre."
         unread: "Vous n'avez aucune discussion non lue."
         new: "Vous n'avez aucune discussion non lue."
         read: "Vous n'avez lu aucune discussion pour le moment."
@@ -609,7 +609,7 @@ fr:
         read: "Il n'y a plus de discussion à lire."
         new: "Il n'y a plus de discussion à lire."
         unread: "Il n'y a plus de discussion non lue à lire."
-        favorited: "Il n'y a plus de discussion favorites à lire."
+        starred: "Il n'y a plus de discussion favorites à lire."
         category: "Il n'y a plus de discussion sur {{category}} à lire."
 
     rank_details:
@@ -1066,7 +1066,7 @@ fr:
       hot:
         title: "Populaires"
         help: "discussions populaires"
-      favorited:
+      starred:
         title: "Ajouté à vos Favoris"
         help: "discussions que vous avez ajoutées à vos favoris"
       read:
@@ -1481,7 +1481,7 @@ fr:
         latest: '<b>g</b> puis <b>l</b> La plus récente'
         new: '<b>g</b> puis <b>n</b> Nouvelles'
         unread: '<b>g</b> puis <b>u</b> Non lues'
-        favorited: '<b>g</b> puis <b>f</b> Favorites'
+        starred: '<b>g</b> puis <b>f</b> Favorites'
         categories: '<b>g</b> puis <b>c</b> Catégories'
       navigation:
         title: 'Navigation'
@@ -1497,7 +1497,7 @@ fr:
         help: '<b>?</b> Ouvrir l''aide des raccourcis clavier'
       actions:
         title: 'Actions'
-        favorite: '<b>f</b> Ajouter une discussion aux favoris'
+        starred: '<b>f</b> Ajouter une discussion aux favoris'
         share_topic: '<b>s</b> Partager une discussion'
         share_post: '<b>Maj s</b> Partager un message '
         reply_topic: '<b>r</b> Répondre à une discussion'
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 0842915e2..80f34c9e2 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -325,13 +325,13 @@ id:
     go_back: 'go back'
     current_user: 'go to your user page'
 
-    favorite:
+    starred:
       title: 'Favorite'
-      help: 'add this topic to your favorites list'
+      help: 'add this topic to your starred topics list'
 
     topics:
       none:
-        favorited: "You haven't favorited any topics yet. To favorite a topic, click or tap the star next to the title."
+        starred: "You haven't starred any topics yet. To star a topic, click or tap the star next to the title."
         unread: "You have no unread topics to read."
         new: "You have no new topics to read."
         read: "You haven't read any topics yet."
@@ -344,7 +344,7 @@ id:
         read: "There are no more read topics to read."
         new: "There are no more new topics to read."
         unread: "There are no more unread topics to read."
-        favorited: "There are no more favorited topics to read."
+        starred: "There are no more favorited topics to read."
         category: "There are no more {{category}} topics."
 
     topic:
@@ -603,7 +603,7 @@ id:
       latest:
         title: "Latest"
         help: "the latest topics"
-      favorited:
+      starred:
         title: "Favorited"
         help: "topics you marked as favorites"
       read:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 6d3df9c71..8ef356478 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -552,7 +552,7 @@ it:
     go_back: 'torna indietro'
     current_user: 'vai alla tua pagina utente'
 
-    favorite:
+    starred:
       title: 'Preferito'
       help:
         star: 'aggiungi questo topic nella tua lista dei preferiti'
@@ -560,7 +560,7 @@ it:
 
     topics:
       none:
-        favorited: "Non hai alcun topic preferito. Per rendere un topic preferito, clicca la stella di fianco al titolo."
+        starred: "Non hai alcun topic preferito. Per rendere un topic preferito, clicca la stella di fianco al titolo."
         unread: "Non hai alcun topic non letto da leggere."
         new: "Non hai nuovi topic da leggere."
         read: "Non hai ancora letto alcun topic."
@@ -575,7 +575,7 @@ it:
         read: "Non ci sono altri topic da leggere."
         new: "Non ci sono altri nuovi topic da leggere."
         unread: "Non ci sono altri topic non letti da leggere."
-        favorited: "Non ci sono altri topic preferiti da leggere."
+        starred: "Non ci sono altri topic preferiti da leggere."
         category: "Non ci sono altri topic nella categoria {{category}} da leggere."
 
     rank_details:
@@ -965,7 +965,7 @@ it:
       hot:
         title: "Hot"
         help: "una selezione dei topic più attivi"
-      favorited:
+      starred:
         title: "Preferiti"
         help: "topic preferiti"
       read:
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index fb7c62c44..aa8c850be 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -547,7 +547,7 @@ ja:
     go_back: '戻る'
     current_user: 'ユーザページに移動'
 
-    favorite:
+    starred:
       title: 'お気に入り'
       help:
         star: 'このトピックをお気に入りに登録'
@@ -555,7 +555,7 @@ ja:
 
     topics:
       none:
-        favorited: "お気に入り登録しているトピックがありません。お気に入り登録するには、タイトル横のスターをクリック/タップしてください。"
+        starred: "お気に入り登録しているトピックがありません。お気に入り登録するには、タイトル横のスターをクリック/タップしてください。"
         unread: "未読トピックはありません。"
         new: "新着トピックはありません。"
         read: "またトピックを一つも読んでいません。"
@@ -570,7 +570,7 @@ ja:
         read: "未読トピックは以上です。"
         new: "新規トピックは以上です。"
         unread: "未読のトピックは以上です。"
-        favorited: "お気に入りしたトピックは以上です。"
+        starred: "お気に入りしたトピックは以上です。"
         category: "{{category}} トピックは以上です。"
 
     rank_details:
@@ -1004,7 +1004,7 @@ ja:
       hot:
         title: "ホット"
         help: "話題のトピック"
-      favorited:
+      starred:
         title: "お気に入り"
         help: "お気に入りしたトピック"
       read:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 3bf306d8a..c4c64fb1c 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -561,7 +561,7 @@ ko:
     go_back: '돌아가기'
     current_user: '사용자 페이지로 이동'
 
-    favorite:
+    starred:
       title: '즐겨찾기'
       help:
         star: '즐겨찾기로 이 토픽을 추가'
@@ -569,7 +569,7 @@ ko:
 
     topics:
       none:
-        favorited: "아직 즐겨찾기가 없습니다. 토픽을 즐겨찾기하려면 제목 옆 별표를 눌러주세요."
+        starred: "아직 즐겨찾기가 없습니다. 토픽을 즐겨찾기하려면 제목 옆 별표를 눌러주세요."
         unread: "읽지 않은 토픽이 없습니다."
         new: "읽을 새로운 토픽이 없습니다."
         read: "아직 어떠한 토픽도 읽지 않았습니다."
@@ -584,7 +584,7 @@ ko:
         read: "더 이상 읽을 토픽이 없습니다"
         new: "더 이상 읽을 새로운 토픽이 없습니다."
         unread: "더 이상 읽지 않은 토픽이 없습니다"
-        favorited: "더 이상 읽을 즐겨찾기 토픽이 없습니다"
+        starred: "더 이상 읽을 즐겨찾기 토픽이 없습니다"
         category: "더 이상 {{category}}에 토픽이 없습니다"
 
     rank_details:
@@ -1028,7 +1028,7 @@ ko:
       hot:
         title: "인기 있는 글"
         help: "가장 인기있는 토픽 중 하나를 선택"
-      favorited:
+      starred:
         title: "즐겨찾기"
         help: "즐겨찾기로 표시한 게시글"
       read:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 7958d92cc..615fd9ff1 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -445,7 +445,7 @@ nb_NO:
     go_back: 'gå tilbake'
     current_user: 'go til din brukerside'
 
-    favorite:
+    starred:
       title: 'Favoritt'
       help:
         star: 'legg dette emnet til favorittlisten din'
@@ -453,7 +453,7 @@ nb_NO:
 
     topics:
       none:
-        favorited: "Du har ikke meket noen emner som favoritt enda. For å merke ett emne, klikk på stjernen ved siden av tittelen."
+        starred: "Du har ikke meket noen emner som favoritt enda. For å merke ett emne, klikk på stjernen ved siden av tittelen."
         unread: "Du har ingen uleste emner å lese."
         new: "Du har ingen nye emner å lese."
         read: "Du har ikke lest noen emner enda."
@@ -468,7 +468,7 @@ nb_NO:
         read: "Det er ikke noen leste emner igjen å lese."
         new: "Det er ikke noen nye emner igjen å lese."
         unread: "Det er ikke noen uleste emner igjen å lese."
-        favorited: "Det er ikke noen favorittemner igjen å lese."
+        starred: "Det er ikke noen favorittemner igjen å lese."
         category: "Det er ikke noen {{category}} emner igjen."
 
     rank_details:
@@ -864,7 +864,7 @@ nb_NO:
       hot:
         title: "Hot"
         help: "en seleksjon av de hotteste emnene"
-      favorited:
+      starred:
         title: "Favorisert"
         help: "emner du har markert som favoritter"
       read:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 4d6733d57..6aedb2296 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -569,7 +569,7 @@ nl:
     go_back: ga terug
     current_user: ga naar je gebruikerspagina
 
-    favorite:
+    starred:
       title: Favoriet
       help:
         star: Voeg deze topic toe aan je favorietenlijst
@@ -577,7 +577,7 @@ nl:
 
     topics:
       none:
-        favorited: "Je hebt nog geen topics tussen je favorieten staan. Om een topic toe te voegen, klik of druk op de ster naast de topictitel."
+        starred: "Je hebt nog geen topics tussen je favorieten staan. Om een topic toe te voegen, klik of druk op de ster naast de topictitel."
         unread: Je hebt geen ongelezen topics.
         new: Je hebt geen nieuwe topics.
         read: Je hebt nog geen topics gelezen.
@@ -592,7 +592,7 @@ nl:
         read: Er zijn geen gelezen topics meer.
         new: Er zijn geen nieuwe topics meer.
         unread: Er zijn geen ongelezen topics meer.
-        favorited: Er zijn geen favoriete topics meer.
+        starred: Er zijn geen favoriete topics meer.
         category: "Er zijn geen topics meer in {{category}}."
 
     rank_details:
@@ -1036,7 +1036,7 @@ nl:
       hot:
         title: Populair
         help: een selectie van de meest populaire topics
-      favorited:
+      starred:
         title: Favorieten
         help: topics die je als favoriet hebt ingesteld
       read:
diff --git a/config/locales/client.pseudo.yml b/config/locales/client.pseudo.yml
index 4acb24b52..0618cd7fe 100644
--- a/config/locales/client.pseudo.yml
+++ b/config/locales/client.pseudo.yml
@@ -579,14 +579,14 @@ pseudo:
     site_map: '[[ ǧó ťó áɳóťĥéř ťóƿíč łíšť óř čáťéǧóřý ]]'
     go_back: '[[ ǧó ƀáčǩ ]]'
     current_user: '[[ ǧó ťó ýóůř ůšéř ƿáǧé ]]'
-    favorite:
+    starred:
       title: '[[ Ƒáνóříťé ]]'
       help:
         star: '[[ áďď ťĥíš ťóƿíč ťó ýóůř ƒáνóříťéš łíšť ]]'
         unstar: '[[ řéɱóνé ťĥíš ťóƿíč ƒřóɱ ýóůř ƒáνóříťéš łíšť ]]'
     topics:
       none:
-        favorited: '[[ Ýóů ĥáνéɳ''ť ƒáνóříťéď áɳý ťóƿíčš ýéť. Ťó ƒáνóříťé á ťóƿíč,
+        starred: '[[ Ýóů ĥáνéɳ''ť ƒáνóříťéď áɳý ťóƿíčš ýéť. Ťó ƒáνóříťé á ťóƿíč,
           čłíčǩ óř ťáƿ ťĥé šťář ɳéхť ťó ťĥé ťíťłé. ]]'
         unread: '[[ Ýóů ĥáνé ɳó ůɳřéáď ťóƿíčš. ]]'
         new: '[[ Ýóů ĥáνé ɳó ɳéŵ ťóƿíčš. ]]'
@@ -602,7 +602,7 @@ pseudo:
         read: '[[ Ťĥéřé ářé ɳó ɱóřé řéáď ťóƿíčš. ]]'
         new: '[[ Ťĥéřé ářé ɳó ɱóřé ɳéŵ ťóƿíčš. ]]'
         unread: '[[ Ťĥéřé ářé ɳó ɱóřé ůɳřéáď ťóƿíčš. ]]'
-        favorited: '[[ Ťĥéřé ářé ɳó ɱóřé ƒáνóříťéď ťóƿíčš. ]]'
+        starred: '[[ Ťĥéřé ářé ɳó ɱóřé ƒáνóříťéď ťóƿíčš. ]]'
         category: '[[ Ťĥéřé ářé ɳó ɱóřé {{category}} ťóƿíčš. ]]'
     rank_details:
       toggle: '[[ ťóǧǧłé ťóƿíč řáɳǩ ďéťáíłš ]]'
@@ -1080,7 +1080,7 @@ pseudo:
       hot:
         title: '[[ Ĥóť ]]'
         help: '[[ á šéłéčťíóɳ óƒ ťĥé ĥóťťéšť ťóƿíčš ]]'
-      favorited:
+      starred:
         title: '[[ Ƒáνóříťéď ]]'
         help: '[[ ťóƿíčš ýóů ɱářǩéď áš ƒáνóříťéš ]]'
       read:
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index d878d18ec..a1a93432c 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -315,12 +315,12 @@ pt:
     go_back: 'voltar atrás'
     current_user: 'ir para a tua página de utilizador'
 
-    favorite:
+    starred:
       title: 'Favorito'
       help: 'adicionar este tópico à tua lista de favoritos'
 
     topics:
-      no_favorited: "Ainda não marcaste nenhum tópico como favorito. Para marcar um tópico como favorito, clica na estrela à beira do título."
+      no_starred: "Ainda não marcaste nenhum tópico como favorito. Para marcar um tópico como favorito, clica na estrela à beira do título."
       no_unread: "Não tens tópicos ainda não lidos para ler."
       no_new: "Não tens novos tópicos para ler."
       no_read: "Ainda não leste nenhum tópico."
@@ -567,7 +567,7 @@ pt:
       latest:
         title: "Populares"
         help: "os tópicos recentes mais populares"
-      favorited:
+      starred:
         title: "Favoritos"
         help: "tópicos que marcaste como favorito"
       read:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 1ccd7dcd2..b8aa84cec 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -551,7 +551,7 @@ pt_BR:
     go_back: 'voltar atrás'
     current_user: 'ir para a sua página de usuário'
 
-    favorite:
+    starred:
       title: 'Favorito'
       help:
         star: 'adicionar este tópico a lista de favoritos'
@@ -559,7 +559,7 @@ pt_BR:
 
     topics:
       none:
-        favorited: "Você não favoritou nenhum tópico até agora. Para favoritar um tópico, clique ou toque na estrela ao lado do título."
+        starred: "Você não favoritou nenhum tópico até agora. Para favoritar um tópico, clique ou toque na estrela ao lado do título."
         unread: "Há tópicos não lidos."
         new: "Não há novos tópicos."
         read: "Você ainda não leu nenhum tópico."
@@ -574,7 +574,7 @@ pt_BR:
         read: "Não há mais tópicos lidos."
         new: "Não há mais tópicos novos."
         unread: "Não há mais tópicos não lidos."
-        favorited: "Não há mais tópicos favoritos."
+        starred: "Não há mais tópicos favoritos."
         category: "Não há mais tópicos na categoria {{category}}."
 
     rank_details:
@@ -1014,7 +1014,7 @@ pt_BR:
       hot:
         title: "Quente"
         help: "uma seleção dos tópicos mais quentes"
-      favorited:
+      starred:
         title: "Favoritos"
         help: "tópicos que marcaste como favorito"
       read:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 0eedf4182..4c7543d7b 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -566,14 +566,14 @@ ru:
     site_map: 'перейти к другому списку тем или другой категории'
     go_back: 'вернуться'
     current_user: 'перейти на вашу страницу пользователя'
-    favorite:
+    starred:
       title: Избранные
       help:
         star: 'добавить тему в избранное'
         unstar: 'удалить тему из избранного'
     topics:
       none:
-        favorited: 'Вы еще не добавили ни одной темы в избранное. Чтобы тема попала в избранное, нажмите на звездочку рядом с названием темы.'
+        starred: 'Вы еще не добавили ни одной темы в избранное. Чтобы тема попала в избранное, нажмите на звездочку рядом с названием темы.'
         unread: 'У вас нет непрочитанных тем.'
         new: 'У вас нет новых тем.'
         read: 'Вы еще не прочитали ни одной темы.'
@@ -588,7 +588,7 @@ ru:
         read: 'Прочитанных тем больше нет.'
         new: 'Больше нет новых тем.'
         unread: 'Больше нет непрочитанных тем.'
-        favorited: 'Избранных тем больше нет.'
+        starred: 'Избранных тем больше нет.'
         category: 'Больше в категории {{category}} нет тем.'
     rank_details:
       toggle: 'скрыть / показать детальный рейтинг темы'
@@ -1068,7 +1068,7 @@ ru:
       hot:
         title: Популярные
         help: 'подборка популярных тем'
-      favorited:
+      starred:
         title: Избранное
         help: 'темы, которые вы добавили в список избранных'
       read:
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index edc7e1f5f..697a92db5 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -569,7 +569,7 @@ sv:
     go_back: 'gå tillbaka'
     current_user: 'gå till din användarsida'
 
-    favorite:
+    starred:
       title: 'Favorit'
       help:
         star: 'lägg till denna tråd i din favoritlista'
@@ -577,7 +577,7 @@ sv:
 
     topics:
       none:
-        favorited: "Du har inte favoritmarkerat några trådar än. För att favoritmarkera en tråd, klicka eller tryck på stjärnan brevid titeln."
+        starred: "Du har inte favoritmarkerat några trådar än. För att favoritmarkera en tråd, klicka eller tryck på stjärnan brevid titeln."
         unread: "Du har inga olästa trådar att läsa."
         new: "Du har inga nya trådar att läsa."
         read: "Du har inte läst några trådar än."
@@ -592,7 +592,7 @@ sv:
         read: "Det finns inga fler lästa trådar att läsa."
         new: "Det finns inga fler nya trådar att läsa."
         unread: "Det finns inga fler oläsa trådar att läsa."
-        favorited: "Det finns inga fler favoritmarkerade trådar att läsa."
+        starred: "Det finns inga fler favoritmarkerade trådar att läsa."
         category: "Det finns inga fler {{category}}-trådar."
 
     rank_details:
@@ -1062,7 +1062,7 @@ sv:
       hot:
         title: "Hett"
         help: "ett urval av de hetaste trådarna"
-      favorited:
+      starred:
         title: "Favoriter"
         help: "trådar du favoritmarkerat"
       read:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index c83b9df5e..13f8b14aa 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -584,7 +584,7 @@ zh_CN:
     go_back: '返回'
     current_user: '去你的用户页面'
 
-    favorite:
+    starred:
       title: '收藏'
       help:
         star: '将此主题加入你的收藏列表'
@@ -592,7 +592,7 @@ zh_CN:
 
     topics:
       none:
-        favorited: "你尚未收藏任何主题。要收藏一个主题，点击标题旁的星星图标。"
+        starred: "你尚未收藏任何主题。要收藏一个主题，点击标题旁的星星图标。"
         unread: "你没有未阅主题。"
         new: "你没有新主题可读。"
         read: "你尚未阅读任何主题。"
@@ -607,7 +607,7 @@ zh_CN:
         read: "没有更多已阅主题可看了。"
         new: "没有更多新主题可看了。"
         unread: "没有更多未阅主题可看了。"
-        favorited: "没有更多收藏主题可看了。"
+        starred: "没有更多收藏主题可看了。"
         category: "没有更多 {{category}} 分类的主题了。"
 
     rank_details:
@@ -1079,7 +1079,7 @@ zh_CN:
       hot:
         title: "热门"
         help: "最近最受欢迎的主题"
-      favorited:
+      starred:
         title: "收藏"
         help: "你收藏的主题"
       read:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index fe354cec2..72c556a8a 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -494,7 +494,7 @@ zh_TW:
     go_back: '返回'
     current_user: '去你的用戶頁面'
 
-    favorite:
+    starred:
       title: '收藏'
       help:
         star: '將此主題加入你的收藏列表'
@@ -502,7 +502,7 @@ zh_TW:
 
     topics:
       none:
-        favorited: "你尚未收藏任何主題。要收藏一個主題，點擊標題旁的星星圖標。"
+        starred: "你尚未收藏任何主題。要收藏一個主題，點擊標題旁的星星圖標。"
         unread: "你沒有未閱主題。"
         new: "你沒有新主題可讀。"
         read: "你尚未閱讀任何主題。"
@@ -517,7 +517,7 @@ zh_TW:
         read: "沒有更多已閱主題可看了。"
         new: "沒有更多新主題可看了。"
         unread: "沒有更多未閱主題可看了。"
-        favorited: "沒有更多收藏主題可看了。"
+        starred: "沒有更多收藏主題可看了。"
         category: "沒有更多 {{category}} 分類的主題了。"
 
     rank_details:
@@ -914,7 +914,7 @@ zh_TW:
       hot:
         title: "熱門"
         help: "最近最受歡迎的主題"
-      favorited:
+      starred:
         title: "收藏"
         help: "你收藏的主題"
       read:
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index d212012bf..1d7f69419 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -367,7 +367,7 @@ cs:
       title: "Záložky"
       xaxis: "Den"
       yaxis: "Počet nových záložek"
-    favorites:
+    starred:
       title: "Oblíbené"
       xaxis: "Den"
       yaxis: "Počet nových oblíbených témat"
@@ -540,7 +540,7 @@ cs:
     ga_domain_name: "Doménové jméno pro Google analytics, např. mysite.com; viz http://google.com/analytics"
     enable_escaped_fragments: "Povolit alternativní řešení, které pomůže starým webovým robotům indexovat váš web. VAROVÁNÍ: povolte pouze v případě, že to opravdu potřebujete."
     enable_noscript_support: "Povolit podporu &lt;noscript&gt; tagu"
-    top_menu: "Určuje, které položky se zobrazí v navigaci na hlavní stránce a v jakém pořadí. Příklad: latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "Určuje, které položky se zobrazí v navigaci na hlavní stránce a v jakém pořadí. Příklad: latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "Určuje, které položky se zobrazí v menu u příspěvku a v jakém pořadí. Příklad: like|edit|flag|delete|share|bookmark|reply"
     share_links: "Určuje, které položky se zobrazí ve sdílecím dialogu a v jakém pořadí. Příklad: twitter|facebook|google+"
     track_external_right_clicks: "Počítat kliknutí na externí odkazy pravým tlačítkem (např. otevření do nové záložky); defaultně zakázáno kvůli přepisu URL"
@@ -602,7 +602,7 @@ cs:
     max_flags_per_day: "Maximální počet nahlášení, která smí uživatel za den zaslat"
     max_bookmarks_per_day: "Maximální počet záložek, které si smí uživatel za den nastavit"
     max_edits_per_day: "Maximální počet úprav, které smí uživatel za den udělat"
-    max_favorites_per_day: "Maximální počet témat, která si smí uživatel dát do oblíbených v jednom dni"
+    max_stars_per_day: "Maximální počet témat, která si smí uživatel dát do oblíbených v jednom dni"
     max_topics_per_day: "Maximální počet témat, který smí uživatel za den vytvořit"
     max_private_messages_per_day: "Maximální počet soukromých zpráv, které smí uživatel za den poslat"
 
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 3809a7ba4..b202d367e 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -403,7 +403,7 @@ da:
       title: "Bogmærker"
       xaxis: "Dag"
       yaxis: "Antal nye bogmærker"
-    favorites:
+    starred:
       title: "Favoritter"
       xaxis: "Dag"
       yaxis: "Antal nye favoritter"
@@ -599,7 +599,7 @@ da:
     ga_domain_name: "Google analytics domænenavn, f.eks.: example.com; se http://google.com/analytics."
     enable_escaped_fragments: "Aktivér workaround som kan hjælpe ældre webcrawlers med at indeksere sitet. ADVARSEL: aktivér kun hvis du har behov for det."
     enable_noscript_support: "Aktivér standard webcrawler søgemaskineunderstøttelse vha. noscript-tagget"
-    top_menu: "Angiv hvilke elementer der skal vises i hjemmesidenavigationen, og i hvilken rækkefølge. Eksempel: latest|hot|read|favorited|unread|new|posted|categories."
+    top_menu: "Angiv hvilke elementer der skal vises i hjemmesidenavigationen, og i hvilken rækkefølge. Eksempel: latest|hot|read|starred|unread|new|posted|categories."
     post_menu: "Angiv hvilke elementer der skal vises i indlægsmenuen, og i hvilken rækkefølge. Eksempel: like|edit|flag|delete|share|bookmark|reply."
     share_links: "Angiv hvilke elementer der skal vises i “del“-dialogboksen og i hvilken rækkefølge. Eksempel twitter|facebook|google+|email."
     track_external_right_clicks: "Spor højreklik på eksterne links (f.eks.: åbn i ny tab); deaktiveret som standard fordi den omskriver URLer"
@@ -666,7 +666,7 @@ da:
     max_flags_per_day: "Maksimalt antal flag per bruger per dag."
     max_bookmarks_per_day: "Maksimalt antal bogmærker per bruger per dag."
     max_edits_per_day: "Maksimalt antal ændringer per bruger per dag."
-    max_favorites_per_day: "Maksimalt antal emner der kan vælges som favoritter per bruger per dag."
+    max_stars_per_day: "Maksimalt antal emner der kan vælges som favoritter per bruger per dag."
     max_topics_per_day: "Maksimal antal emner som en bruger kan oprette per dag."
     max_private_messages_per_day: "Maksimalt antal private beskeder som brugerne kan oprette per dag."
 
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 6c4896675..9db5e619b 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -336,7 +336,7 @@ de:
       title: "Lesezeichen"
       xaxis: "Tag"
       yaxis: "Zahl der Lesezeichen"
-    favorites:
+    starred:
       title: "Favoriten"
       xaxis: "Tag"
       yaxis: "Zahl der Favoriten"
@@ -513,7 +513,7 @@ de:
     ga_domain_name: "Google Analytics Domänenname, zum Beispiel: mysite.com; siehe http://google.com/analytics"
     enable_escaped_fragments: "Aktiviere Umgehungslösung um älteren Suchmaschinen-Webcrawler zu helfen die Seite zu indexieren. ACHTUNG: Nur aktivieren falls wirklich nötig."
     enable_noscript_support: "Aktiviere standard Suchmaschinen-Webcrawler Unterstützung durch den noscript Tag"
-    top_menu: "Bestimme, welche Navigationselemente in welcher Reihenfolge auftauchen. Beispiel: latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "Bestimme, welche Navigationselemente in welcher Reihenfolge auftauchen. Beispiel: latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "Bestimme, welche Funktionen in welcher Reihenfolge im Beitragsmenü auftauchen. Beispiel: like|edit|flag|delete|share|bookmark|reply"
     share_links: "Bestimme, welche Dienste in welcher Reihenfolge im Teilen-Dialog auftauchen. Beispiel: twitter|facebook|google+|email"
     track_external_right_clicks: "Verfolge, welche externen Links per Rechtsklick geöffnet werden (zum Beispiel in einem neuen Browser-Tab). Standardmäßig deaktiviert, da dies URL-Rewrites erfordert."
@@ -576,7 +576,7 @@ de:
     max_flags_per_day: "Maximale Zahl der Meldungen pro Nutzer pro Tag."
     max_bookmarks_per_day: "Maximale Zahl der Lesezeichen pro Nutzer pro Tag."
     max_edits_per_day: "Maximale Zahl der Bearbeitungen pro Nutzer pro Tag."
-    max_favorites_per_day: "Maximale Zahl der Favorisierungen pro Nutzer pro Tag."
+    max_stars_per_day: "Maximale Zahl der Favorisierungen pro Nutzer pro Tag."
     max_topics_per_day: "Maximale Zahl der Themen, die ein Nutzer pro Tag erstellen kann."
     max_private_messages_per_day: "Maximale Zahl privater Nachrichten, die ein Nutzer pro Tag verschicken kann."
 
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6d319cc10..373e4b044 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -400,10 +400,10 @@ en:
       title: "Bookmarks"
       xaxis: "Day"
       yaxis: "Number of new bookmarks"
-    favorites:
-      title: "Favorites"
+    starred:
+      title: "Starred"
       xaxis: "Day"
-      yaxis: "Number of new favorites"
+      yaxis: "Number of new starred topics"
     users_by_trust_level:
       title: "Users per Trust Level"
       xaxis: "Trust Level"
@@ -599,7 +599,7 @@ en:
     ga_domain_name: "Google analytics domain name, eg: mysite.com; see http://google.com/analytics"
     enable_escaped_fragments: "Enable workaround solution to help older search engine webcrawlers index your site. WARNING: enable only if you have to."
     enable_noscript_support: "Enable standard webcrawler search engine support via the noscript tag"
-    top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     share_links: "Determine which items appear on the share dialog, and in what order. Example twitter|facebook|google+|email"
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
@@ -666,7 +666,7 @@ en:
     max_flags_per_day: "Maximum number of flags per user per day"
     max_bookmarks_per_day: "Maximum number of bookmarks per user per day"
     max_edits_per_day: "Maximum number of edits per user per day"
-    max_favorites_per_day: "Maximum number of topics that can be favorited per user per day"
+    max_stars_per_day: "Maximum number of topics that can be starred per user per day"
     max_topics_per_day: "Maximum number of topics a user can create per day"
     max_private_messages_per_day: "The maximum amount of private messages users can create per day"
 
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index bcc216217..6694f7676 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -331,7 +331,7 @@ es:
     post_undo_action_window_mins: "Número de segundos en los que a los usuarios se les permite revertir la acción en un post (like, flag, etc)"
     must_approve_users: "Los administradores deben aprovar a todos los usuarios antes de tener acceso"
     ga_tracking_code: "Código de Google Analytics, ej: UA-12345678-9; visita http://google.com/analytics"
-    top_menu: "Determinar que items aparecen en la navegación de la home y en qué orden. Ejemplo latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "Determinar que items aparecen en la navegación de la home y en qué orden. Ejemplo latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "Determinar que items aparecen en el menú de post y en qué orden. Ejemplo like|edit|flag|delete|share|bookmark|reply"
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
     topics_per_page: "Cuantos topics son cargados por defecto en la página de lista de topics"
@@ -381,7 +381,7 @@ es:
     max_flags_per_day: "Máximo número de flags por usuario por día"
     max_bookmarks_per_day: "Máximo número de bookmarks por usuario por día"
     max_edits_per_day: "Máximo número de ediciones por usuario por día"
-    max_favorites_per_day: "Máximos número de topics que pueden marcarse como favoritos por usuario por día"
+    max_stars_per_day: "Máximos número de topics que pueden marcarse como favoritos por usuario por día"
     max_topics_per_day: "Máximo número de topics que un usuario puede crear por día"
     max_private_messages_per_day: "Máximo número de mensajes privados que los usuarios pueden crear por día"
 
@@ -438,7 +438,7 @@ es:
     mentions: "Menciones"
     quotes: "Citas"
     edits: "Ediciones"
-    favorites: "Favoritos"
+    starred: "Favoritos"
     sent_items: "Items enviados"
     inbox: "Inbox"
 
@@ -449,7 +449,7 @@ es:
     responded_to: "respondido a"
     mentioned: "mecionado"
     quoted: "citado"
-    favorited: "favorited"
+    starred: "favorited"
     edited: "editado"
 
   move_posts:
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 038a5b0af..ece4532df 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -367,7 +367,7 @@ fr:
       title: "Signets"
       xaxis: "Jour"
       yaxis: "Nombre de nouveaux signets"
-    favorites:
+    starred:
       title: "Favoris"
       xaxis: "Jour"
       yaxis: "Nombre de nouveaux favoris"
@@ -551,7 +551,7 @@ fr:
     ga_domain_name: "Domaine suivi par Google Analytics, par exemple : monsite.com, voir: http://google.com/analytics"
     enable_escaped_fragments: "Activer une solution de contournement afin d'aider d'ancien moteurs de recherche d'indexer votre site. ATTENTION : à activer seulement si vous le devez."
     enable_noscript_support: "Activer le support des moteurs de recherches standards via le tag noscript"
-    top_menu: "L'ordre des éléments dans le menu du haut. Exemple latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "L'ordre des éléments dans le menu du haut. Exemple latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "L'ordre des éléments dans le menu de rédaction. Exemple like|edit|flag|delete|share|bookmark|reply"
     share_links: "Liste ordonnée des boutons de partage. Exemple : twitter|facebook|google+|email"
     track_external_right_clicks: "Suivi des clics sur les liens externes (ex: ouverture dans un nouvel onglet) désactivé par défaut car nécessite une ré-écrite de toutes les urls"
@@ -600,7 +600,7 @@ fr:
     max_flags_per_day: "Quantité maximale de signalements qu'un utilisateur peut effectuer en un jour"
     max_bookmarks_per_day: "Quantité maximale de signets qu'un utilisateur peut ajouter en un jour"
     max_edits_per_day: "Quantité maximale de modifications de messages qu'un utilisateur peut effectuer en un jour"
-    max_favorites_per_day: "Quantité maximale de disscussions pouvant être mises en favoris en un jour"
+    max_stars_per_day: "Quantité maximale de disscussions pouvant être mises en favoris en un jour"
     max_topics_per_day: "Quantité maximale de discussions que vous pouvez créer en un jour"
     max_private_messages_per_day: "Quantité maximale de messages privés que vous pouvez envoyer en un jour"
     suggested_topics: "Nombre de discussions suggérées à la fin d'une discussion"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index e731261e8..14e07f0e5 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -342,7 +342,7 @@ id:
     post_undo_action_window_mins: "Number of seconds users are allowed to reverse actions on a post (like, flag, etc)"
     must_approve_users: "Admins must approve all users before they gain access"
     ga_tracking_code: "Google analytics tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
-    top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
     topics_per_page: "How many topics are loaded by default on the topics list page"
@@ -392,7 +392,7 @@ id:
     max_flags_per_day: "Maximum number of flags per user per day"
     max_bookmarks_per_day: "Maximum number of bookmarks per user per day"
     max_edits_per_day: "Maximum number of edits per user per day"
-    max_favorites_per_day: "Maximum number of topics that can be favorited per user per day"
+    max_stars_per_day: "Maximum number of topics that can be starred per user per day"
     max_topics_per_day: "Maximum number of topics a user can create per day"
     max_private_messages_per_day: "The maximum amount of private messages users can create per day"
 
@@ -456,7 +456,7 @@ id:
     mentions: "Mentions"
     quotes: "Quotes"
     edits: "Edits"
-    favorites: "Favorites"
+    starred: "Favorites"
     sent_items: "Sent Items"
     inbox: "Inbox"
 
@@ -467,7 +467,7 @@ id:
     responded_to: "replied to"
     mentioned: "mentioned"
     quoted: "quoted"
-    favorited: "favorited"
+    starred: "favorited"
     edited: "edited"
 
   move_posts:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 8301e58c1..3af56b03d 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -319,7 +319,7 @@ it:
       title: "Segnalibri"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi segnalibri"
-    favorites:
+    starred:
       title: "Favoriti"
       xaxis: "Giorno"
       yaxis: "Numero di nuovi favoriti"
@@ -462,7 +462,7 @@ it:
     must_approve_users: "Gli amministratori devono autorizzare ogni utente prima che esso abbia accesso"
     ga_tracking_code: "Codice Google Analytics per il tracking, es: UA-12345678-9; per informazioni http://google.com/analytics"
     ga_domain_name: "Nome del Dominio Google analytics, esempio: miosito.com; see http://google.com/analytics"
-    top_menu: "Determina quali elementi vengono mostrati nella navigazione in homepage, ed in quale ordine. Esempio latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "Determina quali elementi vengono mostrati nella navigazione in homepage, ed in quale ordine. Esempio latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "Determina quali elementi vengono mostrati nel menù del post, ed in quale ordine. Esempio like|edit|flag|delete|share|bookmark|reply"
     share_links: "Determina quali elementi vengono mostrati nella dialog di condivisione e in quale ordine. Esempio twitter|facebook|google+"
     track_external_right_clicks: "Traccia i link esterni sui quali viene fatto click destro (es: apri in una nuova tab). Disabilitato di default perché viene fatto il rewrite delle URL"
@@ -512,7 +512,7 @@ it:
     max_flags_per_day: "Numero massimo di segnalazioni che un utente può fare in un giorno"
     max_bookmarks_per_day: "Numero massimo di segnalibri che un utente può fare in un giorno"
     max_edits_per_day: "Numero massimo di modifiche in un giorno"
-    max_favorites_per_day: "Numero massimo topic preferiti da un utente in un giorno"
+    max_stars_per_day: "Numero massimo topic preferiti da un utente in un giorno"
     max_topics_per_day: "Numero massimo di topic che un utente può creare in un giorno"
     max_private_messages_per_day: "Numero massimo di messaggi privati che un utente può creare in un giorno"
 
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 704a1c83e..c929d566a 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -354,7 +354,7 @@ ja:
       title: "ブックマーク"
       xaxis: "日"
       yaxis: "新規ブックマーク数"
-    favorites:
+    starred:
       title: "お気に入り"
       xaxis: "日"
       yaxis: "新規お気に入りの数"
@@ -533,7 +533,7 @@ ja:
     ga_domain_name: "Google analytics のドメイン名。例: mysite.com; 参考 http://google.com/analytics"
     enable_escaped_fragments: "古いサーチエンジンクローラがあなたのサイトのインデックスを構築するのをサポートするワークアラウンドを有効にする。注意: 必要な場合のみ有効にすることを推奨。"
     enable_noscript_support: "noscript タグ経由でアクセスしてきた標準サーチエンジンクローラのサポートを有効にする"
-    top_menu: "ホームページナビゲーションに表示する項目を指定。例 latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "ホームページナビゲーションに表示する項目を指定。例 latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "ポストメニューに表示する項目を指定。例 like|edit|flag|delete|share|bookmark|reply"
     share_links: "シェアダイアログに表示する項目を指定。例 twitter|facebook|google+|email"
     track_external_right_clicks: "右クリックされた外部リンクをトラックする (例: 新しいタブで開く)。URL のリライトを要するためデフォルトでは無効化されています"
@@ -600,7 +600,7 @@ ja:
     max_flags_per_day: "一日のうちにユーザがフラグを立てられる最大数"
     max_bookmarks_per_day: "一日のうちにユーザがブックマークできる最大数"
     max_edits_per_day: "一日のうちにユーザが編集できる最大数"
-    max_favorites_per_day: "一日のうちにユーザがお気に入り登録できる最大トピック数"
+    max_stars_per_day: "一日のうちにユーザがお気に入り登録できる最大トピック数"
     max_topics_per_day: "一日のうちにユーザが作成できるトピックの最大数"
     max_private_messages_per_day: "一日のうちにユーザが送信可能なプライベートメッセージの最大数"
 
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index e2b9264be..6e7ee7f3f 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -368,7 +368,7 @@ ko:
       title: "북마크들"
       xaxis: "일"
       yaxis: "새로운 북마크 수"
-    favorites:
+    starred:
       title: "즐겨찾기"
       xaxis: "일"
       yaxis: "새로운 즐겨찾기 수"
@@ -552,7 +552,7 @@ ko:
     ga_domain_name: "Google analytics domain name, eg: mysite.com; see http://google.com/analytics"
     enable_escaped_fragments: "당신의 사이트의 오래된 정보를 검색하기 위한 웹크롤러 Workaround 솔루션을 활성. 주의: 꼭 필요할 때만 활성화"
     enable_noscript_support: "당신의 사이트를 검색하기 위한 noscript 테그를 이용한 일반적인 웹 크롤러를 활성화"
-    top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "게시물 메뉴에 어떤 사항들이 무슨 순서로 올라올지 결정합니다. 예: 좋아요|수정|신고|삭제|공유|북마크|답글"
     share_links: "Determine which items appear on the share dialog, and in what order. Example twitter|facebook|google+"
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
@@ -615,7 +615,7 @@ ko:
     max_flags_per_day: "Maximum number of flags per user per day"
     max_bookmarks_per_day: "Maximum number of bookmarks per user per day"
     max_edits_per_day: "Maximum number of edits per user per day"
-    max_favorites_per_day: "Maximum number of topics that can be favorited per user per day"
+    max_stars_per_day: "Maximum number of topics that can be starred per user per day"
     max_topics_per_day: "Maximum number of topics a user can create per day"
     max_private_messages_per_day: "The maximum amount of private messages users can create per day"
 
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 1f060be0c..5602e15b2 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -371,7 +371,7 @@ nl:
       title: Bladwijzers
       xaxis: Dag
       yaxis: Aantal nieuwe bladwijzers
-    favorites:
+    starred:
       title: Favorieten
       xaxis: Dag
       yaxis: Aantal nieuwe favorieten
@@ -564,7 +564,7 @@ nl:
     ga_domain_name: "Google analytics domeinnaam, bijv. mijnsite.nl; zie http://google.com/analytics"
     enable_escaped_fragments: "Schakel workaround in om oude crawlers je site te kunnen laten indexeren. WAARSCHUWING: gebruik dit alleen als je het echt nodig hebt."
     enable_noscript_support: "Ondersteun &lt;noscript&gt; tag"
-    top_menu: "De volgorde en selectie van items in het hoofdmenu. Bijvoorbeeld latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "De volgorde en selectie van items in het hoofdmenu. Bijvoorbeeld latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "De volgorde en selectie van items in het berichtmenu. Bijvoorbeeld like|edit|flag|delete|share|bookmark|reply"
     share_links: "De volgorde en selectie van items in het deelmenu. Bijvoorbeeld twitter|facebook|google+"
     track_external_right_clicks: "Houd bij welke externe links met de rechtermuisknop worden aangeklikt (bijv: open in nieuwe tab). Dit staat standaard uit, gezien het de URLs moet herschrijven, waardoor het gebruiksgemak afneemt"
@@ -627,7 +627,7 @@ nl:
     max_flags_per_day: Het maximaal aantal moderatie-meldingen dat een lid per dag kan geven
     max_bookmarks_per_day: Het maximaal aantal favorieten dat een lid per dag kan aanmaken
     max_edits_per_day: Het maximaal aantal bewerkingen dat een lid per dag kan maken
-    max_favorites_per_day: Het maximaal aantal topics dat als favoriet ingesteld kan worden binnen een dag
+    max_stars_per_day: Het maximaal aantal topics dat als favoriet ingesteld kan worden binnen een dag
     max_topics_per_day: Het maximaal aantal topics dat je kan aanmaken op een dag
     max_private_messages_per_day: Het maximaal aantal privé-berichten dat je per dag kan versturen
 
diff --git a/config/locales/server.pseudo.yml b/config/locales/server.pseudo.yml
index b8cbb9a6d..f427b90ef 100644
--- a/config/locales/server.pseudo.yml
+++ b/config/locales/server.pseudo.yml
@@ -398,7 +398,7 @@ pseudo:
       title: '[[ Ɓóóǩɱářǩš ]]'
       xaxis: '[[ Ďáý ]]'
       yaxis: '[[ Ѝůɱƀéř óƒ ɳéŵ ƀóóǩɱářǩš ]]'
-    favorites:
+    starred:
       title: '[[ Ƒáνóříťéš ]]'
       xaxis: '[[ Ďáý ]]'
       yaxis: '[[ Ѝůɱƀéř óƒ ɳéŵ ƒáνóříťéš ]]'
@@ -791,7 +791,7 @@ pseudo:
     max_flags_per_day: '[[ Ϻáхíɱůɱ ɳůɱƀéř óƒ ƒłáǧš ƿéř ůšéř ƿéř ďáý ]]'
     max_bookmarks_per_day: '[[ Ϻáхíɱůɱ ɳůɱƀéř óƒ ƀóóǩɱářǩš ƿéř ůšéř ƿéř ďáý ]]'
     max_edits_per_day: '[[ Ϻáхíɱůɱ ɳůɱƀéř óƒ éďíťš ƿéř ůšéř ƿéř ďáý ]]'
-    max_favorites_per_day: '[[ Ϻáхíɱůɱ ɳůɱƀéř óƒ ťóƿíčš ťĥáť čáɳ ƀé ƒáνóříťéď ƿéř
+    max_stars_per_day: '[[ Ϻáхíɱůɱ ɳůɱƀéř óƒ ťóƿíčš ťĥáť čáɳ ƀé ƒáνóříťéď ƿéř
       ůšéř ƿéř ďáý ]]'
     max_topics_per_day: '[[ Ϻáхíɱůɱ ɳůɱƀéř óƒ ťóƿíčš á ůšéř čáɳ čřéáťé ƿéř ďáý ]]'
     max_private_messages_per_day: '[[ Ťĥé ɱáхíɱůɱ áɱóůɳť óƒ ƿříνáťé ɱéššáǧéš ůšéřš
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index acd0cc419..b0f4c9084 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -283,7 +283,7 @@ pt:
     post_undo_action_window_mins: "The window in which someone can reverse an action on a post (such as liking)"
     must_approve_users: "The owners of the forum must approve users before they gain access."
     ga_tracking_code: "Google analytics tracking code, see: http://google.com/analytics"
-    top_menu: "The order of the items in the top menu. Example latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "The order of the items in the top menu. Example latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "The order of the items on the post menu."
     max_length_show_reply: "Embedded replies to posts won't be shown if they directly below and are below this length."
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default cause it has to re-write urls, hurting usability"
@@ -321,7 +321,7 @@ pt:
     max_flags_per_day: "The maximum amount of flags a user can perform in a day"
     max_bookmarks_per_day: "The maximum amount of bookmarks a user can create in a day"
     max_edits_per_day: "The maximum amount of edits a user can perform in a day"
-    max_favorites_per_day: "The maximum amount of topics that can be favorited in a day"
+    max_stars_per_day: "The maximum amount of topics that can be starred in a day"
     max_topics_per_day: "The maximum amount of topics you can create in a day"
     max_private_messages_per_day: "The maximum amount of private messages you can send in a day"
 
@@ -378,7 +378,7 @@ pt:
     mentions: "Menções"
     quotes: "Citações"
     edits: "Edições"
-    favorites: "Favoritos"
+    starred: "Favoritos"
     sent_items: "Items Enviados"
     inbox: "Caixa de Entrada"
 
@@ -389,7 +389,7 @@ pt:
     responded_to: "respondeu a"
     mentioned: "mencionou"
     quoted: "citou"
-    favorited: "favoritou"
+    starred: "favoritou"
     edited: "editou"
 
   move_posts:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 4b14c7a6b..9beb28551 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -360,7 +360,7 @@ pt_BR:
       title: "Marcadores Adicionados"
       xaxis: "Dia"
       yaxis: "Número de novos marcadores adicionados"
-    favorites:
+    starred:
       title: "Favoritos"
       xaxis: "Dia"
       yaxis: "Número de novos favoritos"
@@ -544,7 +544,7 @@ pt_BR:
     ga_domain_name: "Nome de domínio no Google Analytics, exemplo: meusite.com; see http://google.com/analytics"
     enable_escaped_fragments: "Ativa solução alternativa que ajuda os mecanismos de busca antigos a indexarem o seu site. ALERTA: apenas ative se você realmente precisa disto."
     enable_noscript_support: "Ativar suporte a tag &lt;noscript&gt;"
-    top_menu: "A ordem dos items no menu de cima. Exemplo latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "A ordem dos items no menu de cima. Exemplo latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "A ordem dos items no menu da postagem."
     share_links: "Determine quais ítens aparecerem no diálogo de compartilhar, e em que ordem. Por exemplo: twitter|facebook|google+|email"
     track_external_right_clicks: "Rastrear cliques externos que são clicados com o botão direito (ex: abrir em nova aba) desativado por padrão, pois tem que reescrever urls, quebrando a usabilidade"
@@ -607,7 +607,7 @@ pt_BR:
     max_flags_per_day: "Quantidade máxima de sinalizações que um usuário pode fazer por dia"
     max_bookmarks_per_day: "Quantidade máxima de marcadores que um usuário pode adicionar por dia"
     max_edits_per_day: "Quantidade máxima de edições que um usuário pode fazer por dia"
-    max_favorites_per_day: "Quantidade máxima de tópicos que um usuário pode favoritar por dia"
+    max_stars_per_day: "Quantidade máxima de tópicos que um usuário pode favoritar por dia"
     max_topics_per_day: "Quantidade máxima de tópicos que você pode criar por dia"
     max_private_messages_per_day: "Quantidade máxima de mensagens particulares que você pode enviar por dia"
 
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 637ed136d..903d0a7ba 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -371,7 +371,7 @@ ru:
       title: Закладки
       xaxis: День
       yaxis: 'Количество новых закладок'
-    favorites:
+    starred:
       title: Избранное
       xaxis: День
       yaxis: 'Количество новых избранных записей'
@@ -552,7 +552,7 @@ ru:
     ga_domain_name: 'Доменное имя для Google analytics, например: mysite.com; смотрите http://google.com/analytics'
     enable_escaped_fragments: 'Включить поддержку escaped_fragments для устаревших поисковых роботов (типа Яндекс). Внимание: включайте только при крайней необходимости.'
     enable_noscript_support: 'Включить поддержку тэга noscript для поисковых роботов'
-    top_menu: 'Определите, как должны располагаться элементы в навигации на главной странице. Пример: latest|hot|read|favorited|unread|new|posted|categories'
+    top_menu: 'Определите, как должны располагаться элементы в навигации на главной странице. Пример: latest|hot|read|starred|unread|new|posted|categories'
     post_menu: 'Определите, какие элементы должны отображаться в меню у сообщения и в какой последовательности.  Пример: like|edit|flag|delete|share|bookmark|reply'
     share_links: 'Определите, какие элементы должны отображаться в меню «Поделиться» и в какой последовательности. Пример: twitter|facebook|google+'
     track_external_right_clicks: 'Отслеживать внешние ссылки, открытые правой кнопкой мыши (например: открыть в новой вкладке), по умолчанию отключено, так как это перезаписывает пути'
@@ -598,7 +598,7 @@ ru:
     max_flags_per_day: 'Максимальное количество поданных жалоб пользователем в день'
     max_bookmarks_per_day: 'Максимальное количество созданных закладок пользователем в день'
     max_edits_per_day: 'Максимальное количество изменений пользователем в день'
-    max_favorites_per_day: 'Максимальное количество тем, занесенных пользователем в Избранное в день'
+    max_stars_per_day: 'Максимальное количество тем, занесенных пользователем в Избранное в день'
     max_topics_per_day: 'Максимальное количество тем, которое пользователь может создать в день'
     max_private_messages_per_day: 'Максимальное количество личных сообщений, которое пользователь может послать в день'
     suggested_topics: 'Количество рекомендованных тем, отображаемых внизу текущей темы'
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 3b5e4989b..4bd71603a 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -384,7 +384,7 @@ sv:
     post_undo_action_window_mins: "Number of seconds users are allowed to reverse actions on a post (like, flag, etc)"
     must_approve_users: "Admins must approve all users before they gain access"
     ga_tracking_code: "Google analytics tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
-    top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     share_links: "Determine which items appear on the share dialog, and in what order. Example twitter|facebook|google+|email"
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
@@ -434,7 +434,7 @@ sv:
     max_flags_per_day: "Maximum number of flags per user per day"
     max_bookmarks_per_day: "Maximum number of bookmarks per user per day"
     max_edits_per_day: "Maximum number of edits per user per day"
-    max_favorites_per_day: "Maximum number of topics that can be favorited per user per day"
+    max_stars_per_day: "Maximum number of topics that can be starred per user per day"
     max_topics_per_day: "Maximum number of topics a user can create per day"
     max_private_messages_per_day: "The maximum amount of private messages users can create per day"
 
@@ -512,7 +512,7 @@ sv:
     mentions: "Mentions"
     quotes: "Quotes"
     edits: "Edits"
-    favorites: "Favorites"
+    starred: "Favorites"
     sent_items: "Sent Items"
     inbox: "Inbox"
 
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 25d00e35b..6207ad699 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -325,7 +325,7 @@ zh_CN:
       title: "书签"
       xaxis: "天"
       yaxis: "新书签数"
-    favorites:
+    starred:
       title: "喜爱"
       xaxis: "天"
       yaxis: "新喜爱数"
@@ -482,7 +482,7 @@ zh_CN:
     must_approve_users: "用户必须获得管理员批准方能访问"
     ga_tracking_code: "谷歌分析追踪代码，例如：UA-12345678-9。参考 http://google.com/analytics"
     ga_domain_name: "谷歌分析域名，例如：mysite.com；参考 http://google.com/analytics"
-    top_menu: "确定在主页导航条包含哪些条目，以及排列顺序。例如：latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "确定在主页导航条包含哪些条目，以及排列顺序。例如：latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "确定在帖子菜单条包含哪些条目，以及排列顺序。例如：like|edit|flag|delete|share|bookmark|reply"
     share_links: "确定在分享对话框里显示哪些条目、以什么顺序显示。例如 twitter|facebook|google+"
     track_external_right_clicks: "追踪外部链接的右键点击（例如：在浏览器新标签打开），缺省是禁用的，因为它会重写URL"
@@ -532,7 +532,7 @@ zh_CN:
     max_flags_per_day: "每个用户每天能做投诉数量的最大值"
     max_bookmarks_per_day: "每个用户每天能做书签数量的最大值"
     max_edits_per_day: "每个用户每天能编辑的次数的最大值"
-    max_favorites_per_day: "每个用户每天能收藏的主题数量的最大值"
+    max_stars_per_day: "每个用户每天能收藏的主题数量的最大值"
     max_topics_per_day: "每个用户每天能创建的主题数量的最大值"
     max_private_messages_per_day: "每个用户每天能发私信数量的最大值"
 
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 98e9be9e0..7a62a3811 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -319,7 +319,7 @@ zh_TW:
       title: "書簽"
       xaxis: "天"
       yaxis: "新書簽數"
-    favorites:
+    starred:
       title: "喜愛"
       xaxis: "天"
       yaxis: "新喜愛數"
@@ -462,7 +462,7 @@ zh_TW:
     must_approve_users: "用戶必須獲得管理員批准方能訪問"
     ga_tracking_code: "谷歌分析追蹤代碼，例如：UA-12345678-9。參考 http://google.com/analytics"
     ga_domain_name: "谷歌分析域名，例如：mysite.com；參考 http://google.com/analytics"
-    top_menu: "確定在主頁導航條包含哪些條目，以及排列順序。例如：latest|hot|read|favorited|unread|new|posted|categories"
+    top_menu: "確定在主頁導航條包含哪些條目，以及排列順序。例如：latest|hot|read|starred|unread|new|posted|categories"
     post_menu: "確定在帖子菜單條包含哪些條目，以及排列順序。例如：like|edit|flag|delete|share|bookmark|reply"
     share_links: "確定在分享對話框裏顯示哪些條目、以什麽順序顯示。例如 twitter|facebook|google+"
     track_external_right_clicks: "追蹤外部鏈接的右鍵點擊（例如：在浏覽器新標簽打開），缺省是禁用的，因爲它會重寫URL"
@@ -512,7 +512,7 @@ zh_TW:
     max_flags_per_day: "每個用戶每天能做投訴數量的最大值"
     max_bookmarks_per_day: "每個用戶每天能做書簽數量的最大值"
     max_edits_per_day: "每個用戶每天能編輯的次數的最大值"
-    max_favorites_per_day: "每個用戶每天能收藏的主題數量的最大值"
+    max_stars_per_day: "每個用戶每天能收藏的主題數量的最大值"
     max_topics_per_day: "每個用戶每天能創建的主題數量的最大值"
     max_private_messages_per_day: "每個用戶每天能發私信數量的最大值"
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 0ead7d812..c3b02920d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -43,7 +43,7 @@ basic:
     default: true
   top_menu:
     client: true
-    default: 'latest|new|unread|favorited|categories'
+    default: 'latest|new|unread|starred|categories'
   post_menu:
     client: true
     default: 'like|edit|flag|delete|share|bookmark|reply'
@@ -336,7 +336,7 @@ rate_limits:
   max_bookmarks_per_day: 20
   max_flags_per_day: 20
   max_edits_per_day: 30
-  max_favorites_per_day: 20
+  max_stars_per_day: 20
 
 developer:
   force_hostname: ''
diff --git a/db/migrate/20140109205940_rename_favorites_to_starred.rb b/db/migrate/20140109205940_rename_favorites_to_starred.rb
new file mode 100644
index 000000000..ec59b71e7
--- /dev/null
+++ b/db/migrate/20140109205940_rename_favorites_to_starred.rb
@@ -0,0 +1,11 @@
+class RenameFavoritesToStarred < ActiveRecord::Migration
+  def up
+    execute "UPDATE site_settings SET name = 'max_stars_per_day' where name = 'max_favorites_per_day'"
+    execute "UPDATE site_settings SET value = REPLACE(value, '|favorited', '|starred') where name = 'top_menu'"
+  end
+
+  def down
+    execute "UPDATE site_settings SET name = 'max_favorites_per_day' where name = 'max_stars_per_day'"
+    execute "UPDATE site_settings SET value = REPLACE(value, '|starred', '|favorited') where name = 'top_menu'"
+  end
+end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index b150d61ad..c5369662a 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -31,7 +31,7 @@ module Discourse
   class CSRF < Exception; end
 
   def self.filters
-    @filters ||= [:latest, :hot, :unread, :new, :favorited, :read, :posted]
+    @filters ||= [:latest, :hot, :unread, :new, :starred, :read, :posted]
   end
 
   def self.anonymous_filters
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index bdde8255c..f1aaf3825 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -55,9 +55,9 @@ class TopicQuery
     create_list(:latest)
   end
 
-  # The favorited topics
-  def list_favorited
-    create_list(:favorited) {|topics| topics.where('tu.starred') }
+  # The starred topics
+  def list_starred
+    create_list(:starred) {|topics| topics.where('tu.starred') }
   end
 
   def list_read
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index d58ba3ef5..80300294d 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -256,22 +256,22 @@ describe TopicQuery do
 
   end
 
-  context 'list_favorited' do
+  context 'list_starred' do
 
     let(:topic) { Fabricate(:topic) }
 
-    it "returns no results when the user hasn't favorited anything" do
-      topic_query.list_favorited.topics.should be_blank
+    it "returns no results when the user hasn't starred any topics" do
+      topic_query.list_starred.topics.should be_blank
     end
 
-    context 'with a favorited topic' do
+    context 'with a starred topic' do
 
       before do
         topic.toggle_star(user, true)
       end
 
-      it "returns the topic after it has been favorited" do
-        topic_query.list_favorited.topics.should == [topic]
+      it "returns the topic after it has been starred" do
+        topic_query.list_starred.topics.should == [topic]
       end
     end
 
diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb
index 7b887b4c8..a53e07235 100644
--- a/spec/controllers/list_controller_spec.rb
+++ b/spec/controllers/list_controller_spec.rb
@@ -8,7 +8,7 @@ describe ListController do
     @post = Fabricate(:post, user: @user)
 
     # forces tests down some code paths
-    SiteSetting.stubs(:top_menu).returns('latest,-video|new|unread|favorited|categories|category/beer')
+    SiteSetting.stubs(:top_menu).returns('latest,-video|new|unread|starred|categories|category/beer')
   end
 
   describe 'indexes' do
@@ -175,15 +175,15 @@ describe ListController do
     end
   end
 
-  context 'favorited' do
+  context 'starred' do
     it 'raises an error when not logged in' do
-      lambda { xhr :get, :favorited }.should raise_error(Discourse::NotLoggedIn)
+      lambda { xhr :get, :starred }.should raise_error(Discourse::NotLoggedIn)
     end
 
     context 'when logged in' do
       before do
         log_in_user(@user)
-        xhr :get, :favorited
+        xhr :get, :starred
       end
 
       it { should respond_with(:success) }
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 00da3e8af..621452c9e 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -581,7 +581,7 @@ describe Topic do
       end
 
       it 'triggers the rate limiter' do
-        Topic::FavoriteLimiter.any_instance.expects(:performed!)
+        Topic::StarLimiter.any_instance.expects(:performed!)
         @topic.toggle_star(@user, true)
       end
     end
@@ -600,7 +600,7 @@ describe Topic do
       end
 
       it 'rolls back the rate limiter' do
-        Topic::FavoriteLimiter.any_instance.expects(:rollback!)
+        Topic::StarLimiter.any_instance.expects(:rollback!)
         @topic.toggle_star(@user, false)
       end
 
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index d0b34a274..a86e2eb38 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -244,8 +244,8 @@ describe UserAction do
 
   end
 
-  describe 'synchronize_favorites' do
-    it 'corrects out of sync favs' do
+  describe 'synchronize_starred' do
+    it 'corrects out of sync starred' do
       post = Fabricate(:post)
       post.topic.toggle_star(post.user, true)
       UserAction.delete_all
@@ -266,7 +266,7 @@ describe UserAction do
         target_post_id: -1,
       )
 
-      UserAction.synchronize_favorites
+      UserAction.synchronize_starred
 
       actions = UserAction.all.to_a
 
diff --git a/test/javascripts/components/keyboard_shortcuts_component_test.js b/test/javascripts/components/keyboard_shortcuts_component_test.js
index 49ffab555..749a6210c 100644
--- a/test/javascripts/components/keyboard_shortcuts_component_test.js
+++ b/test/javascripts/components/keyboard_shortcuts_component_test.js
@@ -47,7 +47,7 @@ module("Discourse.KeyboardShortcuts", {
       "  </td></tr>",
       "</table>",
       "<div id='topic-footer-buttons'>",
-      "  <button class='favorite'></button>",
+      "  <button class='star'></button>",
       "  <button class='create'></button>",
       "  <button class='share'></button>",
       "</div>",
diff --git a/test/javascripts/fixtures/site_settings_fixtures.js b/test/javascripts/fixtures/site_settings_fixtures.js
index fcd8d1875..94ff7460f 100644
--- a/test/javascripts/fixtures/site_settings_fixtures.js
+++ b/test/javascripts/fixtures/site_settings_fixtures.js
@@ -1,3 +1,3 @@
 /*jshint maxlen:10000000 */
-Discourse.SiteSettingsOriginal = {"title":"Discourse Meta","logo_url":"/assets/logo.png","logo_small_url":"/assets/logo-single.png","traditional_markdown_linebreaks":false,"top_menu":"latest|new|unread|read|favorited|categories","post_menu":"like|edit|flag|delete|share|bookmark|reply","share_links":"twitter|facebook|google+|email","track_external_right_clicks":false,"must_approve_users":false,"ga_tracking_code":"UA-33736483-2","ga_domain_name":"","enable_long_polling":true,"polling_interval":3000,"anon_polling_interval":30000,"min_post_length":20,"max_post_length":16000,"min_topic_title_length":15,"max_topic_title_length":255,"min_private_message_title_length":2,"allow_uncategorized_topics":true,"min_search_term_length":3,"flush_timings_secs":5,"suppress_reply_directly_below":true,"email_domains_blacklist":"mailinator.com","email_domains_whitelist":null,"version_checks":true,"min_title_similar_length":10,"min_body_similar_length":15,"category_colors":"BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|283890","max_upload_size_kb":1024,"category_featured_topics":6,"favicon_url":"/assets/favicon.ico","dynamic_favicon":false,"uncategorized_name":"uncategorized","uncategorized_color":"AB9364","uncategorized_text_color":"FFFFFF","invite_only":false,"login_required":false,"min_password_length":8,"enable_local_logins":true,"enable_local_account_create":true,"enable_google_logins":true,"enable_yahoo_logins":true,"enable_twitter_logins":true,"enable_facebook_logins":true,"enable_cas_logins":false,"enable_github_logins":true,"enable_persona_logins":true,"educate_until_posts":2,"topic_views_heat_low":1000,"topic_views_heat_medium":2000,"topic_views_heat_high":5000,"min_private_message_post_length":5,"faq_url":"","tos_url":"","privacy_policy_url":"","authorized_extensions":".jpg|.jpeg|.png|.gif|.txt","relative_date_duration":14,"delete_removed_posts_after":24,"delete_user_max_age":7, "default_code_lang": "lang-auto", "suppress_uncategorized_badge": true};
+Discourse.SiteSettingsOriginal = {"title":"Discourse Meta","logo_url":"/assets/logo.png","logo_small_url":"/assets/logo-single.png","traditional_markdown_linebreaks":false,"top_menu":"latest|new|unread|read|starred|categories","post_menu":"like|edit|flag|delete|share|bookmark|reply","share_links":"twitter|facebook|google+|email","track_external_right_clicks":false,"must_approve_users":false,"ga_tracking_code":"UA-33736483-2","ga_domain_name":"","enable_long_polling":true,"polling_interval":3000,"anon_polling_interval":30000,"min_post_length":20,"max_post_length":16000,"min_topic_title_length":15,"max_topic_title_length":255,"min_private_message_title_length":2,"allow_uncategorized_topics":true,"min_search_term_length":3,"flush_timings_secs":5,"suppress_reply_directly_below":true,"email_domains_blacklist":"mailinator.com","email_domains_whitelist":null,"version_checks":true,"min_title_similar_length":10,"min_body_similar_length":15,"category_colors":"BF1E2E|F1592A|F7941D|9EB83B|3AB54A|12A89D|25AAE2|0E76BD|652D90|92278F|ED207B|8C6238|231F20|808281|B3B5B4|283890","max_upload_size_kb":1024,"category_featured_topics":6,"favicon_url":"/assets/favicon.ico","dynamic_favicon":false,"uncategorized_name":"uncategorized","uncategorized_color":"AB9364","uncategorized_text_color":"FFFFFF","invite_only":false,"login_required":false,"min_password_length":8,"enable_local_logins":true,"enable_local_account_create":true,"enable_google_logins":true,"enable_yahoo_logins":true,"enable_twitter_logins":true,"enable_facebook_logins":true,"enable_cas_logins":false,"enable_github_logins":true,"enable_persona_logins":true,"educate_until_posts":2,"topic_views_heat_low":1000,"topic_views_heat_medium":2000,"topic_views_heat_high":5000,"min_private_message_post_length":5,"faq_url":"","tos_url":"","privacy_policy_url":"","authorized_extensions":".jpg|.jpeg|.png|.gif|.txt","relative_date_duration":14,"delete_removed_posts_after":24,"delete_user_max_age":7, "default_code_lang": "lang-auto", "suppress_uncategorized_badge": true};
 Discourse.SiteSettings = jQuery.extend(true, {}, Discourse.SiteSettingsOriginal);