From 5ceb9aba694983980b5f0ecf022082055dd0e1e9 Mon Sep 17 00:00:00 2001
From: Nicolas Raoul <nicolas.raoul@gmail.com>
Date: Tue, 8 Sep 2015 16:37:39 +0900
Subject: [PATCH] Fixed namespace typo

---
 commons/AndroidManifest.xml                   | 10 +++++-----
 commons/res/layout/activity_contributions.xml |  2 +-
 commons/res/layout/detail_category_item.xml   |  2 +-
 commons/res/layout/fragment_media_detail.xml  | 10 +++++-----
 commons/res/layout/layout_contribution.xml    |  4 ++--
 commons/res/xml/authenticator.xml             |  2 +-
 commons/res/xml/campaigns_sync_adapter.xml    |  4 ++--
 .../res/xml/contributions_sync_adapter.xml    |  4 ++--
 .../res/xml/modifications_sync_adapter.xml    |  4 ++--
 .../org/wikimedia/commons/AboutActivity.java  |  2 +-
 .../wikimedia/commons/CommonsApplication.java |  6 +++---
 .../java/org/wikimedia/commons/EventLog.java  |  2 +-
 .../org/wikimedia/commons/HandlerService.java |  2 +-
 .../java/org/wikimedia/commons/License.java   |  2 +-
 .../org/wikimedia/commons/LicenseList.java    |  4 ++--
 .../java/org/wikimedia/commons/Media.java     |  2 +-
 .../wikimedia/commons/MediaDataExtractor.java |  2 +-
 .../wikimedia/commons/MediaWikiImageView.java |  6 +++---
 .../java/org/wikimedia/commons/Prefs.java     |  4 ++--
 .../wikimedia/commons/SettingsActivity.java   |  2 +-
 .../java/org/wikimedia/commons/Utils.java     |  2 +-
 .../wikimedia/commons/WelcomeActivity.java    |  2 +-
 .../java/org/wikimedia/commons/api/MWApi.java |  2 +-
 .../commons/auth/AuthenticatedActivity.java   |  4 ++--
 .../wikimedia/commons/auth/LoginActivity.java | 14 ++++++-------
 .../auth/WikiAccountAuthenticator.java        |  6 +++---
 .../auth/WikiAccountAuthenticatorService.java |  2 +-
 .../wikimedia/commons/campaigns/Campaign.java |  2 +-
 .../commons/campaigns/CampaignActivity.java   |  8 ++++----
 .../campaigns/CampaignContribution.java       |  4 ++--
 .../campaigns/CampaignsContentProvider.java   |  8 ++++----
 .../campaigns/CampaignsListAdapter.java       | 12 +++++------
 .../campaigns/CampaignsSyncAdapter.java       | 10 +++++-----
 .../campaigns/CampaignsSyncService.java       |  4 ++--
 .../category/CategorizationFragment.java      | 14 ++++++-------
 .../wikimedia/commons/category/Category.java  |  4 ++--
 .../category/CategoryContentProvider.java     |  8 ++++----
 .../commons/contributions/Contribution.java   |  4 ++--
 .../contributions/ContributionController.java |  8 ++++----
 .../contributions/ContributionViewHolder.java |  6 +++---
 .../contributions/ContributionsActivity.java  | 12 +++++------
 .../ContributionsContentProvider.java         |  8 ++++----
 .../ContributionsListAdapter.java             | 10 +++++-----
 .../ContributionsListFragment.java            |  8 ++++----
 .../ContributionsSyncAdapter.java             |  6 +++---
 .../ContributionsSyncService.java             |  2 +-
 .../contributions/MediaListAdapter.java       |  8 ++++----
 .../wikimedia/commons/data/DBOpenHelper.java  | 10 +++++-----
 .../commons/media/CategoryImagesLoader.java   |  8 ++++----
 .../commons/media/MediaDetailFragment.java    |  4 ++--
 .../media/MediaDetailPagerFragment.java       |  8 ++++----
 .../commons/media/MediaDetailSpacer.java      |  2 +-
 .../modifications/CategoryModifier.java       |  2 +-
 .../ModificationsContentProvider.java         |  8 ++++----
 .../ModificationsSyncAdapter.java             | 10 +++++-----
 .../ModificationsSyncService.java             |  2 +-
 .../modifications/ModifierSequence.java       |  4 ++--
 .../commons/modifications/PageModifier.java   |  2 +-
 .../modifications/TemplateRemoveModifier.java |  2 +-
 .../commons/upload/MultipleShareActivity.java | 20 +++++++++----------
 .../upload/MultipleUploadListFragment.java    | 10 +++++-----
 .../commons/upload/ShareActivity.java         | 20 +++++++++----------
 .../commons/upload/SingleUploadFragment.java  | 10 +++++-----
 .../commons/upload/UploadController.java      | 16 +++++++--------
 .../commons/upload/UploadService.java         | 14 ++++++-------
 65 files changed, 203 insertions(+), 203 deletions(-)

diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
index 02fdce0a5..0e76fef5e 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="fr.nrw.free.commons"
+    package="fr.free.nrw.commons"
     android:versionCode="16"
     android:versionName="1.1" >
 
@@ -144,28 +144,28 @@
                 android:name=".contributions.ContributionsContentProvider"
                 android:label="@string/provider_contributions"
                 android:syncable="true"
