diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index e5d123f44..f68c5a111 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -214,7 +214,7 @@ limitations under the License.
     <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreChooserActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.drive.SendDriveActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.file.export.SaveActivity" />
+    <activity android:name="com.google.android.apps.mytracks.io.file.exporter.SaveActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.maps.SendMapsActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
index 3ba648619..e274697b0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AbstractSendToGoogleActivity.java
@@ -31,7 +31,7 @@ import com.google.android.apps.mytracks.fragments.ShareTrackDialogFragment;
 import com.google.android.apps.mytracks.fragments.ShareTrackDialogFragment.ShareTrackCaller;
 import com.google.android.apps.mytracks.io.drive.SendDriveActivity;
 import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.io.file.export.SaveActivity;
+import com.google.android.apps.mytracks.io.file.exporter.SaveActivity;
 import com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity;
 import com.google.android.apps.mytracks.io.gdata.maps.MapsConstants;
 import com.google.android.apps.mytracks.io.maps.SendMapsActivity;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 680f087e3..25ada78d2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -31,7 +31,7 @@ import com.google.android.apps.mytracks.fragments.FrequencyDialogFragment;
 import com.google.android.apps.mytracks.fragments.MyTracksMapFragment;
 import com.google.android.apps.mytracks.fragments.StatsFragment;
 import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.io.file.export.SaveActivity;
+import com.google.android.apps.mytracks.io.file.exporter.SaveActivity;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
 import com.google.android.apps.mytracks.settings.SettingsActivity;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index 377b16e5e..9a32af10d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -27,7 +27,7 @@ import com.google.android.apps.mytracks.fragments.EulaDialogFragment.EulaCaller;
 import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment;
 import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment.FileTypeCaller;
 import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.io.file.export.SaveActivity;
+import com.google.android.apps.mytracks.io.file.exporter.SaveActivity;
 import com.google.android.apps.mytracks.io.file.importer.ImportActivity;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.io.sync.SyncUtils;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java
index 74ac72955..3392277af 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java
@@ -1,10 +1,10 @@
 package com.google.android.apps.mytracks.io.file;
 
-import com.google.android.apps.mytracks.io.file.export.CsvTrackWriter;
-import com.google.android.apps.mytracks.io.file.export.GpxTrackWriter;
-import com.google.android.apps.mytracks.io.file.export.KmlTrackWriter;
-import com.google.android.apps.mytracks.io.file.export.TcxTrackWriter;
-import com.google.android.apps.mytracks.io.file.export.TrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.CsvTrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.GpxTrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.KmlTrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.TcxTrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.TrackWriter;
 
 import android.content.Context;
 import android.os.Parcel;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/CsvTrackWriter.java
similarity index 99%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/CsvTrackWriter.java
index 5d71a5f38..43c06c454 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/CsvTrackWriter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.Sensor;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java
similarity index 99%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java
index 97bd57a0c..978dae454 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.MyTracksLocation;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java
similarity index 99%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java
index 2892e1881..6b4a9b41b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java
similarity index 99%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java
index f74408f82..8d9ba8252 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.DescriptionGenerator;
 import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmzTrackExporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java
similarity index 98%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmzTrackExporter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java
index 751e7b8d4..4dd407264 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/KmzTrackExporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java
similarity index 99%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveActivity.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java
index a8658951d..beec34e8a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.io.file.TrackFileFormat;
 import com.google.android.apps.mytracks.util.DialogUtils;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java
