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 0e3408eeb..865db5bd6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java
@@ -33,8 +33,6 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.RadioGroup.OnCheckedChangeListener;
 
-import java.util.Locale;
-
 /**
  * A DialogFragment to export a track.
  * 
@@ -172,9 +170,8 @@ public class ExportDialogFragment extends DialogFragment {
    * @param trackFileFormat the track file format
    */
   private void setExternalStorageOption(RadioButton radioButton, TrackFileFormat trackFileFormat) {
-    String format = trackFileFormat.name();
-    radioButton.setText(getString(R.string.export_external_storage_option, format,
-        FileUtils.getDisplayDirectory(format.toLowerCase(Locale.US))));
+    radioButton.setText(getString(R.string.export_external_storage_option, trackFileFormat.name(),
+        FileUtils.getDisplayDirectory(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 782ecc437..db8e8d2a0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java
@@ -28,8 +28,6 @@ import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 
-import java.util.Locale;
-
 /**
  * A DialogFragment to select a file type, gpx, kml, etc.
  * 
@@ -92,9 +90,9 @@ public class FileTypeDialogFragment extends DialogFragment {
     String[] choices = new String[size];
     TrackFileFormat[] trackFileFormats = TrackFileFormat.values();
     for (int i = 0; i < choices.length; i++) {
-      String format = trackFileFormats[i].name();
-      choices[i] = getString(
-          optionId, format, FileUtils.getDisplayDirectory(format.toLowerCase(Locale.US)));
+      TrackFileFormat trackFileFormat = trackFileFormats[i];
+      choices[i] = getString(optionId, trackFileFormat.name(),
+          FileUtils.getDisplayDirectory(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/file/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
index b0a8a8217..863099e51 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
@@ -87,8 +87,7 @@ public class ImportActivity extends Activity {
       return;
     }
     if (importAll) {
-      path = FileUtils.buildExternalDirectoryPath(
-          trackFileFormat == TrackFileFormat.KML ? "kml" : "gpx");
+      path = FileUtils.buildExternalDirectoryPath(trackFileFormat.getExtension());
       if (!FileUtils.isDirectory(new File(path))) {
         Toast.makeText(this, getString(R.string.import_no_directory, path), Toast.LENGTH_LONG)
             .show();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index 7d69bc683..994a7769b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -81,7 +81,7 @@ public class SaveActivity extends Activity {
     }
 
     directoryName = playTrack ? FileUtils.buildExternalDirectoryPath(
-        trackFileFormat.getExtension(), "tmp")
+        trackFileFormat.getExtension(), FileUtils.TEMP_DIR)
         : FileUtils.buildExternalDirectoryPath(trackFileFormat.getExtension());
 
     File directory = new File(directoryName);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java
index 37d690db8..d83e717da 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java
@@ -91,7 +91,7 @@ public class RemoveTempFilesService extends Service {
   }
 
   private void cleanTempDirectory(String name) {
-    cleanTempDirectory(new File(FileUtils.buildExternalDirectoryPath(name, "tmp")));
+    cleanTempDirectory(new File(FileUtils.buildExternalDirectoryPath(name, FileUtils.TEMP_DIR)));
   }
   
   /**
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 ac2a9dba5..e497a6db0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java
@@ -30,6 +30,8 @@ public class FileUtils {
 
   private FileUtils() {}
 
+  public static final String TEMP_DIR = "tmp";
+  
   /**
    * Name of the top-level directory inside the SD card where our files will be
    * read from/written to.