-                android:authorities="fr.nrw.free.commons.contributions.contentprovider"
+                android:authorities="fr.free.nrw.commons.contributions.contentprovider"
                 android:exported="false">
         </provider>
         <provider
                 android:name=".campaigns.CampaignsContentProvider"
                 android:label="@string/provider_campaigns"
                 android:syncable="true"
-                android:authorities="fr.nrw.free.commons.campaigns.contentprovider"
+                android:authorities="fr.free.nrw.commons.campaigns.contentprovider"
                 android:exported="false">
         </provider>
         <provider
                 android:name=".modifications.ModificationsContentProvider"
                 android:label="@string/provider_modifications"
                 android:syncable="true"
-                android:authorities="fr.nrw.free.commons.modifications.contentprovider"
+                android:authorities="fr.free.nrw.commons.modifications.contentprovider"
                 android:exported="false">
         </provider>
         <provider
                 android:name=".category.CategoryContentProvider"
                 android:label="@string/provider_categories"
                 android:syncable="false"
-                android:authorities="fr.nrw.free.commons.categories.contentprovider"
+                android:authorities="fr.free.nrw.commons.categories.contentprovider"
                 android:exported="false">
         </provider>
     </application>
diff --git a/commons/res/layout/activity_contributions.xml b/commons/res/layout/activity_contributions.xml
index 744bdbaa2..1e407ee9e 100644
--- a/commons/res/layout/activity_contributions.xml
+++ b/commons/res/layout/activity_contributions.xml
@@ -8,7 +8,7 @@
               android:background="#000000"
         >
     <fragment
-        android:name="fr.nrw.free.commons.contributions.ContributionsListFragment"
+        android:name="fr.free.nrw.commons.contributions.ContributionsListFragment"
         android:id="@+id/contributionsListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/commons/res/layout/detail_category_item.xml b/commons/res/layout/detail_category_item.xml
index cd64723a8..9e2e2fc45 100644
--- a/commons/res/layout/detail_category_item.xml
+++ b/commons/res/layout/detail_category_item.xml
@@ -16,7 +16,7 @@
             android:textColor="@android:color/white"
             android:background="#20ffffff"
             />
-    <fr.nrw.free.commons.media.MediaDetailSpacer
+    <fr.free.nrw.commons.media.MediaDetailSpacer
             android:layout_width="fill_parent"
             android:layout_height="8dp"/>
 </LinearLayout>
diff --git a/commons/res/layout/fragment_media_detail.xml b/commons/res/layout/fragment_media_detail.xml
index 6a3d31aa7..06c22151c 100644
--- a/commons/res/layout/fragment_media_detail.xml
+++ b/commons/res/layout/fragment_media_detail.xml
@@ -22,7 +22,7 @@
                android:visibility="gone"
                />
 
-    <fr.nrw.free.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
+    <fr.free.nrw.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
                android:layout_width="fill_parent"
                android:layout_height="fill_parent"
                android:scaleType="fitCenter"
@@ -42,7 +42,7 @@
 
             <!-- Placeholder. Height gets set at runtime based on container size; the initial value is a hack to keep
                  the detail info offscreen until it's placed properly. May be a better way to do this. -->
-            <fr.nrw.free.commons.media.MediaDetailSpacer
+            <fr.free.nrw.commons.media.MediaDetailSpacer
                     android:layout_width="fill_parent"
                     android:layout_height="16dp"
                     android:id="@+id/mediaDetailSpacer"/>
@@ -77,7 +77,7 @@
                             android:textSize="14sp"
                             android:padding="12dp"/>
                 </LinearLayout>
-                <fr.nrw.free.commons.media.MediaDetailSpacer
+                <fr.free.nrw.commons.media.MediaDetailSpacer
                         android:layout_width="fill_parent"
                         android:layout_height="8dp"/>
                 <LinearLayout
@@ -105,7 +105,7 @@
                             android:textSize="14sp"
                             android:padding="12dp"/>
                 </LinearLayout>
-                <fr.nrw.free.commons.media.MediaDetailSpacer
+                <fr.free.nrw.commons.media.MediaDetailSpacer
                         android:layout_width="fill_parent"
                         android:layout_height="8dp"/>
                 <LinearLayout
@@ -133,7 +133,7 @@
                             android:textSize="14sp"
                             android:padding="12dp"/>
                 </LinearLayout>
-                <fr.nrw.free.commons.media.MediaDetailSpacer
+                <fr.free.nrw.commons.media.MediaDetailSpacer
                         android:layout_width="fill_parent"
                         android:layout_height="8dp"/>
                 <LinearLayout
diff --git a/commons/res/layout/layout_contribution.xml b/commons/res/layout/layout_contribution.xml
index f83e6d9a1..181e3862f 100644
--- a/commons/res/layout/layout_contribution.xml
+++ b/commons/res/layout/layout_contribution.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:custom="http://schemas.android.com/apk/res/fr.nrw.free.commons"
+             xmlns:custom="http://schemas.android.com/apk/res/fr.free.nrw.commons"
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
               android:typeface="serif"
               android:layout_gravity="end|bottom"
             />
-    <fr.nrw.free.commons.MediaWikiImageView android:id="@+id/contributionImage"
+    <fr.free.nrw.commons.MediaWikiImageView android:id="@+id/contributionImage"
                android:layout_width="fill_parent"
                android:layout_height="240dp"
                android:scaleType="centerCrop"
