diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.java b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.java
index 7a93ba09f..4cdd840ae 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryDetail.java
@@ -31,9 +31,9 @@ public class GalleryDetail extends GalleryInfo {
     public String size;
     public String resize;
     public int pages;
-    public int favoredTimes;
-    public boolean isFavored;
-    public int ratedTimes;
+    public int favoriteCount;
+    public boolean isFavorited;
+    public int ratingCount;
     public GalleryTagGroup[] tags;
     public GalleryComment[] comments;
     public int previewPages;
@@ -55,9 +55,9 @@ public class GalleryDetail extends GalleryInfo {
         dest.writeString(this.size);
         dest.writeString(this.resize);
         dest.writeInt(this.pages);
-        dest.writeInt(this.favoredTimes);
-        dest.writeByte(isFavored ? (byte) 1 : (byte) 0);
-        dest.writeInt(this.ratedTimes);
+        dest.writeInt(this.favoriteCount);
+        dest.writeByte(isFavorited ? (byte) 1 : (byte) 0);
+        dest.writeInt(this.ratingCount);
         dest.writeParcelableArray(this.tags, 0);
         dest.writeParcelableArray(this.comments, 0);
         dest.writeInt(this.previewPages);
@@ -77,9 +77,9 @@ public class GalleryDetail extends GalleryInfo {
         this.size = in.readString();
         this.resize = in.readString();
         this.pages = in.readInt();
-        this.favoredTimes = in.readInt();
-        this.isFavored = in.readByte() != 0;
-        this.ratedTimes = in.readInt();
+        this.favoriteCount = in.readInt();
+        this.isFavorited = in.readByte() != 0;
+        this.ratingCount = in.readInt();
         Parcelable[] array = in.readParcelableArray(GalleryTagGroup.class.getClassLoader());
         if (array != null) {
             this.tags = Arrays.copyOf(array, array.length, GalleryTagGroup[].class);
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java
index 4cc907675..6d1b9fab9 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java
@@ -171,7 +171,7 @@ public class GalleryDetailParser {
             gd.visible = "";
             gd.size = "";
             gd.pages = 0;
-            gd.favoredTimes = 0;
+            gd.favoriteCount = 0;
             try {
                 Elements es = gdd.child(0).child(0).children();
                 for (int i = 0, n = es.size(); i < n; i++) {
@@ -184,10 +184,10 @@ public class GalleryDetailParser {
             // Rating count
             Element rating_count = gm.getElementById("rating_count");
             if (null != rating_count) {
-                gd.ratedTimes = NumberUtils.parseIntSafely(
+                gd.ratingCount = NumberUtils.parseIntSafely(
                         StringUtils.trim(rating_count.text()), 0);
             } else {
-                gd.ratedTimes = 0;
+                gd.ratingCount = 0;
             }
 
             // Rating
@@ -208,9 +208,9 @@ public class GalleryDetailParser {
                 gd.rating = Float.NaN;
             }
 
-            // isFavored
+            // isFavorited
             Element gdf = gm.getElementById("gdf");
-            gd.isFavored = null != gdf && !StringUtils.trim(gdf.text()).equals("Add to Favorites");
+            gd.isFavorited = null != gdf && !StringUtils.trim(gdf.text()).equals("Add to Favorites");
         } catch (Exception e) {
             throw new ParseException("Can't parse gallery detail", body);
         }
@@ -244,17 +244,17 @@ public class GalleryDetailParser {
         } else if (key.startsWith("Favorited")) {
             switch (value) {
                 case "Never":
-                    gd.favoredTimes = 0;
+                    gd.favoriteCount = 0;
                     break;
                 case "Once":
-                    gd.favoredTimes = 1;
+                    gd.favoriteCount = 1;
                     break;
                 default:
                     int index = value.indexOf(' ');
                     if (index == -1) {
-                        gd.favoredTimes = 0;
+                        gd.favoriteCount = 0;
                     } else {
-                        gd.favoredTimes = NumberUtils.parseIntSafely(value.substring(0, index), 0);
+                        gd.favoriteCount = NumberUtils.parseIntSafely(value.substring(0, index), 0);
                     }
                     break;
             }
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java
index 2866908aa..cfb8b809f 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;
 
 public class GalleryPageParser {
 
-    private static Pattern IMAGE_URL_PATTERN = Pattern.compile("<div id=\"i3\"><a[^>]+><img id=\"img\" src=\"([^\"]+)\"");
-    private static Pattern SKIP_HATH_KEY_PATTERN = Pattern.compile("onclick=\"return nl\\('([^\\)]+)'\\)");
+    private static final Pattern IMAGE_URL_PATTERN = Pattern.compile("<div id=\"i3\"><a[^>]+><img id=\"img\" src=\"([^\"]+)\"");
+    private static final Pattern SKIP_HATH_KEY_PATTERN = Pattern.compile("onclick=\"return nl\\('([^\\)]+)'\\)");
 
     public static Result parse(String body) throws ParseException {
         Matcher m;
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/RateGalleryParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/RateGalleryParser.java
index 7574c9798..7cd010d3b 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/RateGalleryParser.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/RateGalleryParser.java
@@ -25,7 +25,7 @@ public class RateGalleryParser {
 
     public static class Result {
         public float rating;
-        public int ratedTimes;
+        public int ratingCount;
     }
 
     public static Result parse(String body) throws Exception {
@@ -33,7 +33,7 @@ public class RateGalleryParser {
             JSONObject jsonObject = new JSONObject(body);
             Result result = new Result();
             result.rating = (float)jsonObject.getDouble("rating_avg");
-            result.ratedTimes = jsonObject.getInt("rating_cnt");
+            result.ratingCount = jsonObject.getInt("rating_cnt");
             return result;
         } catch (JSONException e) {
             Exception exception = new ParseException("Can't parse rate gallery", body);
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
index ab974bbfe..213741b58 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -734,7 +734,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
             return;
         }
 
-        if (gd.isFavored || EhDB.containLocalFavorites(gd.gid)) {
+        if (gd.isFavorited || EhDB.containLocalFavorites(gd.gid)) {
             mHeart.setVisibility(View.VISIBLE);
             mHeartOutline.setVisibility(View.GONE);
         } else {
@@ -769,9 +769,9 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
                 R.plurals.page_count, gd.pages, gd.pages));
         mSize.setText(gd.size);
         mPosted.setText(gd.posted);
-        mFavoredTimes.setText(resources.getString(R.string.favored_times, gd.favoredTimes));
+        mFavoredTimes.setText(resources.getString(R.string.favored_times, gd.favoriteCount));
 
-        mRatingText.setText(getAllRatingText(gd.rating, gd.ratedTimes));
+        mRatingText.setText(getAllRatingText(gd.rating, gd.ratingCount));
         mRating.setRating(gd.rating);
 
         updateFavoriteDrawable();
@@ -936,10 +936,10 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
         }
     }
 
-    private String getAllRatingText(float rating, int ratedTimes) {
+    private String getAllRatingText(float rating, int ratingCount) {
         Resources resources = getResources2();
         AssertUtils.assertNotNull(resources);
-        return resources.getString(R.string.rating_text, getRatingText(rating, resources), rating, ratedTimes);
+        return resources.getString(R.string.rating_text, getRatingText(rating, resources), rating, ratingCount);
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@@ -1093,7 +1093,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
                     EhDB.removeLocalFavorites(mGalleryDetail.gid);
                     remove = true;
                 }
-                if (mGalleryDetail.isFavored) {
+                if (mGalleryDetail.isFavorited) {
                     mModifingFavorites = true;
                     CommonOperations.removeFromFavorites(activity, mGalleryDetail,
                             new ModifyFavoritesListener(context,
@@ -1425,12 +1425,12 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
     private void onRateGallerySuccess(RateGalleryParser.Result result) {
         if (mGalleryDetail != null) {
             mGalleryDetail.rating = result.rating;
-            mGalleryDetail.ratedTimes = result.ratedTimes;
+            mGalleryDetail.ratingCount = result.ratingCount;
         }
 
         // Update UI
         if (mRatingText != null && mRating != null) {
-            mRatingText.setText(getAllRatingText(result.rating, result.ratedTimes));
+            mRatingText.setText(getAllRatingText(result.rating, result.ratingCount));
             mRating.setRating(result.rating);
         }
     }
@@ -1438,7 +1438,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
     private void onModifyFavoritesSuccess(boolean addOrRemove) {
         mModifingFavorites = false;
         if (mGalleryDetail != null) {
-            mGalleryDetail.isFavored = !addOrRemove;
+            mGalleryDetail.isFavorited = !addOrRemove;
             updateFavoriteDrawable();
         }
     }
@@ -1703,7 +1703,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
                 GalleryDetail gd = EhApplication.getGalleryDetailCache(getApplication()).get(mGid);
                 if (gd != null) {
                     gd.rating = result.rating;
-                    gd.ratedTimes = result.ratedTimes;
+                    gd.ratingCount = result.ratingCount;
                 }
             }
         }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
index 5ffa117e6..53c53e056 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java
@@ -117,12 +117,12 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler
         mValues.add(gd.size);
         mKeys.add(resources.getString(R.string.key_resize));
         mValues.add(gd.resize);
-        mKeys.add(resources.getString(R.string.key_favorites));
-        mValues.add(Integer.toString(gd.favoredTimes));
+        mKeys.add(resources.getString(R.string.key_favorite_count));
+        mValues.add(Integer.toString(gd.favoriteCount));
         mKeys.add(resources.getString(R.string.key_favorited));
-        mValues.add(Boolean.toString(gd.isFavored));
-        mKeys.add(resources.getString(R.string.key_rates));
-        mValues.add(Integer.toString(gd.ratedTimes));
+        mValues.add(Boolean.toString(gd.isFavorited));
+        mKeys.add(resources.getString(R.string.key_rating_count));
+        mValues.add(Integer.toString(gd.ratingCount));
         mKeys.add(resources.getString(R.string.key_rating));
         mValues.add(Float.toString(gd.rating));
         mKeys.add(resources.getString(R.string.key_torrents));
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 98f9f5bd7..3c3c077f8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -222,9 +222,9 @@
     <string name="key_pages">页数</string>
     <string name="key_size">大小</string>
     <string name="key_resize">压缩情况</string>
-    <string name="key_favorites">收藏次数</string>
+    <string name="key_favorite_count">收藏次数</string>
     <string name="key_favorited">收藏</string>
-    <string name="key_rates">评价次数</string>
+    <string name="key_rating_count">评价次数</string>
     <string name="key_rating">评分</string>
     <string name="key_torrents">种子个数</string>
     <string name="key_torrent_url">种子</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index c2f3da514..de16107be 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -222,9 +222,9 @@
     <string name="key_pages">頁數</string>
     <string name="key_size">大小</string>
     <string name="key_resize">壓縮情況</string>
-    <string name="key_favorites">收藏次數</string>
+    <string name="key_favorite_count">收藏次數</string>
     <string name="key_favorited">收藏</string>
-    <string name="key_rates">評價次數</string>
+    <string name="key_rating_count">評價次數</string>
     <string name="key_rating">評分</string>
     <string name="key_torrents">種子個數</string>
     <string name="key_torrent_url">種子</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index af19dc78a..45c5c0e5c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -222,9 +222,9 @@
     <string name="key_pages">頁數</string>
     <string name="key_size">大小</string>
     <string name="key_resize">壓縮情況</string>
-    <string name="key_favorites">收藏次數</string>
+    <string name="key_favorite_count">收藏次數</string>
     <string name="key_favorited">收藏</string>
-    <string name="key_rates">評價次數</string>
+    <string name="key_rating_count">評價次數</string>
     <string name="key_rating">評分</string>
     <string name="key_torrents">種子個數</string>
     <string name="key_torrent_url">種子</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d02b6c07e..836ceaf03 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -265,9 +265,9 @@
     <string name="key_pages">Pages</string>
     <string name="key_size">Size</string>
     <string name="key_resize">Resize</string>
-    <string name="key_favorites">Favorites</string>
+    <string name="key_favorite_count">Favorite count</string>
     <string name="key_favorited">Favorited</string>
-    <string name="key_rates">Rates</string>
+    <string name="key_rating_count">Rating count</string>
     <string name="key_rating">Rating</string>
     <string name="key_torrents">Torrents</string>
     <string name="key_torrent_url">Torrent Url</string>