diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index fe9891193..8ce54023d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -295,7 +295,7 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
 
         FragmentManager fM = getSupportFragmentManager();
         if (fM.findFragmentByTag(TAG_FRAG_TOP) == null) {
-            Fragment importCloudFragment = ImportKeysCloudFragment.newInstance(query,
+            Fragment importCloudFragment = ImportKeysSearchFragment.newInstance(query,
                     cloudSearchPrefs);
             fM.beginTransaction().add(importCloudFragment, TAG_FRAG_TOP).commit();
         }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysSearchFragment.java
similarity index 96%
rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java
rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysSearchFragment.java
index a6ec42cbd..d77de6fa9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysSearchFragment.java
@@ -54,7 +54,7 @@ import static android.support.v7.widget.SearchView.OnSuggestionListener;
 /**
  * Consists of the search bar, search button, and search settings button
  */
-public class ImportKeysCloudFragment extends Fragment {
+public class ImportKeysSearchFragment extends Fragment {
 
     public static final String ARG_QUERY = "query";
     public static final String ARG_CLOUD_SEARCH_PREFS = "cloud_search_prefs";
@@ -76,10 +76,10 @@ public class ImportKeysCloudFragment extends Fragment {
      * @param cloudSearchPrefs search parameters to use. If null will retrieve from user's
      *                         preferences.
      */
-    public static ImportKeysCloudFragment newInstance(String query,
-                                                      CloudSearchPrefs cloudSearchPrefs) {
+    public static ImportKeysSearchFragment newInstance(String query,
+                                                       CloudSearchPrefs cloudSearchPrefs) {
 
-        ImportKeysCloudFragment frag = new ImportKeysCloudFragment();
+        ImportKeysSearchFragment frag = new ImportKeysSearchFragment();
 
         Bundle args = new Bundle();
         args.putString(ARG_QUERY, query);