diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index ca5f3084b..0f01be225 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -1059,14 +1059,14 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
         protected final Preferences prefs;
         private AppDetailsData data;
         private static final int MAX_LINES = 5;
-        private static boolean view_all_description;
-        private static LinearLayout ll_view_more_description;
-        private static LinearLayout ll_view_more_permissions;
+        private static boolean viewAllDescription;
+        private static LinearLayout llViewMoreDescription;
+        private static LinearLayout llViewMorePermissions;
         private final View.OnClickListener expanderPermissions = new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                final TextView permissionListView = (TextView) ll_view_more_permissions.findViewById(R.id.permissions_list);
-                final TextView permissionHeader = (TextView) ll_view_more_permissions.findViewById(R.id.permissions);
+                final TextView permissionListView = (TextView) llViewMorePermissions.findViewById(R.id.permissions_list);
+                final TextView permissionHeader = (TextView) llViewMorePermissions.findViewById(R.id.permissions);
 
                 if (permissionListView.getVisibility() == View.GONE) {
                     permissionListView.setVisibility(View.VISIBLE);
@@ -1187,9 +1187,9 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
 
         private final View.OnClickListener expanderDescription = new View.OnClickListener() {
             public void onClick(View v) {
-                final TextView description = (TextView) ll_view_more_description.findViewById(R.id.description);
-                final TextView viewMorePermissions = (TextView) ll_view_more_description.findViewById(R.id.view_more_description);
-                if (view_all_description) {
+                final TextView description = (TextView) llViewMoreDescription.findViewById(R.id.description);
+                final TextView viewMorePermissions = (TextView) llViewMoreDescription.findViewById(R.id.view_more_description);
+                if (viewAllDescription) {
                     description.setMaxLines(Integer.MAX_VALUE);
                     viewMorePermissions.setText(getString(R.string.less));
                 } else {
@@ -1197,7 +1197,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
                     description.setEllipsize(TextUtils.TruncateAt.MARQUEE);
                     viewMorePermissions.setText(R.string.more);
                 }
-                view_all_description ^= true;
+                viewAllDescription ^= true;
             }
         };
 
@@ -1216,10 +1216,10 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
                         description.setMaxLines(MAX_LINES);
                         description.setEllipsize(TextUtils.TruncateAt.MARQUEE);
                         description.setOnClickListener(expanderDescription);
-                        view_all_description = true;
+                        viewAllDescription = true;
 
-                        ll_view_more_description = (LinearLayout) view.findViewById(R.id.ll_description);
-                        ll_view_more_description.setOnClickListener(expanderDescription);
+                        llViewMoreDescription = (LinearLayout) view.findViewById(R.id.ll_description);
+                        llViewMoreDescription.setOnClickListener(expanderDescription);
 
                         viewMoreDescription.setOnClickListener(expanderDescription);
                     } else {
@@ -1319,7 +1319,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
             }
 
             // Expandable permissions
-            ll_view_more_permissions = (LinearLayout) view.findViewById(R.id.ll_permissions);
+            llViewMorePermissions = (LinearLayout) view.findViewById(R.id.ll_permissions);
             final TextView permissionHeader = (TextView) view.findViewById(R.id.permissions);
 
             final boolean curApkCompatible = curApk != null && curApk.compatible;
@@ -1356,7 +1356,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
         }
 
         private void buildPermissionInfo() {
-            final TextView permissionListView = (TextView) ll_view_more_permissions.findViewById(R.id.permissions_list);
+            final TextView permissionListView = (TextView) llViewMorePermissions.findViewById(R.id.permissions_list);
 
             CommaSeparatedList permsList = getApks().getItem(0).permissions;
             if (permsList == null) {
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java b/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java
index d0ab1a804..ddabf2cff 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java
@@ -57,15 +57,15 @@ public class FDroidCertPins {
         "87e3bf322427c1405d2736c381e01d1a71d4a039",
     };
 
-    public static List<String> PINLIST;
+    public static List<String> pinList;
 
     public static String[] getPinList() {
-        if (PINLIST == null) {
-            List<String> pinlist = new ArrayList<>();
-            pinlist.addAll(Arrays.asList(DEFAULT_PINS));
-            PINLIST = pinlist;
+        if (pinList == null) {
+            List<String> l = new ArrayList<>();
+            l.addAll(Arrays.asList(DEFAULT_PINS));
+            pinList = pinlist;
         }
 
-        return PINLIST.toArray(new String[PINLIST.size()]);
+        return pinList.toArray(new String[pinList.size()]);
     }
 }
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
index f9d55a508..ac8690ab1 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java
@@ -38,7 +38,7 @@ public class AvailableAppsFragment extends AppListFragment implements
 
     public static final String PREFERENCES_FILE = "CategorySpinnerPosition";
     public static final String CATEGORY_KEY = "Selection";
-    public static String DEFAULT_CATEGORY;
+    public static String defaultCategory;
 
     private List<String> categories;
     private Spinner categorySpinner;
@@ -185,7 +185,7 @@ public class AvailableAppsFragment extends AppListFragment implements
 
         ((ListView) view.findViewById(android.R.id.list)).setOnItemClickListener(this);
 
-        DEFAULT_CATEGORY = AppProvider.Helper.getCategoryWhatsNew(getActivity());
+        defaultCategory = AppProvider.Helper.getCategoryWhatsNew(getActivity());
 
         return view;
     }
@@ -214,7 +214,7 @@ public class AvailableAppsFragment extends AppListFragment implements
         Activity activity = getActivity();
         SharedPreferences p = activity.getSharedPreferences(PREFERENCES_FILE,
                 Context.MODE_PRIVATE);
-        currentCategory = p.getString(CATEGORY_KEY, DEFAULT_CATEGORY);
+        currentCategory = p.getString(CATEGORY_KEY, defaultCategory);
         for (int i = 0; i < categorySpinner.getCount(); i++) {
             if (currentCategory.equals(categorySpinner.getItemAtPosition(i).toString())) {
                 categorySpinner.setSelection(i);
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 19f4ce8fe..46144c910 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -23,7 +23,7 @@
         <module name="MethodName" />
         <module name="PackageName" />
         <module name="ParameterName" />
-        <!--<module name="StaticVariableName" />-->
+        <module name="StaticVariableName" />
         <module name="TypeName" />
 
         <module name="AvoidStarImport" />