diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 1f8cf96..63369a6 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.susanin.travelguide"
+    package="com.guidewithme.uk"
     android:versionCode="1"
     android:versionName="1.0" >
 
diff --git a/android/src/com/guidewithme/ArticleInfoDetailActivity.java b/android/src/com/guidewithme/ArticleInfoDetailActivity.java
index a9ac142..e645eed 100644
--- a/android/src/com/guidewithme/ArticleInfoDetailActivity.java
+++ b/android/src/com/guidewithme/ArticleInfoDetailActivity.java
@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.NavUtils;
 import android.view.MenuItem;
-import com.susanin.travelguide.R;
+import com.guidewithme.uk.R;
 
 /**
  * An activity representing a single ArticleInfo detail screen. This activity is
diff --git a/android/src/com/guidewithme/ArticleInfoDetailFragment.java b/android/src/com/guidewithme/ArticleInfoDetailFragment.java
index 4c89611..f46533b 100644
--- a/android/src/com/guidewithme/ArticleInfoDetailFragment.java
+++ b/android/src/com/guidewithme/ArticleInfoDetailFragment.java
@@ -25,7 +25,7 @@ import com.guidewithme.cpp.Storage;
 import com.guidewithme.util.Utils;
 import com.mapswithme.maps.api.MWMPoint;
 import com.mapswithme.maps.api.MapsWithMeApi;
-import com.susanin.travelguide.R;
+import com.guidewithme.uk.R;
 
 /**
  * A fragment representing a single ArticleInfo detail screen. This fragment is
diff --git a/android/src/com/guidewithme/ArticleInfoListActivity.java b/android/src/com/guidewithme/ArticleInfoListActivity.java
index d7ce792..ecfb989 100644
--- a/android/src/com/guidewithme/ArticleInfoListActivity.java
+++ b/android/src/com/guidewithme/ArticleInfoListActivity.java
@@ -11,7 +11,7 @@ import com.guidewithme.article.ArticleInfo;
 import com.guidewithme.cpp.Storage;
 import com.mapswithme.maps.api.MWMPoint;
 import com.mapswithme.maps.api.MWMResponse;
-import com.susanin.travelguide.R;
+import com.guidewithme.uk.R;
 
 /**
  * An activity representing a list of ArticleInfos. This activity has different
diff --git a/android/src/com/guidewithme/ArticleInfoListFragment.java b/android/src/com/guidewithme/ArticleInfoListFragment.java
index 475d1fe..351ef14 100644
--- a/android/src/com/guidewithme/ArticleInfoListFragment.java
+++ b/android/src/com/guidewithme/ArticleInfoListFragment.java
@@ -33,7 +33,7 @@ import com.guidewithme.util.Utils;
 import com.guidewithme.widget.StorageArticleInfoAdapter;
 import com.mapswithme.maps.api.MWMPoint;
 import com.mapswithme.maps.api.MapsWithMeApi;
-import com.susanin.travelguide.R;
+import com.guidewithme.uk.R;
 
 /**
  * A list fragment representing a list of ArticleInfos. This fragment also
diff --git a/android/src/com/guidewithme/ExpansionActivity.java b/android/src/com/guidewithme/ExpansionActivity.java
index a29d598..7c815b9 100644
--- a/android/src/com/guidewithme/ExpansionActivity.java
+++ b/android/src/com/guidewithme/ExpansionActivity.java
@@ -22,7 +22,7 @@ import com.google.android.vending.expansion.downloader.IStub;
 import com.guidewithme.expansion.ExpansionService;
 import com.guidewithme.util.Expansion;
 import com.guidewithme.util.Utils;
-import com.susanin.travelguide.R;
+import com.guidewithme.uk.R;
 
 public class ExpansionActivity extends Activity
                                implements IDownloaderClient, OnClickListener
diff --git a/android/src/com/guidewithme/article/ObbPathFinder.java b/android/src/com/guidewithme/article/ObbPathFinder.java
index 2d2f22a..3b03f9f 100644
--- a/android/src/com/guidewithme/article/ObbPathFinder.java
+++ b/android/src/com/guidewithme/article/ObbPathFinder.java
@@ -19,7 +19,7 @@ public class ObbPathFinder extends OnObbStateChangeListener
   {
     mContext = context;
     mSm = (StorageManager) mContext.getSystemService(Context.STORAGE_SERVICE);
-    mSm.mountObb(Expansion.getPath(mContext.getPackageName()), null, this);
+    mSm.mountObb(Expansion.getPath(mContext.getPackageName()), Expansion.KEY, this);
   }
 
   @Override
diff --git a/android/src/com/guidewithme/thumb/ObbThumbnailProvider.java b/android/src/com/guidewithme/thumb/ObbThumbnailProvider.java
index df2c169..cd79873 100644
--- a/android/src/com/guidewithme/thumb/ObbThumbnailProvider.java
+++ b/android/src/com/guidewithme/thumb/ObbThumbnailProvider.java
@@ -35,7 +35,7 @@ public class ObbThumbnailProvider extends OnObbStateChangeListener implements Th
   {
     mContext = context;
     mSm = (StorageManager) mContext.getSystemService(Context.STORAGE_SERVICE);
-    mSm.mountObb(Expansion.getPath(mContext.getPackageName()), null, this);
+    mSm.mountObb(Expansion.getPath(mContext.getPackageName()), Expansion.KEY, this);
   }
 
   public ObbThumbnailProvider(Context context, MountStateChangedListener listener)
diff --git a/android/src/com/guidewithme/util/Expansion.java b/android/src/com/guidewithme/util/Expansion.java
index 2b50275..11e723b 100644
--- a/android/src/com/guidewithme/util/Expansion.java
+++ b/android/src/com/guidewithme/util/Expansion.java
@@ -6,6 +6,8 @@ import android.os.Environment;
 
 public class Expansion
 {
+  public static final String KEY = null;
+
   public static String getPath(String packageName)
   {
     return findFirstObbFile(packageName);
diff --git a/android/src/com/guidewithme/widget/StorageArticleInfoAdapter.java b/android/src/com/guidewithme/widget/StorageArticleInfoAdapter.java
index 897de08..1c6aa66 100644
--- a/android/src/com/guidewithme/widget/StorageArticleInfoAdapter.java
+++ b/android/src/com/guidewithme/widget/StorageArticleInfoAdapter.java
@@ -12,7 +12,7 @@ import com.guidewithme.article.ArticleInfo;
 import com.guidewithme.cpp.Storage;
 import com.guidewithme.thumb.ObbThumbnailProvider;
 import com.guidewithme.thumb.ThumbnailsProvider;
-import com.susanin.travelguide.R;
+import com.guidewithme.uk.R;
 
 public class StorageArticleInfoAdapter extends BaseAdapter
                                        implements ObbThumbnailProvider.MountStateChangedListener