diff --git a/SealNotePlusApp/build.gradle b/SealNotePlusApp/build.gradle
index 5f507c5..255ac0d 100644
--- a/SealNotePlusApp/build.gradle
+++ b/SealNotePlusApp/build.gradle
@@ -27,10 +27,10 @@ android {
 
     signingConfigs {
         release {
-            storeFile file(String.valueOf(System.getenv("SEALNOTE_KEYSTORE")))
-            storePassword System.getenv("SEALNOTE_KEYSTORE_PASSWORD")
-            keyAlias System.getenv("SEALNOTE_KEY_ALIAS")
-            keyPassword System.getenv("SEALNOTE_KEY_PASSWORD")
+            storeFile file(String.valueOf(System.getenv("SEALNOTEPLUS_KEYSTORE")))
+            storePassword System.getenv("SEALNOTEPLUS_KEYSTORE_PASSWORD")
+            keyAlias System.getenv("SEALNOTEPLUS_KEY_ALIAS")
+            keyPassword System.getenv("SEALNOTEPLUS_KEY_PASSWORD")
         }
     }
 
diff --git a/SealNotePlusApp/src/main/AndroidManifest.xml b/SealNotePlusApp/src/main/AndroidManifest.xml
index 60a3d68..7a6ef3d 100644
--- a/SealNotePlusApp/src/main/AndroidManifest.xml
+++ b/SealNotePlusApp/src/main/AndroidManifest.xml
@@ -8,11 +8,11 @@
     <application
             android:icon="@drawable/ic_launcher"
             android:label="@string/short_app_name"
-            android:theme="@style/Sealnote.Theme.Main"
-            android:name="org.hawknetwork.sealnoteplus.SealnoteApplication">
+            android:theme="@style/SealNotePlus.Theme.Main"
+            android:name="org.hawknetwork.sealnoteplus.SealNotePlusApplication">
         <activity
-                android:name="org.hawknetwork.sealnoteplus.SealnoteActivity"
-                android:theme="@style/Sealnote.Theme.Sealnote">
+                android:name="org.hawknetwork.sealnoteplus.NoteListActivity"
+                android:theme="@style/SealNotePlus.Theme.NoteList">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -21,11 +21,11 @@
         <activity
                 android:name="org.hawknetwork.sealnoteplus.NoteActivity"
                 android:label="@string/title_activity_note"
-                android:parentActivityName="org.hawknetwork.sealnoteplus.SealnoteActivity"
-                android:theme="@style/Sealnote.Theme.Note">
+                android:parentActivityName="org.hawknetwork.sealnoteplus.NoteListActivity"
+                android:theme="@style/SealNotePlus.Theme.Note">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
-                    android:value="org.hawknetwork.sealnoteplus.SealnoteActivity"/>
+                    android:value="org.hawknetwork.sealnoteplus.NoteListActivity"/>
         </activity>
         <activity
                 android:name="org.hawknetwork.sealnoteplus.PasswordActivity"
@@ -35,26 +35,26 @@
         <activity
                 android:name="org.hawknetwork.sealnoteplus.SettingsActivity"
                 android:label="@string/title_activity_settings"
-                android:parentActivityName="org.hawknetwork.sealnoteplus.SealnoteActivity"
-                android:theme="@style/Sealnote.Theme.Main">
+                android:parentActivityName="org.hawknetwork.sealnoteplus.NoteListActivity"
+                android:theme="@style/SealNotePlus.Theme.Main">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
-                    android:value="org.hawknetwork.sealnoteplus.SealnoteActivity"/>
+                    android:value="org.hawknetwork.sealnoteplus.NoteListActivity"/>
         </activity>
         <activity
                 android:name="org.hawknetwork.sealnoteplus.TagsEditorActivity"
                 android:label="@string/title_activity_edit_tags"
-                android:parentActivityName="org.hawknetwork.sealnoteplus.SealnoteActivity"
-                android:theme="@style/Sealnote.Theme.Main">
+                android:parentActivityName="org.hawknetwork.sealnoteplus.NoteListActivity"
+                android:theme="@style/SealNotePlus.Theme.Main">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
-                    android:value="org.hawknetwork.sealnoteplus.SealnoteActivity"/>
+                    android:value="org.hawknetwork.sealnoteplus.NoteListActivity"/>
         </activity>
 
         <activity
                 android:name="org.hawknetwork.sealnoteplus.WebViewActivity"
                 android:parentActivityName="org.hawknetwork.sealnoteplus.SettingsActivity"
-                android:theme="@style/Sealnote.Theme.Main">
+                android:theme="@style/SealNotePlus.Theme.Main">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="org.hawknetwork.sealnoteplus.SettingsActivity"/>
@@ -63,7 +63,7 @@
         <activity
                 android:name="org.hawknetwork.sealnoteplus.BackupActivity"
                 android:parentActivityName="org.hawknetwork.sealnoteplus.SettingsActivity"
-                android:theme="@style/Sealnote.Theme.Main"
+                android:theme="@style/SealNotePlus.Theme.Main"
                 android:label="@string/backup">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
@@ -73,7 +73,7 @@
         <activity
                 android:name="org.hawknetwork.sealnoteplus.RestoreActivity"
                 android:parentActivityName="org.hawknetwork.sealnoteplus.SettingsActivity"
-                android:theme="@style/Sealnote.Theme.Main"
+                android:theme="@style/SealNotePlus.Theme.Main"
                 android:label="@string/restore">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/NoteActivity.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/NoteActivity.java
index 73067c6..3526351 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/NoteActivity.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/NoteActivity.java
@@ -23,7 +23,6 @@
 import android.widget.Toast;
 
 import com.google.common.collect.Sets;
-import org.hawknetwork.sealnoteplus.R;
 
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 import org.hawknetwork.sealnoteplus.data.Note;
@@ -183,7 +182,7 @@ private void init(boolean isNewNote, Note.Type type) {
 
         // load suggestions
         // TODO: Do this asynchronously if required
-        mTagEditText.loadSuggestions(SealnoteApplication.getDatabase().getAllTags().keySet());
+        mTagEditText.loadSuggestions(SealNotePlusApplication.getDatabase().getAllTags().keySet());
         mTagEditText.setThreshold(1);
 
         // TextWatcher to update share intent
@@ -456,7 +455,7 @@ private boolean isContentChanged() {
      * @return true if note saved
      */
     public boolean saveNote(boolean forceSave) {
-        final DatabaseHandler handler = SealnoteApplication.getDatabase();
+        final DatabaseHandler handler = SealNotePlusApplication.getDatabase();
         final String title = mTitleView.getText().toString();
         final NoteContent noteContent = mNoteView.getNoteContent();
         final String text = noteContent.toString();
@@ -498,7 +497,7 @@ public boolean saveNote(boolean forceSave) {
      * Delete current note
      */
     public void doDelete() {
-        final DatabaseHandler handler = SealnoteApplication.getDatabase();
+        final DatabaseHandler handler = SealNotePlusApplication.getDatabase();
         handler.trashNote(mNote.getId(), true);
         mNote = null;
         Toast.makeText(this, getResources().getString(R.string.note_deleted), Toast.LENGTH_SHORT).show();
@@ -514,7 +513,7 @@ public void doDelete() {
      * Un-archive a note
      */
     public void doUnarchive() {
-        final DatabaseHandler handler = SealnoteApplication.getDatabase();
+        final DatabaseHandler handler = SealNotePlusApplication.getDatabase();
         handler.archiveNote(mNote.getId(), false);
         mNote = null;
         Toast.makeText(this, getResources().getString(R.string.note_unarchived), Toast.LENGTH_SHORT).show();
@@ -541,7 +540,7 @@ public void doArchive() {
      * Archive current note
      */
     private void doArchiveNote() {
-        final DatabaseHandler handler = SealnoteApplication.getDatabase();
+        final DatabaseHandler handler = SealNotePlusApplication.getDatabase();
         handler.archiveNote(mNote.getId(), true);
         mNote = null;
         Toast.makeText(this, getResources().getString(R.string.note_archived), Toast.LENGTH_SHORT).show();
@@ -581,7 +580,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
      * Restores note from trash
      */
     public void doRestore() {
-        final DatabaseHandler handler = SealnoteApplication.getDatabase();
+        final DatabaseHandler handler = SealNotePlusApplication.getDatabase();
         handler.trashNote(mNote.getId(), false);
         mNote = null;
         Toast.makeText(this, getResources().getString(R.string.note_restored), Toast.LENGTH_SHORT).show();
@@ -650,7 +649,7 @@ protected void onPreExecute() {
          */
         @Override
         protected Note doInBackground(Integer... integers) {
-            DatabaseHandler db = SealnoteApplication.getDatabase();
+            DatabaseHandler db = SealNotePlusApplication.getDatabase();
             return db.getNote(integers[0]);
         }
 
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/SealnoteActivity.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/NoteListActivity.java
similarity index 94%
rename from SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/SealnoteActivity.java
rename to SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/NoteListActivity.java
index 7a811db..ad9ddcd 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/SealnoteActivity.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/NoteListActivity.java
@@ -19,11 +19,9 @@
 import android.view.*;
 import android.widget.*;
 
-import org.hawknetwork.sealnoteplus.R;
-
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 import org.hawknetwork.sealnoteplus.data.Note;
-import org.hawknetwork.sealnoteplus.fragment.SealnoteFragment;
+import org.hawknetwork.sealnoteplus.fragment.NoteListFragment;
 import org.hawknetwork.sealnoteplus.utils.FontCache;
 import org.hawknetwork.sealnoteplus.utils.Misc;
 import org.hawknetwork.sealnoteplus.utils.PreferenceHandler;
@@ -40,9 +38,9 @@
 /**
  * Main activity where all cards are listed in a staggered grid
  */
-public class SealnoteActivity extends Activity
+public class NoteListActivity extends Activity
         implements SharedPreferences.OnSharedPreferenceChangeListener {
-    public final static String TAG = "SealnoteActivity";
+    public final static String TAG = "NoteListActivity";
 
     private DrawerLayout mDrawerLayout;
     private ActionBarDrawerToggle mDrawerToggle;
@@ -53,7 +51,7 @@ public class SealnoteActivity extends Activity
     private int mTagId;
     private String mTagName;
 
-    private SealnoteFragment mSealnoteFragment;
+    private NoteListFragment mNoteListFragment;
     private boolean mReloadFragment = false;
 
     /**
@@ -64,7 +62,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.d(TAG, "Creating main activity...");
 
-        if (SealnoteApplication.getDatabase().getPassword() == null) {
+        if (SealNotePlusApplication.getDatabase().getPassword() == null) {
             // onResume will follow up which will start PasswordActivity and setup database password
             Log.d(TAG, "Password can't be found while creating activity. Start PasswordActivity");
             return;
@@ -117,23 +115,23 @@ private void loadNotesView() {
 
         switch (type) {
             case VIEW_TILES:
-                mSealnoteFragment = new StaggeredGridFragment();
+                mNoteListFragment = new StaggeredGridFragment();
                 break;
             case VIEW_COLUMN:
-                mSealnoteFragment = new StaggeredGridFragment();
+                mNoteListFragment = new StaggeredGridFragment();
                 break;
             case VIEW_SIMPLE_LIST:
-                mSealnoteFragment = new SimpleListFragment();
+                mNoteListFragment = new SimpleListFragment();
                 break;
         }
 
         Bundle bundle = new Bundle();
         bundle.putString("SN_FOLDER", mCurrentFolder.name());
         bundle.putInt("SN_TAGID", mTagId);
-        mSealnoteFragment.setArguments(bundle);
+        mNoteListFragment.setArguments(bundle);
 
         FragmentTransaction transaction = getFragmentManager().beginTransaction();
-        transaction.replace(R.id.fragment_container, mSealnoteFragment);
+        transaction.replace(R.id.fragment_container, mNoteListFragment);
         transaction.commit();
     }
 
@@ -159,7 +157,7 @@ private void initNavigationDrawer() {
             public void onDrawerClosed(View view) {
                 super.onDrawerClosed(view);
                 if (mReloadFragment) {
-                    mSealnoteFragment.setFolder(mCurrentFolder,  mTagId);
+                    mNoteListFragment.setFolder(mCurrentFolder,  mTagId);
                     getActionBar().setTitle(mTagName);
                     mReloadFragment = false;
                 }
@@ -254,7 +252,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int pos, long id)
     }
 
     private void reloadTagsAdapter() {
-        DatabaseHandler handler = SealnoteApplication.getDatabase();
+        DatabaseHandler handler = SealNotePlusApplication.getDatabase();
         mTags = handler.getAllTags();
         Set<String> tagSet = mTags.keySet();
         String []tags = mTags.keySet().toArray(new String[tagSet.size()]);
@@ -396,10 +394,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 onCreateNoteClick(null);
                 return true;
             case R.id.action_new_note_card:
-                NoteActivity.startForNoteId(SealnoteActivity.this, -1, Note.Type.TYPE_CARD);
+                NoteActivity.startForNoteId(NoteListActivity.this, -1, Note.Type.TYPE_CARD);
                 return true;
             case R.id.action_new_note_login:
-                NoteActivity.startForNoteId(SealnoteActivity.this, -1, Note.Type.TYPE_LOGIN);
+                NoteActivity.startForNoteId(NoteListActivity.this, -1, Note.Type.TYPE_LOGIN);
                 return true;
             case R.id.action_edit_tags:
                 showEditTagsDialog();
@@ -443,7 +441,7 @@ private void showEditTagsDialog() {
      * Called when any create new button/action is clicked.
      */
     public void onCreateNoteClick(View view) {
-        NoteActivity.startForNoteId(SealnoteActivity.this, -1, null);
+        NoteActivity.startForNoteId(NoteListActivity.this, -1, null);
     }
 
     /**
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/PasswordActivity.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/PasswordActivity.java
index 94a97d8..bae8403 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/PasswordActivity.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/PasswordActivity.java
@@ -14,8 +14,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.hawknetwork.sealnoteplus.R;
-
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 import org.hawknetwork.sealnoteplus.utils.TimeoutHandler;
 import org.hawknetwork.sealnoteplus.view.PasswordInput;
@@ -150,10 +148,10 @@ private class LoginTask extends AsyncTask<String, Void, Boolean> {
          * @return      true is successfully created/login to encrypted database
          */
         protected Boolean doInBackground(String... args) {
-            DatabaseHandler handler = SealnoteApplication.getDatabase();
+            DatabaseHandler handler = SealNotePlusApplication.getDatabase();
             handler.recycle();
             try {
-                SealnoteApplication.getDatabase().setPassword(args[0]);
+                SealNotePlusApplication.getDatabase().setPassword(args[0]);
                 handler.update();
             } catch (SQLiteException e) {
                 // Most likely wrong password provided
@@ -173,7 +171,7 @@ protected void onPostExecute(Boolean result) {
                 // clear all timers if any to avoid bouncing back here from activity
                 TimeoutHandler.instance().passwordTimeoutClear();
 
-                Intent intent = new Intent(PasswordActivity.this, SealnoteActivity.class);
+                Intent intent = new Intent(PasswordActivity.this, NoteListActivity.class);
                 PasswordActivity.this.startActivity(intent);
                 PasswordActivity.this.finish();
             } else {
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/SealnoteApplication.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/SealNotePlusApplication.java
similarity index 89%
rename from SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/SealnoteApplication.java
rename to SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/SealNotePlusApplication.java
index a3a45f8..1a9cb7d 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/SealnoteApplication.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/SealNotePlusApplication.java
@@ -7,8 +7,8 @@
 
 import java.lang.reflect.Field;
 
-public class SealnoteApplication extends Application {
-    public final static String TAG = "SealnoteApplication";
+public class SealNotePlusApplication extends Application {
+    public final static String TAG = "SealNotePlusApplication";
 
     private static DatabaseHandler mDatabase;
 
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/TagsEditorActivity.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/TagsEditorActivity.java
index ddcfebc..b11807b 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/TagsEditorActivity.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/TagsEditorActivity.java
@@ -11,8 +11,6 @@
 import android.view.ViewGroup;
 import android.widget.*;
 
-import org.hawknetwork.sealnoteplus.R;
-
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 import org.hawknetwork.sealnoteplus.utils.Misc;
 import org.hawknetwork.sealnoteplus.utils.TimeoutHandler;
@@ -36,7 +34,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Misc.secureWindow(this);
 
-        mHandler = SealnoteApplication.getDatabase();
+        mHandler = SealNotePlusApplication.getDatabase();
         mTagMap = mHandler.getAllTags();
         mTagCount = mHandler.getAllTagsCount();
         mAdapterData = new ArrayList<String>(mTagMap.keySet());
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/AdapterLoader.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/AdapterLoader.java
index ab8e85b..af1ad65 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/AdapterLoader.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/AdapterLoader.java
@@ -4,8 +4,8 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.util.Log;
-import org.hawknetwork.sealnoteplus.SealnoteApplication;
-import org.hawknetwork.sealnoteplus.fragment.SealnoteFragment;
+import org.hawknetwork.sealnoteplus.SealNotePlusApplication;
+import org.hawknetwork.sealnoteplus.fragment.NoteListFragment;
 
 /**
  * Loader for loading notes in Adapter
@@ -20,9 +20,9 @@ public class AdapterLoader extends AsyncTaskLoader<Cursor> {
      */
     @Override
     public Cursor loadInBackground() {
-        Log.d(SealnoteFragment.TAG, "Adapter loader started!");
+        Log.d(NoteListFragment.TAG, "Adapter loader started!");
 
-        final DatabaseHandler db = SealnoteApplication.getDatabase();
+        final DatabaseHandler db = SealNotePlusApplication.getDatabase();
         final Cursor cursor;
 
         switch (currentFolder) {
@@ -47,7 +47,7 @@ public Cursor loadInBackground() {
 
     public AdapterLoader(Context context, Note.Folder currentFolder, int tagid) {
         super(context);
-        Log.d(SealnoteFragment.TAG, "New adapter loader created");
+        Log.d(NoteListFragment.TAG, "New adapter loader created");
         this.currentFolder = currentFolder;
         this.tagid = tagid;
     }
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/Note.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/Note.java
index c9008ca..5b3917b 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/Note.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/Note.java
@@ -3,7 +3,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.Log;
-import org.hawknetwork.sealnoteplus.SealnoteApplication;
+import org.hawknetwork.sealnoteplus.SealNotePlusApplication;
 import org.hawknetwork.sealnoteplus.utils.EasyDate;
 
 import java.text.ParseException;
@@ -234,7 +234,7 @@ public void setTags(Set<String> tagSet) {
      * tags from database and return them. Use getTags() later
      */
     public Set<String> loadGetTags() {
-        final DatabaseHandler handler = SealnoteApplication.getDatabase();
+        final DatabaseHandler handler = SealNotePlusApplication.getDatabase();
         mTags = handler.getNoteTags(mId);
         return mTags;
     }
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/SealnoteAdapter.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/NoteListAdapter.java
similarity index 85%
rename from SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/SealnoteAdapter.java
rename to SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/NoteListAdapter.java
index 065412d..7704187 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/SealnoteAdapter.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/data/NoteListAdapter.java
@@ -3,7 +3,7 @@
 import android.database.Cursor;
 import android.widget.ListAdapter;
 
-public interface SealnoteAdapter extends ListAdapter {
+public interface NoteListAdapter extends ListAdapter {
     public Cursor   getCursor();
     public void     clearCursor();
     public void     changeCursor(Cursor cursor);
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/fragment/SealnoteFragment.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/fragment/NoteListFragment.java
similarity index 94%
rename from SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/fragment/SealnoteFragment.java
rename to SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/fragment/NoteListFragment.java
index b8c413e..c60e980 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/fragment/SealnoteFragment.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/fragment/NoteListFragment.java
@@ -17,20 +17,20 @@
 import org.hawknetwork.sealnoteplus.R;
 import org.hawknetwork.sealnoteplus.data.AdapterLoader;
 import org.hawknetwork.sealnoteplus.data.Note;
-import org.hawknetwork.sealnoteplus.data.SealnoteAdapter;
+import org.hawknetwork.sealnoteplus.data.NoteListAdapter;
 import org.hawknetwork.sealnoteplus.utils.Misc;
 
 /**
  * Main fragment where all cards are listed in a staggered grid
  */
-abstract public class SealnoteFragment extends Fragment implements
+abstract public class NoteListFragment extends Fragment implements
         LoaderManager.LoaderCallbacks<Cursor> {
-    public final static String TAG = "SealnoteFragment";
+    public final static String TAG = "NoteListFragment";
 
     /**
      * Adapter used by Staggered Grid View to display note cards
      */
-    protected SealnoteAdapter mAdapter;
+    protected NoteListAdapter mAdapter;
     protected AdapterView mAdapterView;
     protected Note.Folder mCurrentFolder;
     protected int mCurrentTag;
@@ -54,7 +54,7 @@ abstract public class SealnoteFragment extends Fragment implements
     /**
      * Abstract method that should return the adapter for the view
      */
-    abstract protected SealnoteAdapter createAdapter();
+    abstract protected NoteListAdapter createAdapter();
 
     /**
      * Abstract method that should load given cursor to adapter and
@@ -78,7 +78,7 @@ abstract public class SealnoteFragment extends Fragment implements
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Log.d(TAG, "Creating SealNote fragment...");
+        Log.d(TAG, "Creating note list fragment...");
 
         if (!Misc.isPasswordLoaded()){
             Misc.startPasswordActivity(getActivity());
@@ -121,7 +121,7 @@ public void onInvalidated() {
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View fragmentView = inflater.inflate(R.layout.fragment_sealnote, container, false);
+        View fragmentView = inflater.inflate(R.layout.fragment_note_list, container, false);
 
         mEmptyGridLayout = fragmentView.findViewById(R.id.layout_empty_grid);
         mEmptyGeneric = (TextView) fragmentView.findViewById(R.id.empty_folder_generic);
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/MultiChoiceCallback.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/MultiChoiceCallback.java
index 9342384..f484431 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/MultiChoiceCallback.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/MultiChoiceCallback.java
@@ -9,7 +9,7 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import org.hawknetwork.sealnoteplus.R;
-import org.hawknetwork.sealnoteplus.SealnoteApplication;
+import org.hawknetwork.sealnoteplus.SealNotePlusApplication;
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 import org.hawknetwork.sealnoteplus.data.Note;
 
@@ -172,7 +172,7 @@ protected void onPreExecute() {
              */
             @Override
             protected Void doInBackground(SparseBooleanArray... sparseBooleanArrays) {
-                DatabaseHandler db = SealnoteApplication.getDatabase();
+                DatabaseHandler db = SealNotePlusApplication.getDatabase();
                 SparseBooleanArray mCheckedIds = sparseBooleanArrays[0];
 
                 for (int i = 0; i < mCheckedIds.size(); i++) {
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/SealnoteCard.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/StaggeredGridCard.java
similarity index 90%
rename from SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/SealnoteCard.java
rename to SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/StaggeredGridCard.java
index 1c998c7..5721316 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/SealnoteCard.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/internal/StaggeredGridCard.java
@@ -15,12 +15,12 @@
 
 
 /**
- * CardHeader for SealNote Card. Just changes typeface of header title.
+ * CardHeader for StaggeredGridCard. Just changes typeface of header title.
  * Not using XML for API Level 14 compatibility
  */
-class SealnoteCardHeader extends CardHeader {
-    public static final String TAG = "SealnoteCardHeader";
-    public SealnoteCardHeader(Context context) {
+class StaggeredGridCardHeader extends CardHeader {
+    public static final String TAG = "StaggeredGridCardHeader";
+    public StaggeredGridCardHeader(Context context) {
         super(context);
     }
 
@@ -41,21 +41,21 @@ public void setupInnerViewElements(ViewGroup parent, View view) {
  * Extends Card to glue with Note class. Uses Note for card content,
  * and adds note background to Card.
  */
-public class SealnoteCard extends Card {
-    public static final String TAG = "SealnoteCard";
+public class StaggeredGridCard extends Card {
+    public static final String TAG = "StaggeredGridCard";
 
     protected Note mNote;
 
-    public SealnoteCard(Context context) {
+    public StaggeredGridCard(Context context) {
         super(context, R.layout.cardcontent);
     }
 
     /**
-     * Takes a note, create a SealnoteCard and initialize it.
+     * Takes a note, create a StaggeredGridCard and initialize it.
      * @param context   Context to use
      * @param note      Note to attach with card
      */
-    public SealnoteCard(Context context, Note note) {
+    public StaggeredGridCard(Context context, Note note) {
         super(context, R.layout.cardcontent);
         setNote(note);
         init();
@@ -68,7 +68,7 @@ public void init() {
         this.setCheckable(true);
 
         if (mNote != null && !mNote.getTitle().equals("")) {
-            CardHeader header = new SealnoteCardHeader(getContext());
+            CardHeader header = new StaggeredGridCardHeader(getContext());
             header.setTitle(mNote.getTitle());
             addCardHeader(header);
         }
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/settings/PasswordPreference.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/settings/PasswordPreference.java
index 85000f4..d5ea1c3 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/settings/PasswordPreference.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/settings/PasswordPreference.java
@@ -15,7 +15,7 @@
 import android.widget.EditText;
 import android.widget.Toast;
 import org.hawknetwork.sealnoteplus.R;
-import org.hawknetwork.sealnoteplus.SealnoteApplication;
+import org.hawknetwork.sealnoteplus.SealNotePlusApplication;
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 import org.hawknetwork.sealnoteplus.view.PasswordInput;
 import net.sqlcipher.database.SQLiteException;
@@ -160,7 +160,7 @@ private void updateChangeButtonState() {
      * @return              True if password changed successfully, else false
      */
     private boolean changePassword(String oldDbPassword, String oldPassword, String newPassword) {
-        DatabaseHandler db = SealnoteApplication.getDatabase();
+        DatabaseHandler db = SealNotePlusApplication.getDatabase();
 
         // Recycle old password, set new one and check if given old password
         // is correct
@@ -187,7 +187,7 @@ private boolean changePassword(String oldDbPassword, String oldPassword, String
 
         // Recycle old password and state, and set new password in handler
         db.recycle();
-        SealnoteApplication.getDatabase().setPassword(newPassword);
+        SealNotePlusApplication.getDatabase().setPassword(newPassword);
         db.update();
 
         return true;
@@ -209,7 +209,7 @@ protected void onPreExecute() {
             mChangeButton.setEnabled(false);
             mChangeButton.setText(R.string.please_wait);
 
-            DatabaseHandler db = SealnoteApplication.getDatabase();
+            DatabaseHandler db = SealNotePlusApplication.getDatabase();
             oldDbPassword = db.getPassword();
             oldPassword = mOldView.getText().toString();
             newPassword = mNewView.getText();
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/storage/BackupUtils.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/storage/BackupUtils.java
index 598873b..139712b 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/storage/BackupUtils.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/storage/BackupUtils.java
@@ -4,7 +4,7 @@
 import android.os.AsyncTask;
 import android.os.Environment;
 import android.util.Log;
-import org.hawknetwork.sealnoteplus.SealnoteApplication;
+import org.hawknetwork.sealnoteplus.SealNotePlusApplication;
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 import net.sqlcipher.database.SQLiteDatabase;
 import net.sqlcipher.database.SQLiteException;
@@ -77,7 +77,7 @@ public static File backupDatabase(Context context) throws IOException {
      * Restores give database as new database
      */
     public static File restoreDatabase(Context context, File file) throws IOException {
-        DatabaseHandler dbHandler = SealnoteApplication.getDatabase();
+        DatabaseHandler dbHandler = SealNotePlusApplication.getDatabase();
         dbHandler.close();
         dbHandler.recycle();
 
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/Misc.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/Misc.java
index 336d502..5a98a99 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/Misc.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/Misc.java
@@ -8,7 +8,7 @@
 import android.view.WindowManager;
 import org.hawknetwork.sealnoteplus.PasswordActivity;
 import org.hawknetwork.sealnoteplus.R;
-import org.hawknetwork.sealnoteplus.SealnoteApplication;
+import org.hawknetwork.sealnoteplus.SealNotePlusApplication;
 
 /**
  * Miscellaneous helper functions
@@ -71,7 +71,7 @@ public static void secureWindow(Activity activity) {
     }
 
     public static boolean isPasswordLoaded() {
-        return SealnoteApplication.getDatabase().getPassword() != null;
+        return SealNotePlusApplication.getDatabase().getPassword() != null;
     }
 
     public static void startPasswordActivity(Activity activity) {
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/PreferenceHandler.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/PreferenceHandler.java
index 4a70d87..e4871b2 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/PreferenceHandler.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/PreferenceHandler.java
@@ -5,7 +5,7 @@
 import android.preference.PreferenceManager;
 
 /**
- * Helper class to easily access preference values used by SealNote.
+ * Helper class to easily access preference values used by SealNote Plus.
  */
 public class PreferenceHandler {
     public final static String TAG = "PreferenceHandler";
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/TimeoutHandler.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/TimeoutHandler.java
index cb34d59..2150af5 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/TimeoutHandler.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/utils/TimeoutHandler.java
@@ -5,7 +5,7 @@
 import android.os.Handler;
 import android.util.Log;
 import org.hawknetwork.sealnoteplus.PasswordActivity;
-import org.hawknetwork.sealnoteplus.SealnoteApplication;
+import org.hawknetwork.sealnoteplus.SealNotePlusApplication;
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 
 /**
@@ -51,7 +51,7 @@ public static TimeoutHandler instance() {
      */
     @Override
     public void run() {
-        DatabaseHandler db = SealnoteApplication.getDatabase();
+        DatabaseHandler db = SealNotePlusApplication.getDatabase();
         db.recycle();
         mTimedOut = true;
     }
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/simplelist/SimpleListAdapter.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/simplelist/SimpleListAdapter.java
index ad8fec0..ffe2def 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/simplelist/SimpleListAdapter.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/simplelist/SimpleListAdapter.java
@@ -11,7 +11,7 @@
 import org.hawknetwork.sealnoteplus.R;
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 import org.hawknetwork.sealnoteplus.data.Note;
-import org.hawknetwork.sealnoteplus.data.SealnoteAdapter;
+import org.hawknetwork.sealnoteplus.data.NoteListAdapter;
 import org.hawknetwork.sealnoteplus.utils.EasyDate;
 import org.hawknetwork.sealnoteplus.utils.FontCache;
 import org.hawknetwork.sealnoteplus.utils.Misc;
@@ -22,7 +22,7 @@
 /**
  * Adapter for SimpleListView.
  */
-public class SimpleListAdapter extends SimpleCursorAdapter implements SealnoteAdapter {
+public class SimpleListAdapter extends SimpleCursorAdapter implements NoteListAdapter {
     public final static String TAG = "SimpleListAdapter";
 
     public SimpleListAdapter(Context context, Cursor cursor) {
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/simplelist/SimpleListFragment.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/simplelist/SimpleListFragment.java
index 687a173..0291c10 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/simplelist/SimpleListFragment.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/simplelist/SimpleListFragment.java
@@ -17,13 +17,13 @@
 import org.hawknetwork.sealnoteplus.NoteActivity;
 import org.hawknetwork.sealnoteplus.R;
 import org.hawknetwork.sealnoteplus.data.Note;
-import org.hawknetwork.sealnoteplus.data.SealnoteAdapter;
-import org.hawknetwork.sealnoteplus.fragment.SealnoteFragment;
+import org.hawknetwork.sealnoteplus.data.NoteListAdapter;
+import org.hawknetwork.sealnoteplus.fragment.NoteListFragment;
 
 /**
  * Fragment where all cards are listed in a simple List View
  */
-public class SimpleListFragment extends SealnoteFragment implements AdapterView.OnItemClickListener {
+public class SimpleListFragment extends NoteListFragment implements AdapterView.OnItemClickListener {
     public final static String TAG = "SimpleListFragment";
     private final MultiChoiceCallback mMultiChoiceCallback = new MultiChoiceCallback();
 
@@ -51,7 +51,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
      * Create and return adapter
      */
     @Override
-    protected SealnoteAdapter createAdapter() {
+    protected NoteListAdapter createAdapter() {
         if (mAdapter == null) {
             mAdapter = new SimpleListAdapter(getActivity(), null);
         }
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridAdapter.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridAdapter.java
index 30ca2a4..90b928c 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridAdapter.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridAdapter.java
@@ -12,18 +12,18 @@
 import org.hawknetwork.sealnoteplus.data.CardGridStaggeredCursorAdapter;
 import org.hawknetwork.sealnoteplus.data.DatabaseHandler;
 import org.hawknetwork.sealnoteplus.data.Note;
-import org.hawknetwork.sealnoteplus.data.SealnoteAdapter;
-import org.hawknetwork.sealnoteplus.internal.SealnoteCard;
+import org.hawknetwork.sealnoteplus.data.NoteListAdapter;
+import org.hawknetwork.sealnoteplus.internal.StaggeredGridCard;
 
 import it.gmariotti.cardslib.library.internal.Card;
 import it.gmariotti.cardslib.library.view.CardView;
 
 /**
- * Adapter for SealnoteStaggeredGrid. Initialized cards and their event listeners. Since
+ * Adapter for SealNote Plus's StaggeredGrid. Initialized cards and their event listeners. Since
  * StaggeredGrid doesn't have multi-choice mode enabled, we emulate this by adding
  * appropriate listeners to card and maintaining the CAB multi-choice state.
  */
-public class StaggeredGridAdapter extends CardGridStaggeredCursorAdapter implements SealnoteAdapter {
+public class StaggeredGridAdapter extends CardGridStaggeredCursorAdapter implements NoteListAdapter {
     public final static String TAG = "StaggeredGridAdapter";
 
     private Note.Folder mCurrentFolder;
@@ -62,11 +62,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
      * Called by adapter to convert first row in cursor to Card.
      *
      * @param cursor    Cursor to be converted to note
-     * @return          SealnoteCard object initialized with CAB listeners and data
+     * @return          StaggeredGridCard object initialized with CAB listeners and data
      */
     @Override
     protected Card getCardFromCursor(Cursor cursor) {
-        SealnoteCard card = new SealnoteCard(super.getContext());
+        StaggeredGridCard card = new StaggeredGridCard(super.getContext());
         Note note = DatabaseHandler.cursorToNote(cursor);
 
         card.setNote(note);
@@ -93,7 +93,7 @@ protected void initCardListeners(Card card) {
              */
             @Override
             public void onClick(Card card, View view) {
-                SealnoteCard sCard = (SealnoteCard) card;
+                StaggeredGridCard sCard = (StaggeredGridCard) card;
                 if (mMultiChoiceCallback == null || !mMultiChoiceCallback.isActionModeActive()) {
                     NoteActivity.startForNoteId(getContext(), sCard.getNote().getId(), null);
                 } else {
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridFragment.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridFragment.java
index ebfcfec..3bb3736 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridFragment.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridFragment.java
@@ -7,21 +7,21 @@
 import com.nhaarman.listviewanimations.swinginadapters.AnimationAdapter;
 import com.nhaarman.listviewanimations.swinginadapters.prepared.ScaleInAnimationAdapter;
 import org.hawknetwork.sealnoteplus.R;
-import org.hawknetwork.sealnoteplus.data.SealnoteAdapter;
-import org.hawknetwork.sealnoteplus.fragment.SealnoteFragment;
+import org.hawknetwork.sealnoteplus.data.NoteListAdapter;
+import org.hawknetwork.sealnoteplus.fragment.NoteListFragment;
 import org.hawknetwork.sealnoteplus.utils.PreferenceHandler;
 
 /**
  * Fragment where all cards are listed in a staggered grid
  */
-public class StaggeredGridFragment extends SealnoteFragment {
+public class StaggeredGridFragment extends NoteListFragment {
     public final static String TAG = "StaggeredGridFragment";
 
     /**
      * Create and return adapter
      */
     @Override
-    protected SealnoteAdapter createAdapter() {
+    protected NoteListAdapter createAdapter() {
         if (mAdapter == null) {
             mAdapter = new StaggeredGridAdapter(getActivity(), null);
         }
diff --git a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridView.java b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridView.java
index 123260b..68b9511 100644
--- a/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridView.java
+++ b/SealNotePlusApp/src/main/java/org/hawknetwork/sealnoteplus/view/staggeredgrid/StaggeredGridView.java
@@ -9,11 +9,11 @@
 import it.gmariotti.cardslib.library.extra.staggeredgrid.view.CardGridStaggeredView;
 
 /**
- * Specialized CardGridStaggeredView class used in SealNote.
+ * Specialized CardGridStaggeredView class used in SealNote Plus.
  *
  *   + Add support for cursor adapter
- *   + Changes to make column mode change as per latest Sealnote settings
- *     preferences
+ *   + Changes to make column mode change as per latest SealNote Plus settings
+ *     (preferences)
  */
 public class StaggeredGridView extends CardGridStaggeredView {
     public final static String TAG = "StaggeredGridView";
diff --git a/SealNotePlusApp/src/main/res/layout/fragment_sealnote.xml b/SealNotePlusApp/src/main/res/layout/fragment_note_list.xml
similarity index 91%
rename from SealNotePlusApp/src/main/res/layout/fragment_sealnote.xml
rename to SealNotePlusApp/src/main/res/layout/fragment_note_list.xml
index 969e8bd..a7d9742 100644
--- a/SealNotePlusApp/src/main/res/layout/fragment_sealnote.xml
+++ b/SealNotePlusApp/src/main/res/layout/fragment_note_list.xml
@@ -5,10 +5,10 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="@dimen/sealnote_activity_vertical_margin"
-        android:paddingBottom="@dimen/sealnote_activity_vertical_margin"
-        android:paddingLeft="@dimen/sealnote_activity_horizontal_margin"
-        android:paddingRight="@dimen/sealnote_activity_horizontal_margin"
+        android:paddingTop="@dimen/note_list_activity_vertical_margin"
+        android:paddingBottom="@dimen/note_list_activity_vertical_margin"
+        android:paddingLeft="@dimen/note_list_activity_horizontal_margin"
+        android:paddingRight="@dimen/note_list_activity_horizontal_margin"
         android:background="@color/light_gray"
         >
     <!-- Progress View -->
diff --git a/SealNotePlusApp/src/main/res/layout/simplelist.xml b/SealNotePlusApp/src/main/res/layout/simplelist.xml
index d7915d0..45adcd3 100644
--- a/SealNotePlusApp/src/main/res/layout/simplelist.xml
+++ b/SealNotePlusApp/src/main/res/layout/simplelist.xml
@@ -11,5 +11,5 @@
           android:choiceMode="multipleChoiceModal"
           android:background="@android:color/white"
           android:clipToPadding="false"
-          style="@style/Sealnote.Theme.Main.SimpleListView"
+          style="@style/SealNotePlus.Theme.Main.SimpleListView"
         />
diff --git a/SealNotePlusApp/src/main/res/menu/context_menu.xml b/SealNotePlusApp/src/main/res/menu/context_menu.xml
index b8a5057..2137349 100644
--- a/SealNotePlusApp/src/main/res/menu/context_menu.xml
+++ b/SealNotePlusApp/src/main/res/menu/context_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-    Contexual Action Bar shown on SealNote Activity during multi-choice mode
+    Contexual Action Bar shown on Note List Activity during multi-choice mode
 -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
diff --git a/SealNotePlusApp/src/main/res/menu/main_activity_actionbar.xml b/SealNotePlusApp/src/main/res/menu/main_activity_actionbar.xml
index 9f8c270..4832709 100644
--- a/SealNotePlusApp/src/main/res/menu/main_activity_actionbar.xml
+++ b/SealNotePlusApp/src/main/res/menu/main_activity_actionbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-    Action Bar for SealnoteActivity
+    Action Bar for NoteListActivity
 -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/SealNotePlusApp/src/main/res/values-de/strings.xml b/SealNotePlusApp/src/main/res/values-de/strings.xml
index 30e07ca..d4fdf59 100644
--- a/SealNotePlusApp/src/main/res/values-de/strings.xml
+++ b/SealNotePlusApp/src/main/res/values-de/strings.xml
@@ -5,7 +5,7 @@
     <string name="short_app_name">SealNote+</string>
     <string name="full_app_name">SealNote Plus</string>
     <string name="app_description">Die Absicht ist einfach. Eine schnelle, einfache und <b>sichere</b> Notizanwendung anzubieten. Ihre Notizen werden verschlüsselt unter Verwendung eines starken 256-bit AES Algorithmus. Sie müssen nicht länger besorgt sein, daß böswillige Leute sich Zugang zu Ihren privaten Notizen verschaffen.</string>
-    <string name="app_credits"><b>TwistedPlane:</b>\nwww.twistedplane.com\ncontact@twistedplane.com"\n<b>Contributors:</b>\nhttps://github.com/vishesh/sealnote/graphs/contributors</string>
+    <string name="app_credits"><b>GitHub:</b>https://github.com/hawknetwork/sealnote-plus\n<b>Contributors:</b>\nhttps://github.com/hawknetwork/sealnote-plus/graphs/contributors</string>
 
     <!-- Activities -->
     <string name="title_activity_note">" "</string>
@@ -131,7 +131,7 @@
     <string name="info_restore_message">
         <![CDATA[
         Bitte öffnen Sie <font color="#cc0000">verschlüsselte Backup</font> Datei, erstellt
-        von <font color="#259b24">SealNote backup</font>.
+        von <font color="#259b24">SealNote Plus backup</font>.
         ]]>
     </string>
 
diff --git a/SealNotePlusApp/src/main/res/values-it/strings.xml b/SealNotePlusApp/src/main/res/values-it/strings.xml
index 9600fe8..e63330c 100644
--- a/SealNotePlusApp/src/main/res/values-it/strings.xml
+++ b/SealNotePlusApp/src/main/res/values-it/strings.xml
@@ -5,7 +5,7 @@
     <string name="short_app_name">SealNote+</string>
     <string name="full_app_name">SealNote Plus</string>
     <string name="app_description">L\'obiettivo è semplice: fornire un editor di note rapido, semplice e <b>sicuro</b>. Le note vengono crittografate tramite il solido algoritmo AES a 256 bit. Non dovrai più preoccuparti che informazioni riservate finiscano nelle mani sbagliate.</string>
-    <string name="app_credits"><b>TwistedPlane:</b>\nwww.twistedplane.com\ncontact@twistedplane.com"\n<b>Hanno contribuito:</b>\nhttps://github.com/vishesh/sealnote/graphs/contributors</string>
+    <string name="app_credits"><b>GitHub:</b>https://github.com/hawknetwork/sealnote-plus\n<b>Hanno contribuito:</b>\nhttps://github.com/hawknetwork/sealnote-plus/graphs/contributors</string>
 
     <!-- Activities -->
     <string name="title_activity_note">" "</string>
@@ -130,7 +130,7 @@
 
     <string name="info_restore_message">
         <![CDATA[
-        Seleziona il <font color="#cc0000">file di backup crittografato</font> creato da SealNote durante il <font color="#259b24">backup</font>.
+        Seleziona il <font color="#cc0000">file di backup crittografato</font> creato da SealNote Plus durante il <font color="#259b24">backup</font>.
         ]]>
     </string>
 
diff --git a/SealNotePlusApp/src/main/res/values-ja/strings.xml b/SealNotePlusApp/src/main/res/values-ja/strings.xml
index 7385350..e224419 100644
--- a/SealNotePlusApp/src/main/res/values-ja/strings.xml
+++ b/SealNotePlusApp/src/main/res/values-ja/strings.xml
@@ -5,7 +5,7 @@
     <string name="short_app_name">SealNote+</string>
     <string name="full_app_name">SealNote Plus</string>
     <string name="app_description">目的は簡単です。 すばやく簡単に <b>安全な</b> メモ帳を提供します。 あなたのメモ帳は、強力な256ビットAESアルゴリズムを使用して暗号化されています。 悪意のある人々によってあなたの個人情報を失う心配がなくなりました。</string>
-    <string name="app_credits"><b>TwistedPlane:</b>\nwww.twistedplane.com\ncontact@twistedplane.com"\n<b>貢献者:</b>\nhttps://github.com/vishesh/sealnote/graphs/contributors</string>
+    <string name="app_credits"><b>GitHub:</b>https://github.com/hawknetwork/sealnote-plus\n<b>貢献者:</b>\nhttps://github.com/hawknetwork/sealnote-plus/graphs/contributors</string>
 
     <!-- Activities -->
     <string name="title_activity_note">" "</string>
@@ -129,7 +129,7 @@
 
     <string name="info_restore_message">
         <![CDATA[
-        <font color="#259b24">SealNote バックアップ</font> によって作成された
+        <font color="#259b24">SealNote Plus バックアップ</font> によって作成された
         <font color="#cc0000">暗号化されたバックアップ</font> ファイルを開いてください。
         ]]>
     </string>
diff --git a/SealNotePlusApp/src/main/res/values-ru/strings.xml b/SealNotePlusApp/src/main/res/values-ru/strings.xml
index fd68cf0..62992d1 100644
--- a/SealNotePlusApp/src/main/res/values-ru/strings.xml
+++ b/SealNotePlusApp/src/main/res/values-ru/strings.xml
@@ -5,11 +5,7 @@
     <string name="short_app_name">SealNote</string>
     <string name="full_app_name">SealNote</string>
     <string name="app_description">Цель проста - создать быстрый, простой и &lt;b &gt;надёжный&lt;/b блокнот. Ваши заметки шифруются стойким 256-битным алгоритмом AES. Больше не стоит волноваться о краже данных злоумышленниками.</string>
-    <string name="app_credits"><b >TwistedPlane:</b>\n
-  www.twistedplane.com\n
-  contact@twistedplane.com\"\n
-  <b >Помощники:</b>\n
-  https://github.com/vishesh/sealnote/graphs/contributors</string>
+    <string name="app_credits"><b>GitHub:</b>https://github.com/hawknetwork/sealnote-plus\n<b>Помощники:</b>\nhttps://github.com/hawknetwork/sealnote-plus/graphs/contributors</string>
 
     <!-- Activities -->
     <string name="title_activity_note">« »</string>
@@ -134,7 +130,7 @@
 
     <string name="info_restore_message">
         <![CDATA[
-        Откройте <font color="#cc0000">зашифрованную резервную копию</font> <font color="#259b24">SealNote</font>.
+        Откройте <font color="#cc0000">зашифрованную резервную копию</font> <font color="#259b24">SealNote Plus</font>.
         ]]>
     </string>
 
diff --git a/SealNotePlusApp/src/main/res/values/dimens.xml b/SealNotePlusApp/src/main/res/values/dimens.xml
index 8f9c7fd..ac5ea3d 100644
--- a/SealNotePlusApp/src/main/res/values/dimens.xml
+++ b/SealNotePlusApp/src/main/res/values/dimens.xml
@@ -9,8 +9,8 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 
-    <dimen name="sealnote_activity_horizontal_margin">2dp</dimen>
-    <dimen name="sealnote_activity_vertical_margin">0dp</dimen>
+    <dimen name="note_list_activity_horizontal_margin">2dp</dimen>
+    <dimen name="note_list_activity_vertical_margin">0dp</dimen>
 
     <!--
                     Card contents
diff --git a/SealNotePlusApp/src/main/res/values/strings.xml b/SealNotePlusApp/src/main/res/values/strings.xml
index fbfef1a..e0519a1 100644
--- a/SealNotePlusApp/src/main/res/values/strings.xml
+++ b/SealNotePlusApp/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="short_app_name">SealNote+</string>
     <string name="full_app_name">SealNote Plus</string>
     <string name="app_description">Objective is simple. Provide a quick, simple and <b>safe</b> notepad. Your notes are encrypted using strong 256-bit AES algorithm. No longer worry about losing your private information to malicious people.</string>
-    <string name="app_credits"><b>TwistedPlane:</b>\nwww.twistedplane.com\ncontact@twistedplane.com"\n<b>Contributors:</b>\nhttps://github.com/vishesh/sealnote/graphs/contributors</string>
+    <string name="app_credits"><b>GitHub:</b>https://github.com/hawknetwork/sealnote-plus\n<b>Contributors:</b>\nhttps://github.com/hawknetwork/sealnote-plus/graphs/contributors</string>
 
     <!-- Activities -->
     <string name="title_activity_note">" "</string>
@@ -131,7 +131,7 @@
     <string name="info_restore_message">
         <![CDATA[
         Please open the <font color="#cc0000">encrypted backup</font> file that was created
-        by <font color="#259b24">SealNote backup</font>.
+        by <font color="#259b24">SealNote Plus backup</font>.
         ]]>
     </string>
 
diff --git a/SealNotePlusApp/src/main/res/values/styles.xml b/SealNotePlusApp/src/main/res/values/styles.xml
index 498a7e6..c395f6f 100644
--- a/SealNotePlusApp/src/main/res/values/styles.xml
+++ b/SealNotePlusApp/src/main/res/values/styles.xml
@@ -7,53 +7,53 @@
 <resources>
 
     <!-- Base activity theme. -->
-    <style name="Sealnote.Theme.Main" parent="android:Theme.Holo.Light">
-        <item name="android:actionBarStyle">@style/Sealnote.Theme.Main.ActionBar</item>
+    <style name="SealNotePlus.Theme.Main" parent="android:Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/SealNotePlus.Theme.Main.ActionBar</item>
         <item name="android:actionBarItemBackground">@drawable/actionbar_item_selector</item>
-        <item name="android:actionOverflowButtonStyle">@style/Sealnote.Theme.Main.ActionBar.Overflow</item>
+        <item name="android:actionOverflowButtonStyle">@style/SealNotePlus.Theme.Main.ActionBar.Overflow</item>
     </style>
 
-    <style name="Sealnote.Theme.Main.ActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
+    <style name="SealNotePlus.Theme.Main.ActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
         <item name="android:background">@drawable/ab_background</item>
-        <item name="android:titleTextStyle">@style/Sealnote.Theme.Main.ActionBar.Title</item>
+        <item name="android:titleTextStyle">@style/SealNotePlus.Theme.Main.ActionBar.Title</item>
         <item name="android:icon">@drawable/ic_home</item>
     </style>
 
-    <style name="Sealnote.Theme.Main.ActionBar.Title" parent="@android:style/Widget.Holo.Light.ActionBar">
+    <style name="SealNotePlus.Theme.Main.ActionBar.Title" parent="@android:style/Widget.Holo.Light.ActionBar">
         <item name="android:textColor">@android:color/white</item>
         <item name="android:textSize">22sp</item>
         <item name="android:fontFamily">sans-serif-condensed</item>
         <item name="android:textStyle">normal</item>
     </style>
 
-    <style name="Sealnote.Theme.Main.ActionBar.Overflow" parent="@android:style/Widget.Holo.Light.ActionButton.Overflow">
+    <style name="SealNotePlus.Theme.Main.ActionBar.Overflow" parent="@android:style/Widget.Holo.Light.ActionButton.Overflow">
         <item name="android:src">@drawable/ic_action_core_overflow</item>
     </style>
 
-    <!-- Sealnote Activity Theme -->
-    <style name="Sealnote.Theme.Sealnote" parent="android:Theme.Holo.Light">
-        <item name="android:actionBarStyle">@style/Sealnote.Theme.Sealnote.ActionBar</item>
+    <!-- Note List Activity Theme -->
+    <style name="SealNotePlus.Theme.NoteList" parent="android:Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/SealNotePlus.Theme.NoteList.ActionBar</item>
         <item name="android:actionBarItemBackground">@drawable/actionbar_item_selector</item>
         <item name="android:windowActionBarOverlay">true</item>
-        <item name="android:actionOverflowButtonStyle">@style/Sealnote.Theme.Main.ActionBar.Overflow</item>
+        <item name="android:actionOverflowButtonStyle">@style/SealNotePlus.Theme.Main.ActionBar.Overflow</item>
     </style>
 
-    <style name="Sealnote.Theme.Sealnote.ActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
+    <style name="SealNotePlus.Theme.NoteList.ActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
         <item name="android:background">@drawable/ab_background</item>
-        <item name="android:titleTextStyle">@style/Sealnote.Theme.Main.ActionBar.Title</item>
+        <item name="android:titleTextStyle">@style/SealNotePlus.Theme.Main.ActionBar.Title</item>
         <item name="android:icon">@drawable/ic_home</item>
     </style>
 
     <!-- Note activity theme. -->
-    <style name="Sealnote.Theme.Note" parent="android:Theme.Holo.Light">
-        <item name="android:actionBarStyle">@style/Sealnote.Theme.Note.ActionBar</item>
+    <style name="SealNotePlus.Theme.Note" parent="android:Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/SealNotePlus.Theme.Note.ActionBar</item>
         <item name="android:actionBarItemBackground">@drawable/actionbar_item_selector</item>
-        <item name="android:actionOverflowButtonStyle">@style/Sealnote.Theme.Main.ActionBar.Overflow</item>
+        <item name="android:actionOverflowButtonStyle">@style/SealNotePlus.Theme.Main.ActionBar.Overflow</item>
         <item name="android:actionMenuTextColor">#bbffffff</item>
         <item name="android:windowActionBarOverlay">true</item>
     </style>
 
-    <style name="Sealnote.Theme.Note.ActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
+    <style name="SealNotePlus.Theme.Note.ActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
         <item name="android:background">#66000000</item>
         <item name="android:icon">@drawable/ic_home</item>
     </style>
@@ -92,7 +92,7 @@
 
 
     <!-- Simple List View Item -->
-    <style name="Sealnote.Theme.Main.SimpleListView" parent="android:Widget.Holo.Light.ListView">
+    <style name="SealNotePlus.Theme.Main.SimpleListView" parent="android:Widget.Holo.Light.ListView">
         <item name="android:listSelector">@drawable/simple_list_view_item_background</item>
         <item name="android:divider">@drawable/simple_list_view_divider</item>
         <item name="android:dividerHeight">1px</item>
diff --git a/SealNotePlusApp/src/main/res/xml/preferences.xml b/SealNotePlusApp/src/main/res/xml/preferences.xml
index 1fcbbd3..bfd77e9 100644
--- a/SealNotePlusApp/src/main/res/xml/preferences.xml
+++ b/SealNotePlusApp/src/main/res/xml/preferences.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-    Preferences for SealNote
+    Preferences for SealNote Plus
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">