diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 8cfa321a8..15f953aaa 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -395,7 +395,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements
         }
 
         File dir = new File(
-            FileUtils.getDirectoryPath(FileUtils.PICTURES_DIR, Long.toString(trackId)));
+            FileUtils.getPath(FileUtils.PICTURES_DIR, Long.toString(trackId)));
         FileUtils.ensureDirectoryExists(dir);
 
         String fileName = SimpleDateFormat.getDateTimeInstance().format(new Date());
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java
index adc23657b..170ef62d3 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java
@@ -171,7 +171,7 @@ public class ExportDialogFragment extends DialogFragment {
    */
   private void setExternalStorageOption(RadioButton radioButton, TrackFileFormat trackFileFormat) {
     radioButton.setText(getString(R.string.export_external_storage_option, trackFileFormat.name(),
-        FileUtils.getDirectoryDisplayName(trackFileFormat.getExtension())));
+        FileUtils.getPathDisplayName(trackFileFormat.getExtension())));
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
index 283391a31..5b9cd3135 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
@@ -92,7 +92,7 @@ public class FileTypeDialogFragment extends DialogFragment {
     for (int i = 0; i < choices.length; i++) {
       TrackFileFormat trackFileFormat = trackFileFormats[i];
       choices[i] = getString(optionId, trackFileFormat.name(),
-          FileUtils.getDirectoryDisplayName(trackFileFormat.getExtension()));
+          FileUtils.getPathDisplayName(trackFileFormat.getExtension()));
     }
     return new AlertDialog.Builder(getActivity()).setNegativeButton(R.string.generic_cancel, null)
         .setPositiveButton(R.string.generic_ok, new OnClickListener() {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
index b2017056f..35c261bdd 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java
@@ -86,7 +86,7 @@ class ExternalFileBackup {
    * @param create whether to try creating the directory if it doesn't exist
    */
   private File getBackupsDirectory(boolean create) {
-    String directoryPath = FileUtils.getDirectoryPath(FileUtils.BACKUPS_DIR);
+    String directoryPath = FileUtils.getPath(FileUtils.BACKUPS_DIR);
     final File dir = new File(directoryPath);
     Log.d(TAG, "Dir: " + dir.getAbsolutePath());
     if (create) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
index 3d287feb1..969e37223 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
@@ -124,7 +124,7 @@ public class RestoreChooserActivity extends Activity {
    */
   private void showNoBackupMessage() {
     String message = getString(R.string.settings_backup_restore_no_backups,
-        FileUtils.getDirectoryDisplayName(FileUtils.BACKUPS_DIR));
+        FileUtils.getPathDisplayName(FileUtils.BACKUPS_DIR));
     Toast.makeText(this, message, Toast.LENGTH_LONG).show();
   }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java
index b07758a40..c623713be 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java
@@ -82,7 +82,7 @@ public class SaveActivity extends Activity {
     }
 
     File directory = playTrack ? getCacheDir()
-        : new File(FileUtils.getDirectoryPath(trackFileFormat.getExtension()));
+        : new File(FileUtils.getPath(trackFileFormat.getExtension()));
     if (!FileUtils.ensureDirectoryExists(directory)) {
       Toast.makeText(this, R.string.external_storage_not_writable, Toast.LENGTH_LONG).show();
       finish();
@@ -96,7 +96,7 @@ public class SaveActivity extends Activity {
     }
 
     directoryDisplayName = playTrack ? getCacheDir().getName()
-        : FileUtils.getDirectoryDisplayName(trackFileFormat.getExtension());
+        : FileUtils.getPathDisplayName(trackFileFormat.getExtension());
 
     Object retained = getLastNonConfigurationInstance();
     if (retained instanceof SaveAsyncTask) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
index 6cd4b7be2..df9706ff2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java
@@ -470,7 +470,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
     if (importTrackId == -1L) {
       return null;
     }
-    return FileUtils.getDirectoryPath(
+    return FileUtils.getPath(
         FileUtils.PICTURES_DIR, Long.toString(importTrackId), fileName);
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
index 44b7b94e5..f12d20738 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java
@@ -89,9 +89,9 @@ public class ImportActivity extends Activity {
     }
     String directoryPath;
     if (importAll) {
-      directoryDisplayName = FileUtils.getDirectoryDisplayName(
+      directoryDisplayName = FileUtils.getPathDisplayName(
           trackFileFormat.getExtension());
-      directoryPath = FileUtils.getDirectoryPath(trackFileFormat.getExtension());
+      directoryPath = FileUtils.getPath(trackFileFormat.getExtension());
       if (!FileUtils.isDirectory(new File(directoryPath))) {
         Toast.makeText(
             this, getString(R.string.import_no_directory, directoryDisplayName), Toast.LENGTH_LONG)
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
index 726ae8f2a..64ead289c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java
@@ -116,7 +116,7 @@ public class KmzTrackImporter implements TrackImporter {
 
     if (importTrackId != -1L) {
       File dir = new File(
-          FileUtils.getDirectoryPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
+          FileUtils.getPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
       if (dir.exists() && dir.isDirectory()) {
         for (File file : dir.listFiles()) {
           file.delete();
@@ -180,7 +180,7 @@ public class KmzTrackImporter implements TrackImporter {
         return;
       }
       File dir = new File(
-          FileUtils.getDirectoryPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
+          FileUtils.getPath(FileUtils.PICTURES_DIR, Long.toString(importTrackId)));
       FileUtils.ensureDirectoryExists(dir);
 
       fileOutputStream = new FileOutputStream(new File(dir, fileName));
diff --git a/MyTracks/src/com/google/android/apps/mytracks/settings/BackupResetSettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/settings/BackupResetSettingsActivity.java
index 664e82afc..0046e3ff5 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/settings/BackupResetSettingsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/settings/BackupResetSettingsActivity.java
@@ -121,7 +121,7 @@ public class BackupResetSettingsActivity extends AbstractSettingsActivity {
     switch (id) {
       case DIALOG_CONFIRM_BACKUP_ID:
         message = getString(R.string.settings_backup_confirm_message,
-            FileUtils.getDirectoryDisplayName(FileUtils.BACKUPS_DIR));
+            FileUtils.getPathDisplayName(FileUtils.BACKUPS_DIR));
         dialog = DialogUtils.createConfirmationDialog(this, R.string.settings_backup_confirm_title,
             message, new DialogInterface.OnClickListener() {
                 @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
index 91176ab89..d981cf3c7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
@@ -88,11 +88,11 @@ public class FileUtils {
   }
 
   /**
-   * Gets the directory display name.
+   * Gets the display name for a path on the external storage.
    * 
    * @param components the components
    */
-  public static String getDirectoryDisplayName(String... components) {
+  public static String getPathDisplayName(String... components) {
     StringBuilder dirNameBuilder = new StringBuilder();
     dirNameBuilder.append(File.separatorChar);
     dirNameBuilder.append(SDCARD_TOP_DIR);
@@ -103,14 +103,14 @@ public class FileUtils {
     return dirNameBuilder.toString();
   }
   /**
-   * Gets the directory path.
+   * Gets a path on the external storage.
    *
    * @param components the components
    */
-  public static String getDirectoryPath(String... components) {
+  public static String getPath(String... components) {
     StringBuilder dirNameBuilder = new StringBuilder();
     dirNameBuilder.append(Environment.getExternalStorageDirectory());
-    dirNameBuilder.append(getDirectoryDisplayName(components));
+    dirNameBuilder.append(getPathDisplayName(components));
     return dirNameBuilder.toString();
   }
 
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
index fd79f7d47..e0bdc3fbe 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java
@@ -29,13 +29,13 @@ import junit.framework.TestCase;
 public class FileUtilsTest extends TestCase {
 
   /**
-   * Tests {@link FileUtils#getDirectoryPath(String...)}.
+   * Tests {@link FileUtils#getPath(String...)}.
    */
   public void testBuildExternalDirectoryPath() {
     String expectedName = Environment.getExternalStorageDirectory() + File.separator
         + FileUtils.SDCARD_TOP_DIR + File.separator + "a" + File.separator + "b" + File.separator
         + "c";
-    String dirName = FileUtils.getDirectoryPath("a", "b", "c");
+    String dirName = FileUtils.getPath("a", "b", "c");
     assertEquals(expectedName, dirName);
   }
 
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index 479abfc19..95595f502 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -501,7 +501,7 @@ public class EndToEndTestUtils {
    * @param trackKind the kind of track
    */
   public static void deleteExportedFiles(String trackKind) {
-    File[] allFiles = (new File(FileUtils.getDirectoryPath(trackKind.toLowerCase()))).listFiles();
+    File[] allFiles = (new File(FileUtils.getPath(trackKind.toLowerCase()))).listFiles();
     if (allFiles != null) {
       for (File oneFile : allFiles) {
         oneFile.delete();
@@ -528,7 +528,7 @@ public class EndToEndTestUtils {
    * @return files array of such kind of exported tracks
    */
   public static File[] getExportedFiles(final String trackKind) {
-    String directoryPath = FileUtils.getDirectoryPath(trackKind);
+    String directoryPath = FileUtils.getPath(trackKind);
     FileFilter filter = new FileFilter() {
       @Override
       public boolean accept(File pathname) {
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ExportAllAndImportAllTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ExportAllAndImportAllTest.java
index a05e65cfe..db80680e1 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ExportAllAndImportAllTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ExportAllAndImportAllTest.java
@@ -264,20 +264,20 @@ public class ExportAllAndImportAllTest extends ActivityInstrumentationTestCase2<
   private String getSaveSuccessMessage(int count, String type) {
     String tracks = activityMyTracks.getResources().getQuantityString(R.plurals.tracks, count,
         count);
-    String directoryDisplayName = FileUtils.getDirectoryDisplayName(type);
+    String directoryDisplayName = FileUtils.getPathDisplayName(type);
     return activityMyTracks.getString(R.string.export_external_storage_success, tracks,
         directoryDisplayName);
   }
 
   private String getImportSuccessMessage(int count, String type) {
     String files = activityMyTracks.getResources().getQuantityString(R.plurals.files, count, count);
-    String directoryDisplayName = FileUtils.getDirectoryDisplayName(type);
+    String directoryDisplayName = FileUtils.getPathDisplayName(type);
     return activityMyTracks.getString(R.string.import_success, files, directoryDisplayName);
   }
 
   private String getImportErrorMessage(int count, int total, String type) {
     String files = activityMyTracks.getResources().getQuantityString(R.plurals.files, total, total);
-    String directoryDisplayName = FileUtils.getDirectoryDisplayName(type);
+    String directoryDisplayName = FileUtils.getPathDisplayName(type);
     return activityMyTracks.getString(R.string.import_error, count, files, directoryDisplayName);
   }
 
@@ -481,7 +481,7 @@ public class ExportAllAndImportAllTest extends ActivityInstrumentationTestCase2<
         + "</trkseg> " + "</trk> " + "</gpx>";
 
     try {
-      File file = new File(FileUtils.getDirectoryPath(EndToEndTestUtils.GPX.toLowerCase())
+      File file = new File(FileUtils.getPath(EndToEndTestUtils.GPX.toLowerCase())
           + File.separator + fileName);
       FileOutputStream fop = new FileOutputStream(file);
       // if file doesnt exists, then create it