diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e14f7ba..149b48a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,7 +81,7 @@
 
         <provider
             android:name="net.micode.notes.data.NotesProvider"
-            android:authorities="notes"
+            android:authorities="micode_notes"
             android:multiprocess="true" />
 
         <receiver
diff --git a/src/net/micode/notes/data/Notes.java b/src/net/micode/notes/data/Notes.java
index f9b9ba6..f240604 100644
--- a/src/net/micode/notes/data/Notes.java
+++ b/src/net/micode/notes/data/Notes.java
@@ -18,7 +18,7 @@ package net.micode.notes.data;
 
 import android.net.Uri;
 public class Notes {
-    public static final String AUTHORITY = "notes";
+    public static final String AUTHORITY = "micode_notes";
     public static final String TAG = "Notes";
     public static final int TYPE_NOTE     = 0;
     public static final int TYPE_FOLDER   = 1;
diff --git a/src/net/micode/notes/ui/NotesPreferenceActivity.java b/src/net/micode/notes/ui/NotesPreferenceActivity.java
index 3c486a5..2e7e5fd 100644
--- a/src/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -18,7 +18,6 @@ package net.micode.notes.ui;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
@@ -35,7 +34,6 @@ import android.preference.PreferenceCategory;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;