diff --git a/app/src/main/java/com/hippo/ehviewer/EhDB.java b/app/src/main/java/com/hippo/ehviewer/EhDB.java
index 40e563de9..7d1ad185a 100644
--- a/app/src/main/java/com/hippo/ehviewer/EhDB.java
+++ b/app/src/main/java/com/hippo/ehviewer/EhDB.java
@@ -38,8 +38,8 @@ import com.hippo.ehviewer.dao.GalleryInfoDao;
 import com.hippo.ehviewer.dao.GalleryInfoRaw;
 import com.hippo.ehviewer.dao.HistoryInfoDao;
 import com.hippo.ehviewer.dao.HistoryInfoRaw;
-import com.hippo.ehviewer.dao.LocalFavoriteDao;
-import com.hippo.ehviewer.dao.LocalFavoriteRaw;
+import com.hippo.ehviewer.dao.LocalFavoritesDao;
+import com.hippo.ehviewer.dao.LocalFavoritesRaw;
 import com.hippo.ehviewer.dao.QuickSearchDao;
 import com.hippo.ehviewer.dao.QuickSearchRaw;
 import com.hippo.ehviewer.download.DownloadInfo;
@@ -150,15 +150,15 @@ public class EhDB {
             // Ignore
         }
 
-        // Merge local favorite
+        // Merge local favorites
         try {
             Cursor cursor = oldDB.rawQuery("select * from " + OldDBHelper.TABLE_LOCAL_FAVOURITE, null);
             if (cursor != null) {
-                LocalFavoriteDao dao = sDaoSession.getLocalFavoriteDao();
+                LocalFavoritesDao dao = sDaoSession.getLocalFavoritesDao();
                 if (cursor.moveToFirst()) {
                     long i = 0L;
                     while (!cursor.isAfterLast()) {
-                        LocalFavoriteRaw raw = new LocalFavoriteRaw();
+                        LocalFavoritesRaw raw = new LocalFavoritesRaw();
                         raw.setGid((long) cursor.getInt(0));
                         raw.setDate(i);
                         dao.insert(raw);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
index 4d01247a7..ee58e2be1 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java
@@ -104,10 +104,10 @@ public class FavoritesScene extends BaseScene implements
 
     @Nullable
     @ViewLifeCircle
-    private FavoriteAdapter mAdapter;
+    private FavoritesAdapter mAdapter;
     @Nullable
     @ViewLifeCircle
-    private FavoriteHelper mHelper;
+    private FavoritesHelper mHelper;
     @Nullable
     @ViewLifeCircle
     private SearchBarMover mSearchBarMover;
@@ -207,7 +207,7 @@ public class FavoritesScene extends BaseScene implements
             @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         Resources resources = getResources();
 
-        View view = inflater.inflate(R.layout.scene_favorite, container, false);
+        View view = inflater.inflate(R.layout.scene_favorites, container, false);
         ContentLayout contentLayout = (ContentLayout) view.findViewById(R.id.content_layout);
         mRecyclerView = contentLayout.getRecyclerView();
         AssertUtils.assertNotNull(mRecyclerView);
@@ -216,12 +216,12 @@ public class FavoritesScene extends BaseScene implements
         mFabLayout = (FabLayout) view.findViewById(R.id.fab_layout);
         AssertUtils.assertNotNull(mFabLayout);
 
-        mHelper = new FavoriteHelper();
+        mHelper = new FavoritesHelper();
         mHelper.setEmptyString(getString(R.string.gallery_list_empty_hit)); // TODO wrong string
         contentLayout.setHelper(mHelper);
         contentLayout.getFastScroller().setOnDragHandlerListener(this);
 
-        mAdapter = new FavoriteAdapter();
+        mAdapter = new FavoritesAdapter();
         mRecyclerView.setAdapter(mAdapter);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         mRecyclerView.setSelector(RippleSalon.generateRippleDrawable(false));
@@ -392,7 +392,7 @@ public class FavoritesScene extends BaseScene implements
             args.putParcelable(GalleryDetailScene.KEY_GALLERY_INFO, gi);
             Announcer announcer = new Announcer(GalleryDetailScene.class).setArgs(args);
             if (ApiHelper.SUPPORT_TRANSITION) {
-                FavoriteHolder holder = (FavoriteHolder) mRecyclerView.getChildViewHolder(view);
+                FavoritesHolder holder = (FavoritesHolder) mRecyclerView.getChildViewHolder(view);
                 announcer.setTranHelper(new EnterGalleryDetailTransaction(holder));
             }
             startScene(announcer);
@@ -710,9 +710,9 @@ public class FavoritesScene extends BaseScene implements
 
     private static class EnterGalleryDetailTransaction implements TransitionHelper {
 
-        private final FavoriteHolder mHolder;
+        private final FavoritesHolder mHolder;
 
-        public EnterGalleryDetailTransaction(FavoriteHolder holder) {
+        public EnterGalleryDetailTransaction(FavoritesHolder holder) {
             mHolder = holder;
         }
 
@@ -740,7 +740,7 @@ public class FavoritesScene extends BaseScene implements
         }
     }
 
-    private class FavoriteHolder extends RecyclerView.ViewHolder {
+    private class FavoritesHolder extends RecyclerView.ViewHolder {
 
         private final LoadImageView thumb;
         private final TextView title;
@@ -750,7 +750,7 @@ public class FavoritesScene extends BaseScene implements
         private final TextView posted;
         private final TextView simpleLanguage;
 
-        public FavoriteHolder(View itemView) {
+        public FavoritesHolder(View itemView) {
             super(itemView);
 
             thumb = (LoadImageView) itemView.findViewById(R.id.thumb);
@@ -763,17 +763,17 @@ public class FavoritesScene extends BaseScene implements
         }
     }
 
-    private class FavoriteAdapter extends RecyclerView.Adapter<FavoriteHolder> {
+    private class FavoritesAdapter extends RecyclerView.Adapter<FavoritesHolder> {
 
         @Override
-        public FavoriteHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            return new FavoriteHolder(getActivity().getLayoutInflater()
+        public FavoritesHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            return new FavoritesHolder(getActivity().getLayoutInflater()
                     .inflate(R.layout.item_gallery_list, parent, false));
         }
 
         @Override
         @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-        public void onBindViewHolder(FavoriteHolder holder, int position) {
+        public void onBindViewHolder(FavoritesHolder holder, int position) {
             if (mHelper == null) {
                 return;
             }
@@ -808,7 +808,7 @@ public class FavoritesScene extends BaseScene implements
         }
     }
 
-    private class FavoriteHelper extends ContentLayout.ContentHelper<GalleryInfo> {
+    private class FavoritesHelper extends ContentLayout.ContentHelper<GalleryInfo> {
 
         @Override
         protected void getPageData(final int taskId, int type, int page) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index 08cac33b5..5180455b7 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -477,7 +477,7 @@ public final class GalleryListScene extends BaseScene
                                 intent.putExtra(DownloadService.KEY_GALLERY_INFO, gi);
                                 getActivity().startService(intent);
                                 break;
-                            case 1: // Favorite
+                            case 1: // Favorites
                                 // TODO
                                 break;
                         }
diff --git a/app/src/main/res/layout/gallery_detail_actions.xml b/app/src/main/res/layout/gallery_detail_actions.xml
index a2744d6a7..e9479a0c5 100644
--- a/app/src/main/res/layout/gallery_detail_actions.xml
+++ b/app/src/main/res/layout/gallery_detail_actions.xml
@@ -48,7 +48,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
-                    android:text="@string/favorite"
+                    android:text="@string/favorites"
                     android:drawablePadding="8dp"
                     android:textColor="@color/primary_text_light"/>
 
@@ -57,7 +57,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
-                    android:text="@string/favorite"
+                    android:text="@string/favorites"
                     android:drawablePadding="8dp"
                     android:textColor="@color/primary_text_light"/>
 
diff --git a/app/src/main/res/layout/scene_favorite.xml b/app/src/main/res/layout/scene_favorites.xml
similarity index 100%
rename from app/src/main/res/layout/scene_favorite.xml
rename to app/src/main/res/layout/scene_favorites.xml
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9182fb6f7..38fd420d7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -108,7 +108,7 @@
     </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
-    <string name="favorite">收藏</string>
+    <string name="favorites">收藏</string>
     <string name="torrent_count">种子 (%d)</string>
     <string name="share">分享</string>
     <string name="rate">评分</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 36b737ddc..979b3da2d 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -108,7 +108,7 @@
     </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
-    <string name="favorite">收藏</string>
+    <string name="favorites">收藏</string>
     <string name="torrent_count">種子 (%d)</string>
     <string name="share">分享</string>
     <string name="rate">評分</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ed394e7c4..010f8c7b5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -108,7 +108,7 @@
     </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
-    <string name="favorite">收藏</string>
+    <string name="favorites">收藏</string>
     <string name="torrent_count">種子 (%d)</string>
     <string name="share">分享</string>
     <string name="rate">評分</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d712010e0..c3c2604c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -148,7 +148,7 @@
     </plurals>
     <string name="favored_times">\u2665 %d</string>
     <string name="rating_text">%1$s (%2$.2f, %3$d)</string>
-    <string name="favorite">Favorite</string>
+    <string name="favorites">Favorites</string>
     <string name="torrent_count">Torrent (%d)</string>
     <string name="share">Share</string>
     <string name="rate">Rate</string>
@@ -303,7 +303,7 @@
     <string name="dir_picker">Dir picker</string>
     <string name="directory_not_writable">The directory is not writable</string>
 
-    <!-- Favorite -->
+    <!-- Favorites -->
     <string name="all_favorites">All Favorites</string>
     <string name="favorites_search_bar_hint">Search %s</string>
     <string name="favorites_title">%s</string>
diff --git a/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java b/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java
index 0a7ac5c74..9052c12b9 100644
--- a/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java
+++ b/daogenerator/src/main/java/com/hippo/ehviewer/daogenerator/EhDaoGenerator.java
@@ -43,7 +43,7 @@ public class EhDaoGenerator {
         addDownloadDirname(schema);
         addHistoryInfo(schema);
         addQuickSearch(schema);
-        addLocalFavorite(schema);
+        addLocalFavorites(schema);
         new DaoGenerator().generateAll(schema, OUT_DIR);
     }
 
@@ -113,10 +113,10 @@ public class EhDaoGenerator {
         entity.addLongProperty("date");
     }
 
-    private static void addLocalFavorite(Schema schema) {
-        Entity entity = schema.addEntity("LocalFavoriteRaw");
-        entity.setTableName("LOCAL_FAVORITE");
-        entity.setClassNameDao("LocalFavoriteDao");
+    private static void addLocalFavorites(Schema schema) {
+        Entity entity = schema.addEntity("LocalFavoritesRaw");
+        entity.setTableName("LOCAL_FAVORITES");
+        entity.setClassNameDao("LocalFavoritesDao");
         entity.addLongProperty("gid").primaryKey();
         entity.addLongProperty("date");
     }
diff --git a/yorozuya b/yorozuya
index 0241c9c77..8271bdc20 160000
--- a/yorozuya
+++ b/yorozuya
@@ -1 +1 @@
-Subproject commit 0241c9c77599c67ef701fe6c590ce001916003e5
+Subproject commit 8271bdc20ae137edcfdde06be2a862c3425c8932