diff --git a/commons/res/xml/authenticator.xml b/commons/res/xml/authenticator.xml
index 31605e3c3..17b9b34d3 100644
--- a/commons/res/xml/authenticator.xml
+++ b/commons/res/xml/authenticator.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="fr.nrw.free.commons"
+    android:accountType="fr.free.nrw.commons"
     android:icon="@drawable/ic_launcher"
     android:label="@string/app_name"
     android:smallIcon="@drawable/ic_launcher" />
diff --git a/commons/res/xml/campaigns_sync_adapter.xml b/commons/res/xml/campaigns_sync_adapter.xml
index 25239a115..1da828c50 100644
--- a/commons/res/xml/campaigns_sync_adapter.xml
+++ b/commons/res/xml/campaigns_sync_adapter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-              android:contentAuthority="fr.nrw.free.commons.campaigns.contentprovider"
-              android:accountType="fr.nrw.free.commons"
+              android:contentAuthority="fr.free.nrw.commons.campaigns.contentprovider"
+              android:accountType="fr.free.nrw.commons"
               android:supportsUploading="false"
               android:userVisible="true"
               android:isAlwaysSyncable="true"
diff --git a/commons/res/xml/contributions_sync_adapter.xml b/commons/res/xml/contributions_sync_adapter.xml
index 31b853348..68944e822 100644
--- a/commons/res/xml/contributions_sync_adapter.xml
+++ b/commons/res/xml/contributions_sync_adapter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-              android:contentAuthority="fr.nrw.free.commons.contributions.contentprovider"
-              android:accountType="fr.nrw.free.commons"
+              android:contentAuthority="fr.free.nrw.commons.contributions.contentprovider"
+              android:accountType="fr.free.nrw.commons"
               android:supportsUploading="false"
               android:userVisible="true"
               android:isAlwaysSyncable="true"
diff --git a/commons/res/xml/modifications_sync_adapter.xml b/commons/res/xml/modifications_sync_adapter.xml
index 33fdb4c55..d7d97ff89 100644
--- a/commons/res/xml/modifications_sync_adapter.xml
+++ b/commons/res/xml/modifications_sync_adapter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-              android:contentAuthority="fr.nrw.free.commons.modifications.contentprovider"
-              android:accountType="fr.nrw.free.commons"
+              android:contentAuthority="fr.free.nrw.commons.modifications.contentprovider"
+              android:accountType="fr.free.nrw.commons"
               android:supportsUploading="true"
               android:userVisible="true"
               android:isAlwaysSyncable="true"
diff --git a/commons/src/main/java/org/wikimedia/commons/AboutActivity.java b/commons/src/main/java/org/wikimedia/commons/AboutActivity.java
index 65c5682c0..bdaf4b12e 100644
--- a/commons/src/main/java/org/wikimedia/commons/AboutActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/AboutActivity.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
index 34f4b0eb2..65773886e 100644
--- a/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
+++ b/commons/src/main/java/org/wikimedia/commons/CommonsApplication.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,10 +32,10 @@ import org.apache.http.conn.ssl.*;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.params.BasicHttpParams;
 import org.mediawiki.api.*;
-import fr.nrw.free.commons.auth.WikiAccountAuthenticator;
+import fr.free.nrw.commons.auth.WikiAccountAuthenticator;
 import org.apache.http.impl.client.*;
 import org.apache.http.params.CoreProtocolPNames;
-import fr.nrw.free.commons.data.*;
+import fr.free.nrw.commons.data.*;
 
 import com.android.volley.toolbox.*;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/EventLog.java b/commons/src/main/java/org/wikimedia/commons/EventLog.java
index 4a3262400..698171245 100644
--- a/commons/src/main/java/org/wikimedia/commons/EventLog.java
+++ b/commons/src/main/java/org/wikimedia/commons/EventLog.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/commons/src/main/java/org/wikimedia/commons/HandlerService.java b/commons/src/main/java/org/wikimedia/commons/HandlerService.java
index ed32fc24c..f2e30ffec 100644
--- a/commons/src/main/java/org/wikimedia/commons/HandlerService.java
+++ b/commons/src/main/java/org/wikimedia/commons/HandlerService.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import android.app.*;
 import android.content.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/License.java b/commons/src/main/java/org/wikimedia/commons/License.java
