diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 5fd9af324..388fcfbe2 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -74,10 +74,10 @@ import com.fsck.k9.mail.store.StorageManager;
 import com.fsck.k9.view.ColorChip;
 import com.fsck.k9.preferences.SettingsExporter;
 import com.fsck.k9.preferences.StorageImportExportException;
-import com.fsck.k9.preferences.StorageImporter;
-import com.fsck.k9.preferences.StorageImporter.AccountDescription;
-import com.fsck.k9.preferences.StorageImporter.ImportContents;
-import com.fsck.k9.preferences.StorageImporter.ImportResults;
+import com.fsck.k9.preferences.SettingsImporter;
+import com.fsck.k9.preferences.SettingsImporter.AccountDescription;
+import com.fsck.k9.preferences.SettingsImporter.ImportContents;
+import com.fsck.k9.preferences.SettingsImporter.ImportResults;
 
 
 public class Accounts extends K9ListActivity implements OnItemClickListener, OnClickListener {
@@ -1380,7 +1380,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             try {
                 InputStream is = mContext.getContentResolver().openInputStream(mUri);
                 try {
-                    mImportResults = StorageImporter.importSettings(mContext, is,
+                    mImportResults = SettingsImporter.importSettings(mContext, is,
                             mIncludeGlobals, mAccountUuids, mOverwrite);
                 } finally {
                     try {
@@ -1449,7 +1449,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
                 ContentResolver resolver = mContext.getContentResolver();
                 InputStream is = resolver.openInputStream(mUri);
                 try {
-                    mImportContents = StorageImporter.getImportStreamContents(is);
+                    mImportContents = SettingsImporter.getImportStreamContents(is);
                 } finally {
                     try {
                         is.close();
diff --git a/src/com/fsck/k9/preferences/SettingsExporter.java b/src/com/fsck/k9/preferences/SettingsExporter.java
index 376ca3c28..9bdb3a875 100644
--- a/src/com/fsck/k9/preferences/SettingsExporter.java
+++ b/src/com/fsck/k9/preferences/SettingsExporter.java
@@ -40,7 +40,7 @@ public class SettingsExporter {
      * <p>
      * Increment this if you need to change the structure of the settings file. When you do this
      * remember that we also have to be able to handle old file formats. So have fun adding support
-     * for that to {@link StorageImporter} :)
+     * for that to {@link SettingsImporter} :)
      * </p>
      */
     public static final int FILE_FORMAT_VERSION = 1;
diff --git a/src/com/fsck/k9/preferences/StorageImporter.java b/src/com/fsck/k9/preferences/SettingsImporter.java
similarity index 99%
rename from src/com/fsck/k9/preferences/StorageImporter.java
rename to src/com/fsck/k9/preferences/SettingsImporter.java
index cab7ff2d5..bbed9590b 100644
--- a/src/com/fsck/k9/preferences/StorageImporter.java
+++ b/src/com/fsck/k9/preferences/SettingsImporter.java
@@ -30,12 +30,12 @@ import com.fsck.k9.mail.Store;
 import com.fsck.k9.mail.Transport;
 import com.fsck.k9.preferences.Settings.InvalidSettingValueException;
 
-public class StorageImporter {
+public class SettingsImporter {
 
     /**
      * Class to list the contents of an import file/stream.
      *
-     * @see StorageImporter#getImportStreamContents(InputStream)
+     * @see SettingsImporter#getImportStreamContents(InputStream)
      */
     public static class ImportContents {
         /**