similarity index 99%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveAsyncTask.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java
index e455937b7..70a13a5ba 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/SaveAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TcxTrackWriter.java
similarity index 99%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TcxTrackWriter.java
index 72205ed48..9f7f7978b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TcxTrackWriter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.Sensor;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java
similarity index 93%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java
index e84a742d9..7254e8eff 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import java.io.OutputStream;
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporterListener.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java
similarity index 94%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporterListener.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java
index 984ad4aeb..b0835fe7c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackExporterListener.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 /**
  * Listener for {@link TrackExporter} progress.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java
similarity index 98%
rename from MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackWriter.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java
index dab77c43b..58d66597c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/export/TrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java
index a08f63be5..9f88b8d12 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java
@@ -17,7 +17,7 @@
 package com.google.android.apps.mytracks.io.file.importer;
 
 import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.io.file.export.KmzTrackExporter;
+import com.google.android.apps.mytracks.io.file.exporter.KmzTrackExporter;
 import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.apps.mytracks.util.SystemUtils;
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 51ffdbe56..575b51805 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
@@ -17,7 +17,7 @@
 package com.google.android.apps.mytracks.io.file.importer;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
-import com.google.android.apps.mytracks.io.file.export.KmzTrackExporter;
+import com.google.android.apps.mytracks.io.file.exporter.KmzTrackExporter;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java b/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java
index ab62a0162..157947447 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sync/SyncUtils.java
@@ -21,7 +21,7 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.TracksColumns;
 import com.google.android.apps.mytracks.io.file.TrackFileFormat;
-import com.google.android.apps.mytracks.io.file.export.FileTrackExporter;
+import com.google.android.apps.mytracks.io.file.exporter.FileTrackExporter;
 import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.maps.mytracks.R;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/CsvTrackWriterTest.java
similarity index 96%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriterTest.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/CsvTrackWriterTest.java
index 6e675068a..e05e8caba 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/CsvTrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/CsvTrackWriterTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
-import com.google.android.apps.mytracks.io.file.export.CsvTrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.CsvTrackWriter;
 
 
 /**
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporterTest.java
similarity index 97%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporterTest.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporterTest.java
index 6e15bb99e..22ccc135d 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/FileTrackExporterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporterTest.java
@@ -1,12 +1,15 @@
 // Copyright 2010 Google Inc. All Rights Reserved.
 
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.MyTracksProvider;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
+import com.google.android.apps.mytracks.io.file.exporter.FileTrackExporter;
+import com.google.android.apps.mytracks.io.file.exporter.TrackExporterListener;
+import com.google.android.apps.mytracks.io.file.exporter.TrackWriter;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext;
 import com.google.android.apps.mytracks.testing.TestingProviderUtilsFactory;
 
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriterTest.java
similarity index 95%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriterTest.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriterTest.java
index 8b85ca5d9..35e9f6a14 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/GpxTrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriterTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
-import com.google.android.apps.mytracks.io.file.export.GpxTrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.GpxTrackWriter;
 
 import java.util.List;
 
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriterTest.java
similarity index 97%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriterTest.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriterTest.java
index bfe2019a6..e4adae4bc 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/KmlTrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriterTest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.DescriptionGenerator;
 import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.io.file.export.KmlTrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.KmlTrackWriter;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 
 import android.location.Location;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/TcxTrackWriterTest.java
similarity index 96%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriterTest.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/TcxTrackWriterTest.java
index df306e8c4..576b2c73c 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TcxTrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/TcxTrackWriterTest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.apps.mytracks.io.file.export.TcxTrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.TcxTrackWriter;
 import com.google.android.apps.mytracks.util.StringUtils;
 
 import java.util.List;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TrackWriterTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/TrackWriterTest.java
similarity index 98%
rename from MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TrackWriterTest.java
rename to MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/TrackWriterTest.java
index eb3b53ce0..99f718bfd 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/file/export/TrackWriterTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/file/exporter/TrackWriterTest.java
@@ -1,11 +1,11 @@
 // Copyright 2010 Google Inc. All Rights Reserved.
-package com.google.android.apps.mytracks.io.file.export;
+package com.google.android.apps.mytracks.io.file.exporter;
 
 import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.Sensor;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.io.file.export.TrackWriter;
+import com.google.android.apps.mytracks.io.file.exporter.TrackWriter;
 
 import android.test.AndroidTestCase;