index 08e0a6943..d7b5c28e2 100644
--- a/commons/src/main/java/org/wikimedia/commons/License.java
+++ b/commons/src/main/java/org/wikimedia/commons/License.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 public class License {
     String key;
diff --git a/commons/src/main/java/org/wikimedia/commons/LicenseList.java b/commons/src/main/java/org/wikimedia/commons/LicenseList.java
index 59468b2f0..deaf31c30 100644
--- a/commons/src/main/java/org/wikimedia/commons/LicenseList.java
+++ b/commons/src/main/java/org/wikimedia/commons/LicenseList.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import android.app.Activity;
 import android.content.res.Resources;
@@ -59,7 +59,7 @@ public class LicenseList {
     }
 
     private int stringIdByName(String stringId) {
-        return res.getIdentifier("fr.nrw.free.commons:string/" + stringId, null, null);
+        return res.getIdentifier("fr.free.nrw.commons:string/" + stringId, null, null);
     }
 
     public String nameForTemplate(String template) {
diff --git a/commons/src/main/java/org/wikimedia/commons/Media.java b/commons/src/main/java/org/wikimedia/commons/Media.java
index 637fbe083..85d10d2fa 100644
--- a/commons/src/main/java/org/wikimedia/commons/Media.java
+++ b/commons/src/main/java/org/wikimedia/commons/Media.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import android.net.Uri;
 import android.os.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java b/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
index 7b35bf0af..2899e1181 100644
--- a/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
+++ b/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import android.util.Log;
 import org.mediawiki.api.ApiResult;
diff --git a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java b/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
index 6ba77e6c4..f998c5834 100644
--- a/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
+++ b/commons/src/main/java/org/wikimedia/commons/MediaWikiImageView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -28,8 +28,8 @@ import com.android.volley.VolleyError;
 import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.ImageLoader.ImageContainer;
 import com.android.volley.toolbox.ImageLoader.ImageListener;
-import fr.nrw.free.commons.contributions.Contribution;
-import fr.nrw.free.commons.contributions.ContributionsContentProvider;
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 
 
 public class MediaWikiImageView extends ImageView {
diff --git a/commons/src/main/java/org/wikimedia/commons/Prefs.java b/commons/src/main/java/org/wikimedia/commons/Prefs.java
index 6933c159c..dc591d980 100644
--- a/commons/src/main/java/org/wikimedia/commons/Prefs.java
+++ b/commons/src/main/java/org/wikimedia/commons/Prefs.java
@@ -1,7 +1,7 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 public class Prefs {
-    public static String GLOBAL_PREFS = "fr.nrw.free.commons.preferences";
+    public static String GLOBAL_PREFS = "fr.free.nrw.commons.preferences";
 
     public static String TRACKING_ENABLED = "eventLogging";
     public static final String DEFAULT_LICENSE = "defaultLicense";
diff --git a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java b/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java
index e4ff0b1bb..ee71d2f2c 100644
--- a/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/SettingsActivity.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 
 import android.content.SharedPreferences;
diff --git a/commons/src/main/java/org/wikimedia/commons/Utils.java b/commons/src/main/java/org/wikimedia/commons/Utils.java
index 08778f5e5..9a2ba7c9b 100644
--- a/commons/src/main/java/org/wikimedia/commons/Utils.java
+++ b/commons/src/main/java/org/wikimedia/commons/Utils.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import android.net.Uri;
 import android.os.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java b/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java
index 7f118f9cc..da05dfd08 100644
--- a/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/WelcomeActivity.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons;
+package fr.free.nrw.commons;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/commons/src/main/java/org/wikimedia/commons/api/MWApi.java b/commons/src/main/java/org/wikimedia/commons/api/MWApi.java
index 4c7f6fca5..c2d6d99f9 100644
--- a/commons/src/main/java/org/wikimedia/commons/api/MWApi.java
+++ b/commons/src/main/java/org/wikimedia/commons/api/MWApi.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.api;
+package fr.free.nrw.commons.api;
 
 import com.android.volley.RequestQueue;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java b/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java
index 9f8467ca3..a855b187f 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/auth/AuthenticatedActivity.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.auth;
+package fr.free.nrw.commons.auth;
 
 import java.io.IOException;
 
@@ -8,7 +8,7 @@ import com.actionbarsherlock.app.*;
 import android.accounts.*;
 import android.os.*;
 
-import fr.nrw.free.commons.*;
+import fr.free.nrw.commons.*;
 
 public class AuthenticatedActivity extends SherlockFragmentActivity {
     
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java b/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
index 4d09f45bb..8a3c16b89 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/auth/LoginActivity.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.auth;
+package fr.free.nrw.commons.auth;
 
 import java.io.IOException;
 
@@ -14,16 +14,16 @@ import android.view.*;
 import android.widget.*;
 import android.support.v4.app.NavUtils;
 
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.EventLog;
-import fr.nrw.free.commons.campaigns.CampaignsContentProvider;
-import fr.nrw.free.commons.contributions.*;
-import fr.nrw.free.commons.modifications.ModificationsContentProvider;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.EventLog;
+import fr.free.nrw.commons.campaigns.CampaignsContentProvider;
+import fr.free.nrw.commons.contributions.*;
+import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 
 
 public class LoginActivity extends AccountAuthenticatorActivity {
 
-    public static final String PARAM_USERNAME = "fr.nrw.free.commons.login.username";
+    public static final String PARAM_USERNAME = "fr.free.nrw.commons.login.username";
 
     private CommonsApplication app;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java b/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java
index aa5a0de25..d41155619 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java
+++ b/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticator.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.auth;
+package fr.free.nrw.commons.auth;
 
 import java.io.IOException;
 
@@ -7,11 +7,11 @@ import android.content.*;
 import android.os.*;
 
 import org.mediawiki.api.*;
-import fr.nrw.free.commons.*;
+import fr.free.nrw.commons.*;
 
 public class WikiAccountAuthenticator extends AbstractAccountAuthenticator {
 
-    public static final String COMMONS_ACCOUNT_TYPE = "fr.nrw.free.commons";
+    public static final String COMMONS_ACCOUNT_TYPE = "fr.free.nrw.commons";
     private Context context;
     public WikiAccountAuthenticator(Context context) {
         super(context);
diff --git a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java b/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java
index c65887d86..89521c609 100644
--- a/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java
+++ b/commons/src/main/java/org/wikimedia/commons/auth/WikiAccountAuthenticatorService.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.auth;
+package fr.free.nrw.commons.auth;
 
 import android.app.*;
 import android.content.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java b/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java
index 637eeaa3c..dfbf5f96a 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/Campaign.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.campaigns;
+package fr.free.nrw.commons.campaigns;
 
 import android.content.ContentValues;
 import android.database.Cursor;
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java
index dab41baed..3e3a44dbc 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignActivity.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.campaigns;
+package fr.free.nrw.commons.campaigns;
 
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -12,9 +12,9 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.R;
-import fr.nrw.free.commons.contributions.ContributionsActivity;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.contributions.ContributionsActivity;
 
 public  class CampaignActivity
         extends SherlockFragmentActivity
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java
index 6557628f1..4cd0f77a9 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignContribution.java
@@ -1,7 +1,7 @@
-package fr.nrw.free.commons.campaigns;
+package fr.free.nrw.commons.campaigns;
 
 import android.net.Uri;
-import fr.nrw.free.commons.contributions.Contribution;
+import fr.free.nrw.commons.contributions.Contribution;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java
index 27d27332c..5dba82941 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsContentProvider.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.campaigns;
+package fr.free.nrw.commons.campaigns;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -9,15 +9,15 @@ import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.data.DBOpenHelper;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.data.DBOpenHelper;
 
 public class CampaignsContentProvider extends ContentProvider{
 
     private static final int CAMPAIGNS = 1;
     private static final int CAMPAIGNS_ID = 2;
 
-    public static final String AUTHORITY = "fr.nrw.free.commons.campaigns.contentprovider";
+    public static final String AUTHORITY = "fr.free.nrw.commons.campaigns.contentprovider";
     private static final String BASE_PATH = "campiagns";
 
     public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java
index 40c17e520..ecb40f699 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsListAdapter.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.campaigns;
+package fr.free.nrw.commons.campaigns;
 
 import android.app.Activity;
 import android.content.Context;
@@ -13,11 +13,11 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.SherlockFragment;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.MediaWikiImageView;
-import fr.nrw.free.commons.R;
-import fr.nrw.free.commons.Utils;
-import fr.nrw.free.commons.campaigns.Campaign;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.MediaWikiImageView;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.campaigns.Campaign;
 
 class CampaignsListAdapter extends CursorAdapter {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java
index 3baa533ca..1b1096ff2 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncAdapter.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.campaigns;
+package fr.free.nrw.commons.campaigns;
 
 import android.accounts.Account;
 import android.content.*;
@@ -9,10 +9,10 @@ import android.text.TextUtils;
 import android.util.Log;
 import org.mediawiki.api.ApiResult;
 import org.mediawiki.api.MWApi;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.Utils;
-import fr.nrw.free.commons.contributions.Contribution;
-import fr.nrw.free.commons.contributions.ContributionsContentProvider;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java
index e7bd7c5ad..d8055e761 100644
--- a/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java
+++ b/commons/src/main/java/org/wikimedia/commons/campaigns/CampaignsSyncService.java
@@ -1,9 +1,9 @@
-package fr.nrw.free.commons.campaigns;
+package fr.free.nrw.commons.campaigns;
 
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
-import fr.nrw.free.commons.contributions.ContributionsSyncAdapter;
+import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;
 
 public class CampaignsSyncService extends Service {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java b/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
index fc19f789c..c53d893fc 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/category/CategorizationFragment.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.category;
+package fr.free.nrw.commons.category;
 
 import android.app.Activity;
 import android.content.ContentProviderClient;
@@ -17,12 +17,12 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import org.mediawiki.api.ApiResult;
 import org.mediawiki.api.MWApi;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.R;
-import fr.nrw.free.commons.Utils;
-import fr.nrw.free.commons.category.Category;
-import fr.nrw.free.commons.category.CategoryContentProvider;
-import fr.nrw.free.commons.contributions.Contribution;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.category.Category;
+import fr.free.nrw.commons.category.CategoryContentProvider;
+import fr.free.nrw.commons.contributions.Contribution;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/commons/src/main/java/org/wikimedia/commons/category/Category.java b/commons/src/main/java/org/wikimedia/commons/category/Category.java
index 737cca7d3..1dd3e555e 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/Category.java
+++ b/commons/src/main/java/org/wikimedia/commons/category/Category.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.category;
+package fr.free.nrw.commons.category;
 
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
@@ -9,7 +9,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.RemoteException;
 import android.text.TextUtils;
-import fr.nrw.free.commons.contributions.ContributionsContentProvider;
+import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 
 import java.util.Date;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java b/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java
index b23c9d4ee..0878b8f2e 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java
+++ b/commons/src/main/java/org/wikimedia/commons/category/CategoryContentProvider.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.category;
+package fr.free.nrw.commons.category;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -9,8 +9,8 @@ import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.data.DBOpenHelper;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.data.DBOpenHelper;
 
 public class CategoryContentProvider extends ContentProvider {
 
@@ -18,7 +18,7 @@ public class CategoryContentProvider extends ContentProvider {
     private static final int CATEGORIES = 1;
     private static final int CATEGORIES_ID = 2;
 
-    public static final String AUTHORITY = "fr.nrw.free.commons.categories.contentprovider";
+    public static final String AUTHORITY = "fr.free.nrw.commons.categories.contentprovider";
     private static final String BASE_PATH = "categories";
 
     public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java b/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
index b3c5a11aa..b5ec3d155 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import java.text.*;
 import java.util.*;
@@ -10,7 +10,7 @@ import android.net.*;
 import android.os.*;
 import android.text.*;
 
-import fr.nrw.free.commons.*;
+import fr.free.nrw.commons.*;
 
 public class Contribution extends Media {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java
index f70153a03..32777cdb6 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionController.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import android.app.*;
 import android.content.Intent;
@@ -8,9 +8,9 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.util.Log;
 import com.actionbarsherlock.app.SherlockFragment;
-import fr.nrw.free.commons.campaigns.Campaign;
-import fr.nrw.free.commons.upload.ShareActivity;
-import fr.nrw.free.commons.upload.UploadService;
+import fr.free.nrw.commons.campaigns.Campaign;
+import fr.free.nrw.commons.upload.ShareActivity;
+import fr.free.nrw.commons.upload.UploadService;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java
index acde4e1b7..837a4360e 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionViewHolder.java
@@ -1,11 +1,11 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import fr.nrw.free.commons.MediaWikiImageView;
-import fr.nrw.free.commons.R;
+import fr.free.nrw.commons.MediaWikiImageView;
+import fr.free.nrw.commons.R;
 
 class ContributionViewHolder {
     final MediaWikiImageView imageView;
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
index 9d530076a..81cff5cbe 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsActivity.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import android.database.DataSetObserver;
 import android.os.IBinder;
@@ -17,11 +17,11 @@ import android.widget.Adapter;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.auth.*;
-import fr.nrw.free.commons.campaigns.Campaign;
-import fr.nrw.free.commons.media.*;
-import fr.nrw.free.commons.upload.UploadService;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.auth.*;
+import fr.free.nrw.commons.campaigns.Campaign;
+import fr.free.nrw.commons.media.*;
+import fr.free.nrw.commons.upload.UploadService;
 
 import java.util.ArrayList;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java
index c018eb838..b2657b835 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsContentProvider.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import android.content.*;
 import android.database.*;
@@ -7,15 +7,15 @@ import android.net.*;
 import android.text.*;
 import android.util.*;
 
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.data.*;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.data.*;
 
 public class ContributionsContentProvider extends ContentProvider{
 
     private static final int CONTRIBUTIONS = 1;
     private static final int CONTRIBUTIONS_ID = 2;
 
-    public static final String AUTHORITY = "fr.nrw.free.commons.contributions.contentprovider";
+    public static final String AUTHORITY = "fr.free.nrw.commons.contributions.contentprovider";
     private static final String BASE_PATH = "contributions";
 
     public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
index aa02d2386..6397caab9 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import android.app.Activity;
 import android.content.Context;
@@ -14,10 +14,10 @@ import com.actionbarsherlock.app.SherlockFragment;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.MediaWikiImageView;
-import fr.nrw.free.commons.R;
-import fr.nrw.free.commons.Utils;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.MediaWikiImageView;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
 
 class ContributionsListAdapter extends CursorAdapter {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
index 1397e2cf6..cbade3177 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import android.app.Activity;
 import android.content.Context;
@@ -17,9 +17,9 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
 
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.R;
-import fr.nrw.free.commons.campaigns.Campaign;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.campaigns.Campaign;
 
 public class ContributionsListFragment extends SherlockFragment {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java
index 3f002554e..1cf8bf976 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncAdapter.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import android.content.*;
 import android.database.Cursor;
@@ -12,8 +12,8 @@ import java.io.*;
 import java.util.*;
 
 import org.mediawiki.api.*;
-import fr.nrw.free.commons.Utils;
-import fr.nrw.free.commons.*;
+import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.*;
 
 
 public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter {
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java
index 7e9737e3a..f599e4fd2 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsSyncService.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import android.app.*;
 import android.content.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java b/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java
index da032fcfe..7a365a12b 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/MediaListAdapter.java
@@ -1,13 +1,13 @@
-package fr.nrw.free.commons.contributions;
+package fr.free.nrw.commons.contributions;
 
 import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import com.android.volley.toolbox.ImageLoader;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.Media;
-import fr.nrw.free.commons.R;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.R;
 
 import java.util.ArrayList;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java b/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
index 130a575ea..e3b532f6f 100644
--- a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
+++ b/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
@@ -1,12 +1,12 @@
-package fr.nrw.free.commons.data;
+package fr.free.nrw.commons.data;
 
 import android.content.*;
 import android.database.sqlite.*;
 
-import fr.nrw.free.commons.campaigns.Campaign;
-import fr.nrw.free.commons.category.Category;
-import fr.nrw.free.commons.contributions.*;
-import fr.nrw.free.commons.modifications.ModifierSequence;
+import fr.free.nrw.commons.campaigns.Campaign;
+import fr.free.nrw.commons.category.Category;
+import fr.free.nrw.commons.contributions.*;
+import fr.free.nrw.commons.modifications.ModifierSequence;
 
 public class DBOpenHelper  extends SQLiteOpenHelper{
 
diff --git a/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java b/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java
index 7b1fa2012..28e882ecd 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java
+++ b/commons/src/main/java/org/wikimedia/commons/media/CategoryImagesLoader.java
@@ -1,12 +1,12 @@
-package fr.nrw.free.commons.media;
+package fr.free.nrw.commons.media;
 
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
 import android.util.Log;
 import org.mediawiki.api.ApiResult;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.Media;
-import fr.nrw.free.commons.Utils;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.Utils;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
index df4961568..e7b608938 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.media;
+package fr.free.nrw.commons.media;
 
 import android.content.Intent;
 import android.database.DataSetObserver;
@@ -16,7 +16,7 @@ import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
 
 import com.android.volley.toolbox.*;
 
-import fr.nrw.free.commons.*;
+import fr.free.nrw.commons.*;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
index d7eb9b7a9..c2d0813ef 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.media;
+package fr.free.nrw.commons.media;
 
 import android.app.DownloadManager;
 import android.content.*;
@@ -18,9 +18,9 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.widget.ShareActionProvider;
 
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.contributions.Contribution;
-import fr.nrw.free.commons.contributions.ContributionsActivity;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.contributions.ContributionsActivity;
 
 public class MediaDetailPagerFragment extends SherlockFragment implements ViewPager.OnPageChangeListener {
     private ViewPager pager;
diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java
index 0514bb168..cf89ad256 100644
--- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java
+++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailSpacer.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.media;
+package fr.free.nrw.commons.media;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java b/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java
index e551d3e39..f4c59cf93 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/CategoryModifier.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.modifications;
+package fr.free.nrw.commons.modifications;
 
 import android.os.Bundle;
 import android.os.Parcel;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java
index d81d6c8ab..1bf4ae382 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsContentProvider.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.modifications;
+package fr.free.nrw.commons.modifications;
 
 import android.content.*;
 import android.database.*;
@@ -7,15 +7,15 @@ import android.net.*;
 import android.text.*;
 import android.util.*;
 
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.data.*;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.data.*;
 
 public class ModificationsContentProvider extends ContentProvider{
 
     private static final int MODIFICATIONS = 1;
     private static final int MODIFICATIONS_ID = 2;
 
-    public static final String AUTHORITY = "fr.nrw.free.commons.modifications.contentprovider";
+    public static final String AUTHORITY = "fr.free.nrw.commons.modifications.contentprovider";
     private static final String BASE_PATH = "modifications";
 
     public static final Uri BASE_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java
index 492021514..72b12ae00 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncAdapter.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.modifications;
+package fr.free.nrw.commons.modifications;
 
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
@@ -15,10 +15,10 @@ import java.io.*;
 import java.util.*;
 
 import org.mediawiki.api.*;
-import fr.nrw.free.commons.Utils;
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.contributions.Contribution;
-import fr.nrw.free.commons.contributions.ContributionsContentProvider;
+import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.contributions.Contribution;
+import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 
 
 public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java
index 490913435..7f424c362 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/ModificationsSyncService.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.modifications;
+package fr.free.nrw.commons.modifications;
 
 import android.app.*;
 import android.content.*;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java b/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java
index e7540b2d6..7c88ee225 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/ModifierSequence.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.modifications;
+package fr.free.nrw.commons.modifications;
 
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
@@ -10,7 +10,7 @@ import android.text.TextUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import fr.nrw.free.commons.contributions.ContributionsContentProvider;
+import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java b/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java
index 135973e43..d130570ff 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/PageModifier.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.modifications;
+package fr.free.nrw.commons.modifications;
 
 import android.os.Bundle;
 import org.json.JSONException;
diff --git a/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java b/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
index cfd2a4767..21b4872b7 100644
--- a/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
+++ b/commons/src/main/java/org/wikimedia/commons/modifications/TemplateRemoveModifier.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.modifications;
+package fr.free.nrw.commons.modifications;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java b/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
index 354cf4db1..297759896 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/MultipleShareActivity.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.upload;
+package fr.free.nrw.commons.upload;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -15,15 +15,15 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.*;
 import com.actionbarsherlock.view.MenuItem;
 
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.auth.*;
-import fr.nrw.free.commons.category.CategorizationFragment;
-import fr.nrw.free.commons.contributions.*;
-import fr.nrw.free.commons.media.*;
-import fr.nrw.free.commons.modifications.CategoryModifier;
-import fr.nrw.free.commons.modifications.ModificationsContentProvider;
-import fr.nrw.free.commons.modifications.ModifierSequence;
-import fr.nrw.free.commons.modifications.TemplateRemoveModifier;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.auth.*;
+import fr.free.nrw.commons.category.CategorizationFragment;
+import fr.free.nrw.commons.contributions.*;
+import fr.free.nrw.commons.media.*;
+import fr.free.nrw.commons.modifications.CategoryModifier;
+import fr.free.nrw.commons.modifications.ModificationsContentProvider;
+import fr.free.nrw.commons.modifications.ModifierSequence;
+import fr.free.nrw.commons.modifications.TemplateRemoveModifier;
 
 public  class       MultipleShareActivity
         extends     AuthenticatedActivity
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java b/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
index bebeb92c7..267a9642d 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/MultipleUploadListFragment.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.upload;
+package fr.free.nrw.commons.upload;
 
 import android.content.*;
 import android.graphics.*;
@@ -14,10 +14,10 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.nostra13.universalimageloader.core.*;
 
-import fr.nrw.free.commons.R;
-import fr.nrw.free.commons.Utils;
-import fr.nrw.free.commons.contributions.*;
-import fr.nrw.free.commons.media.*;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.contributions.*;
+import fr.free.nrw.commons.media.*;
 
 
 public class MultipleUploadListFragment extends SherlockFragment {
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java b/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
index d3c1f57ee..399afaff3 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/ShareActivity.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.upload;
+package fr.free.nrw.commons.upload;
 
 import android.app.*;
 import android.content.*;
@@ -9,15 +9,15 @@ import android.support.v4.app.NavUtils;
 import com.actionbarsherlock.view.MenuItem;
 import android.widget.*;
 
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.campaigns.Campaign;
-import fr.nrw.free.commons.category.CategorizationFragment;
-import fr.nrw.free.commons.contributions.*;
-import fr.nrw.free.commons.auth.*;
-import fr.nrw.free.commons.modifications.CategoryModifier;
-import fr.nrw.free.commons.modifications.ModificationsContentProvider;
-import fr.nrw.free.commons.modifications.ModifierSequence;
-import fr.nrw.free.commons.modifications.TemplateRemoveModifier;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.campaigns.Campaign;
+import fr.free.nrw.commons.category.CategorizationFragment;
+import fr.free.nrw.commons.contributions.*;
+import fr.free.nrw.commons.auth.*;
+import fr.free.nrw.commons.modifications.CategoryModifier;
+import fr.free.nrw.commons.modifications.ModificationsContentProvider;
+import fr.free.nrw.commons.modifications.ModifierSequence;
+import fr.free.nrw.commons.modifications.TemplateRemoveModifier;
 
 import java.util.ArrayList;
 
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java b/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
index 61ce99e26..eb63ea5d4 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/SingleUploadFragment.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.upload;
+package fr.free.nrw.commons.upload;
 
 import android.app.Activity;
 import android.content.Context;
@@ -21,10 +21,10 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import fr.nrw.free.commons.Prefs;
-import fr.nrw.free.commons.R;
-import fr.nrw.free.commons.Utils;
-import fr.nrw.free.commons.contributions.Contribution;
+import fr.free.nrw.commons.Prefs;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.contributions.Contribution;
 
 public class SingleUploadFragment extends SherlockFragment {
 
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java b/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java
index 1fef105b7..e218b0cac 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/UploadController.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.upload;
+package fr.free.nrw.commons.upload;
 
 import android.app.Activity;
 import android.content.*;
@@ -10,13 +10,13 @@ import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;
-import fr.nrw.free.commons.CommonsApplication;
-import fr.nrw.free.commons.HandlerService;
-import fr.nrw.free.commons.Prefs;
-import fr.nrw.free.commons.Utils;
-import fr.nrw.free.commons.campaigns.Campaign;
-import fr.nrw.free.commons.campaigns.CampaignContribution;
-import fr.nrw.free.commons.contributions.Contribution;
+import fr.free.nrw.commons.CommonsApplication;
+import fr.free.nrw.commons.HandlerService;
+import fr.free.nrw.commons.Prefs;
+import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.campaigns.Campaign;
+import fr.free.nrw.commons.campaigns.CampaignContribution;
+import fr.free.nrw.commons.contributions.Contribution;
 
 import java.io.IOException;
 import java.util.Date;
diff --git a/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java b/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
index 6a58a69a4..2be1cc65f 100644
--- a/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
+++ b/commons/src/main/java/org/wikimedia/commons/upload/UploadService.java
@@ -1,4 +1,4 @@
-package fr.nrw.free.commons.upload;
+package fr.free.nrw.commons.upload;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -18,13 +18,13 @@ import android.support.v4.app.NotificationCompat;
 import android.util.*;
 import android.widget.*;
 
-import fr.nrw.free.commons.*;
-import fr.nrw.free.commons.contributions.*;
-import fr.nrw.free.commons.modifications.ModificationsContentProvider;
+import fr.free.nrw.commons.*;
+import fr.free.nrw.commons.contributions.*;
+import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 
 public class UploadService extends HandlerService<Contribution> {
 
-    private static final String EXTRA_PREFIX = "fr.nrw.free.commons.upload";
+    private static final String EXTRA_PREFIX = "fr.free.nrw.commons.upload";
 
     public static final int ACTION_UPLOAD_FILE = 1;
 
@@ -223,7 +223,7 @@ public class UploadService extends HandlerService<Contribution> {
             if(!resultStatus.equals("Success")) {
                 String errorCode = result.getString("/api/error/@code");
                 showFailedNotification(contribution);
-                fr.nrw.free.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
+                fr.free.nrw.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
                         .param("username", app.getCurrentAccount().name)
                         .param("source", contribution.getSource())
                         .param("multiple", contribution.getMultiple())
@@ -241,7 +241,7 @@ public class UploadService extends HandlerService<Contribution> {
                 contribution.setDateUploaded(dateUploaded);
                 contribution.save();
 
-                fr.nrw.free.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
+                fr.free.nrw.commons.EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
                         .param("username", app.getCurrentAccount().name)
                         .param("source", contribution.getSource()) //FIXME
                         .param("filename", contribution.getFilename())