diff --git a/src/org/wordpress/android/WordPress.java b/src/org/wordpress/android/WordPress.java
index 2235724c7c42..b230d69e7155 100644
--- a/src/org/wordpress/android/WordPress.java
+++ b/src/org/wordpress/android/WordPress.java
@@ -231,7 +231,7 @@ public static void postUploaded() {
      * select the first one.
      */
     public static Blog getCurrentBlog() {
-        if (currentBlog == null || !wpDB.isDotComAccountVisible(currentBlog.getBlogId())) {
+        if (currentBlog == null || !wpDB.isDotComAccountVisible(currentBlog.getRemoteBlogId())) {
             // attempt to restore the last active blog
             setCurrentBlogToLastActive();
 
@@ -304,12 +304,12 @@ public static Blog setCurrentBlog(int id) {
     /*
      * returns the blogID of the current blog
      */
-    public static int getCurrentBlogId() {
-        return (currentBlog != null ? currentBlog.getBlogId() : -1);
+    public static int getCurrentRemoteBlogId() {
+        return (currentBlog != null ? currentBlog.getRemoteBlogId() : -1);
     }
 
-    public static int getCurrentBlogAccountId() {
-        return (currentBlog != null ? currentBlog.getId() : -1);
+    public static int getCurrentLocalTableBlogId() {
+        return (currentBlog != null ? currentBlog.getLocalTableBlogId() : -1);
     }
 
     /**
diff --git a/src/org/wordpress/android/WordPressDB.java b/src/org/wordpress/android/WordPressDB.java
index 78a870f86fc9..a3a987b7a70f 100644
--- a/src/org/wordpress/android/WordPressDB.java
+++ b/src/org/wordpress/android/WordPressDB.java
@@ -336,7 +336,7 @@ public boolean addBlog(Blog blog) {
         values.put("maxImageWidth", blog.getMaxImageWidth());
         values.put("maxImageWidthId", blog.getMaxImageWidthId());
         values.put("runService", false);
-        values.put("blogId", blog.getBlogId());
+        values.put("blogId", blog.getRemoteBlogId());
         values.put("dotcomFlag", blog.isDotcomFlag());
         values.put("wpVersion", blog.getWpVersion());
         values.put("isAdmin", blog.isAdmin());
@@ -432,9 +432,9 @@ public boolean isBlogInDatabase(int blogId, String xmlRpcUrl) {
         return result;
     }
 
-    public boolean isBlogIdInDatabase(int blogId) {
-        String[] args = {Integer.toString(blogId)};
-        return SqlUtils.boolForQuery(db, "SELECT 1 FROM " + SETTINGS_TABLE + " WHERE blogId=?", args);
+    public boolean isLocalBlogIdInDatabase(int localBlogId) {
+        String[] args = {Integer.toString(localBlogId)};
+        return SqlUtils.boolForQuery(db, "SELECT 1 FROM " + SETTINGS_TABLE + " WHERE id=?", args);
     }
 
     public boolean saveBlog(Blog blog) {
@@ -463,7 +463,7 @@ public boolean saveBlog(Blog blog) {
         values.put("blogName", blog.getBlogName());
         values.put("isAdmin", blog.isAdmin());
 
-        boolean returnValue = db.update(SETTINGS_TABLE, values, "id=" + blog.getId(),
+        boolean returnValue = db.update(SETTINGS_TABLE, values, "id=" + blog.getLocalTableBlogId(),
                 null) > 0;
         if (blog.isDotcomFlag()) {
             returnValue = updateWPComCredentials(blog.getUsername(), blog.getPassword());
@@ -663,30 +663,13 @@ public List<Integer> getNotificationAccounts() {
         return returnVector;
     }
 
-    public String getAccountName(String accountID) {
-
-        String accountName = "";
-        Cursor c = db.query(SETTINGS_TABLE, new String[]{"blogName"}, "id="
-                + accountID, null, null, null, null);
-        c.moveToFirst();
-        if (c.getString(0) != null) {
-            accountName = c.getString(0);
-        }
-        c.close();
-
-        return accountName;
+    public int getLocalTableBlogIdForRemoteBlogId(int remoteBlogId) {
+        return SqlUtils.intForQuery(db, "SELECT id FROM accounts WHERE blogId=?", new String[]{Integer.toString(remoteBlogId)});
     }
 
-    /*
-     * nbradbury 11/14/13
-     */
-    public int getAccountIdForBlogId(int blogId) {
-        return SqlUtils.intForQuery(db, "SELECT id FROM accounts WHERE blogId=?", new String[]{Integer.toString(blogId)});
-    }
-
-    public int getAccountIdForBlogIdAndXmlRpcUrl(int blogId, String xmlRpcUrl) {
+    public int getLocalTableBlogIdForRemoteBlogIdAndXmlRpcUrl(int remoteBlogId, String xmlRpcUrl) {
         return SqlUtils.intForQuery(db, "SELECT id FROM accounts WHERE blogId=? AND url=?",
-                new String[]{Integer.toString(blogId), xmlRpcUrl});
+                new String[]{Integer.toString(remoteBlogId), xmlRpcUrl});
     }
 
     public void updateNotificationFlag(int id, boolean flag) {
@@ -946,17 +929,6 @@ public long savePost(Post post, int blogID) {
         return (returnValue);
     }
 
-    /**
-     * nbradbury 11/15/13 - get the title of a specific post
-     * @param accountId - - unique id in account table for this blog
-     * @param postId - id of the desired post
-     * @return title if exists, empty string otherwise
-     */
-    public String getPostTitle(int accountId, String postId) {
-        String[] args = {Integer.toString(accountId), StringUtils.notNullStr(postId)};
-        return SqlUtils.stringForQuery(db, "SELECT TITLE FROM " + POSTS_TABLE + " WHERE blogID=? AND postid=?", args);
-    }
-
     public int updatePost(Post post, int blogID) {
         int success = 0;
         if (post != null) {
@@ -1103,19 +1075,19 @@ public List<Object> loadPost(int blogID, boolean isPage, long id) {
 
     /**
      * nbradbury 11/15/13 - add a single comment
-     * @param accountId - unique id in account table for the blog the comment is from
+     * @param localBlogId - unique id in account table for the blog the comment is from
      * @param comment - comment object to store
      */
-    public void addComment(int accountId, Comment comment) {
+    public void addComment(int localBlogId, Comment comment) {
         if (comment == null)
             return;
 
         // first delete existing comment (necessary since there's no primary key or indexes
         // on this table, which means we can't rely on using CONFLICT_REPLACE below)
-        deleteComment(accountId, comment.commentID);
+        deleteComment(localBlogId, comment.commentID);
 
         ContentValues values = new ContentValues();
-        values.put("blogID", accountId);
+        values.put("blogID", localBlogId);
         values.put("postID", StringUtils.notNullStr(comment.postID));
         values.put("iCommentID", comment.commentID);
         values.put("author", StringUtils.notNullStr(comment.name));
@@ -1132,11 +1104,11 @@ public void addComment(int accountId, Comment comment) {
 
     /**
      * nbradbury 11/11/13 - retrieve a single comment
-     * @param accountId - unique id in account table for the blog the comment is from
+     * @param localBlogId - unique id in account table for the blog the comment is from
      * @param commentId - commentId of the actual comment
      * @return Comment if found, null otherwise
      */
-    public Comment getComment(int accountId, int commentId) {
+    public Comment getComment(int localBlogId, int commentId) {
         String[] cols = {"author",
                          "comment",
                          "commentDateFormatted",
@@ -1145,7 +1117,7 @@ public Comment getComment(int accountId, int commentId) {
                          "email",
                          "postTitle",
                          "postID"};
-        String[] args = {Integer.toString(accountId),
+        String[] args = {Integer.toString(localBlogId),
                          Integer.toString(commentId)};
         Cursor c = db.query(COMMENTS_TABLE,
                             cols,
@@ -1180,12 +1152,12 @@ public Comment getComment(int accountId, int commentId) {
 
     /**
      * nbradbury 11/12/13 - delete a single comment
-     * @param accountId - unique id in account table for this blog
+     * @param localBlogId - unique id in account table for this blog
      * @param commentId - commentId of the actual comment
      * @return true if comment deleted, false otherwise
      */
-    public boolean deleteComment(int accountId, int commentId) {
-        String[] args = {Integer.toString(accountId),
+    public boolean deleteComment(int localBlogId, int commentId) {
+        String[] args = {Integer.toString(localBlogId),
                          Integer.toString(commentId)};
         int count = db.delete(COMMENTS_TABLE, "blogID=? AND iCommentID=?", args);
         return (count > 0);
diff --git a/src/org/wordpress/android/models/Blog.java b/src/org/wordpress/android/models/Blog.java
index f71be9808335..fb36a50a6084 100644
--- a/src/org/wordpress/android/models/Blog.java
+++ b/src/org/wordpress/android/models/Blog.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 
 public class Blog {
-    private int id;
+    private int localTableBlogId;
     private String url;
     private String homeURL;
     private String blogName;
@@ -33,7 +33,7 @@ public class Blog {
     private int maxImageWidthId;
     private int lastCommentId;
     private boolean runService;
-    private int blogId;
+    private int remoteBlogId;
     private boolean location;
     private String dotcom_username;
     private String dotcom_password;
@@ -52,7 +52,7 @@ public Blog(String url, String username, String password) {
         this.url = url;
         this.username = username;
         this.password = password;
-        this.id = -1;
+        this.localTableBlogId = -1;
     }
 
     public Blog(int blog_id) throws Exception {
@@ -60,7 +60,7 @@ public Blog(int blog_id) throws Exception {
         List<Object> blogVals = WordPress.wpDB.getBlog(blog_id);
 
         if (blogVals != null) {
-            this.id = blog_id;
+            this.localTableBlogId = blog_id;
             this.url = blogVals.get(0).toString();
             this.blogName = blogVals.get(1).toString();
             this.username = blogVals.get(2).toString();
@@ -73,7 +73,7 @@ public Blog(int blog_id) throws Exception {
             this.maxImageWidth = blogVals.get(9).toString();
             this.maxImageWidthId = (Integer) blogVals.get(10);
             this.runService = (Integer)blogVals.get(11)>0;
-            this.blogId = (Integer) blogVals.get(12);
+            this.remoteBlogId = (Integer) blogVals.get(12);
             this.location = (Integer)blogVals.get(13)>0;
             this.dotcomFlag = (Integer)blogVals.get(14)>0;
             //these were accidentally set up to contain null values :(
@@ -107,12 +107,12 @@ public Blog(int blog_id) throws Exception {
         }
     }
 
-    public int getId() {
-        return id;
+    public int getLocalTableBlogId() {
+        return localTableBlogId;
     }
 
-    public void setId(int id) {
-        this.id = id;
+    public void setLocalTableBlogId(int id) {
+        this.localTableBlogId = id;
     }
 
     public String getUrl() {
@@ -219,12 +219,12 @@ public void setRunService(boolean runService) {
         this.runService = runService;
     }
 
-    public int getBlogId() {
-        return blogId;
+    public int getRemoteBlogId() {
+        return remoteBlogId;
     }
 
-    public void setBlogId(int blogId) {
-        this.blogId = blogId;
+    public void setRemoteBlogId(int blogId) {
+        this.remoteBlogId = blogId;
     }
 
     public boolean isLocation() {
@@ -317,7 +317,7 @@ public void setHidden(boolean isHidden) {
 
     public boolean save() {
         // Insert new blog to db
-        if (this.id == -1) {
+        if (this.localTableBlogId == -1) {
             return WordPress.wpDB.addBlog(this);
         } else {
             return WordPress.wpDB.saveBlog(this);
@@ -341,7 +341,7 @@ public boolean bsetPostFormats(String postFormats) {
     }
 
     public int getUnmoderatedCommentCount() {
-        return WordPress.wpDB.getUnmoderatedCommentCount(this.id);
+        return WordPress.wpDB.getUnmoderatedCommentCount(this.localTableBlogId);
     }
 
     public boolean isScaledImage() {
@@ -463,7 +463,7 @@ public boolean hasValidJetpackCredentials() {
      */
     public String getDotComBlogId() {
         if (isDotcomFlag())
-            return String.valueOf(getBlogId());
+            return String.valueOf(getRemoteBlogId());
         else
             return getApi_blogid();
     }
diff --git a/src/org/wordpress/android/models/Theme.java b/src/org/wordpress/android/models/Theme.java
index 1634da9eee03..f42cce884662 100644
--- a/src/org/wordpress/android/models/Theme.java
+++ b/src/org/wordpress/android/models/Theme.java
@@ -176,7 +176,7 @@ public static Theme fromJSON(JSONObject object) throws JSONException {
         
         // if the theme is free, set the blogId to be empty
         // if the theme is not free, set the blogId to the current blog
-        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        String blogId = String.valueOf(WordPress.getCurrentBlog().getRemoteBlogId());
         
         String features = "";
         JSONArray tags = object.getJSONArray("tags");
diff --git a/src/org/wordpress/android/ui/ShareIntentReceiverActivity.java b/src/org/wordpress/android/ui/ShareIntentReceiverActivity.java
index abdb7287e833..537816714204 100644
--- a/src/org/wordpress/android/ui/ShareIntentReceiverActivity.java
+++ b/src/org/wordpress/android/ui/ShareIntentReceiverActivity.java
@@ -181,7 +181,7 @@ private boolean selectBlog(int blogId) {
         if (WordPress.currentBlog.isHidden()) {
             return false;
         }
-        WordPress.wpDB.updateLastBlogId(WordPress.currentBlog.getId());
+        WordPress.wpDB.updateLastBlogId(WordPress.currentBlog.getLocalTableBlogId());
         return true;
     }
 
@@ -279,9 +279,9 @@ private void savePreferences() {
             SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(this)
                     .edit();
             if (isSharingText()) {
-                editor.putInt(SHARE_TEXT_BLOG_ID_KEY, WordPress.currentBlog.getId());
+                editor.putInt(SHARE_TEXT_BLOG_ID_KEY, WordPress.currentBlog.getLocalTableBlogId());
             } else {
-                editor.putInt(SHARE_IMAGE_BLOG_ID_KEY, WordPress.currentBlog.getId());
+                editor.putInt(SHARE_IMAGE_BLOG_ID_KEY, WordPress.currentBlog.getLocalTableBlogId());
                 editor.putInt(SHARE_IMAGE_ADDTO_KEY, mActionIndex); // Add to new post or media
             }
             editor.commit();
diff --git a/src/org/wordpress/android/ui/WPActionBarActivity.java b/src/org/wordpress/android/ui/WPActionBarActivity.java
index 09eaf5e07db8..b2578118be3c 100644
--- a/src/org/wordpress/android/ui/WPActionBarActivity.java
+++ b/src/org/wordpress/android/ui/WPActionBarActivity.java
@@ -175,7 +175,7 @@ protected void refreshMenuDrawer(){
             
         if (currentBlog != null && mListView != null && mListView.getHeaderViewsCount() > 0) {
             for (int i = 0; i < blogIDs.length; i++) {
-                if (blogIDs[i] == currentBlog.getId()) {
+                if (blogIDs[i] == currentBlog.getLocalTableBlogId()) {
                     if (mBlogSpinner != null) {
                         mBlogSpinner.setSelection(i);
                     }
@@ -622,7 +622,7 @@ public void onClick(DialogInterface dialog,
      * This method is called when the user changes the active blog.
      */
     public void onBlogChanged() {
-        WordPress.wpDB.updateLastBlogId(WordPress.currentBlog.getId());
+        WordPress.wpDB.updateLastBlogId(WordPress.currentBlog.getLocalTableBlogId());
         // the menu may have changed, we need to change the selection if the selected item
         // is not available in the menu anymore
         Iterator<MenuDrawerItem> itemIterator = mMenuItems.iterator();
@@ -781,7 +781,7 @@ public void onSelectItem(){
             if (!(WPActionBarActivity.this instanceof PagesActivity))
                 mShouldFinish = true;
             Intent intent = new Intent(WPActionBarActivity.this, PagesActivity.class);
-            intent.putExtra("id", WordPress.currentBlog.getId());
+            intent.putExtra("id", WordPress.currentBlog.getLocalTableBlogId());
             intent.putExtra("isNew", true);
             intent.putExtra("viewPages", true);
             intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
@@ -806,7 +806,7 @@ public void onSelectItem(){
             if (!(WPActionBarActivity.this instanceof CommentsActivity))
                 mShouldFinish = true;
             Intent intent = new Intent(WPActionBarActivity.this, CommentsActivity.class);
-            intent.putExtra("id", WordPress.currentBlog.getId());
+            intent.putExtra("id", WordPress.currentBlog.getLocalTableBlogId());
             intent.putExtra("isNew",
                     true);
             intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
@@ -872,7 +872,7 @@ public void onSelectItem(){
                 mShouldFinish = true;
             
             Intent intent = new Intent(WPActionBarActivity.this, StatsActivity.class);
-            intent.putExtra("id", WordPress.currentBlog.getId());
+            intent.putExtra("id", WordPress.currentBlog.getLocalTableBlogId());
             intent.putExtra("isNew", true);
             intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
             startActivityWithDelay(intent);
diff --git a/src/org/wordpress/android/ui/accounts/SetupBlog.java b/src/org/wordpress/android/ui/accounts/SetupBlog.java
index a8b5d0ea261a..9383bbf4f845 100644
--- a/src/org/wordpress/android/ui/accounts/SetupBlog.java
+++ b/src/org/wordpress/android/ui/accounts/SetupBlog.java
@@ -225,23 +225,23 @@ public Blog addBlog(String blogName, String xmlRpcUrl, String homeUrl, String bl
             blog.setMaxImageWidth(DEFAULT_IMAGE_SIZE);
             blog.setMaxImageWidthId(0); //deprecated
             blog.setRunService(false); //deprecated
-            blog.setBlogId(Integer.parseInt(blogId));
+            blog.setRemoteBlogId(Integer.parseInt(blogId));
             blog.setDotcomFlag(xmlRpcUrl.contains("wordpress.com"));
             blog.setWpVersion(""); // assigned later in getOptions call
             blog.setAdmin(isAdmin);
             blog.save();
         } else {
             // Update blog name
-            int accountId = WordPress.wpDB.getAccountIdForBlogIdAndXmlRpcUrl(
+            int localTableBlogId = WordPress.wpDB.getLocalTableBlogIdForRemoteBlogIdAndXmlRpcUrl(
                     Integer.parseInt(blogId), xmlRpcUrl);
             try {
-                blog = new Blog(accountId);
+                blog = new Blog(localTableBlogId);
                 if (!blogName.equals(blog.getBlogName())) {
                     blog.setBlogName(blogName);
                     blog.save();
                 }
             } catch (Exception e) {
-                Log.e(WordPress.TAG, "accountId: " + accountId + " not found");
+                Log.e(WordPress.TAG, "localTableBlogId: " + localTableBlogId + " not found");
             }
         }
         return blog;
diff --git a/src/org/wordpress/android/ui/comments/CommentActions.java b/src/org/wordpress/android/ui/comments/CommentActions.java
index 394dbaed0be5..793493f485c2 100644
--- a/src/org/wordpress/android/ui/comments/CommentActions.java
+++ b/src/org/wordpress/android/ui/comments/CommentActions.java
@@ -78,7 +78,7 @@ public void run() {
                 commentHash.put("author_email", "");
 
                 Object[] params = {
-                        blog.getBlogId(),
+                        blog.getRemoteBlogId(),
                         blog.getUsername(),
                         blog.getPassword(),
                         postID,
@@ -141,7 +141,7 @@ public void run() {
                 replyHash.put("author_email", "");
 
                 Object[] params = {
-                        blog.getBlogId(),
+                        blog.getRemoteBlogId(),
                         blog.getUsername(),
                         blog.getPassword(),
                         Integer.valueOf(comment.postID),
@@ -240,7 +240,7 @@ public void run() {
                 postHash.put("author_url", comment.authorURL);
                 postHash.put("author_email", comment.authorEmail);
 
-                Object[] params = { blog.getBlogId(),
+                Object[] params = { blog.getRemoteBlogId(),
                         blog.getUsername(),
                         blog.getPassword(),
                         comment.commentID,
@@ -256,7 +256,7 @@ public void run() {
 
                 final boolean success = (result != null && Boolean.parseBoolean(result.toString()));
                 if (success)
-                    WordPress.wpDB.updateCommentStatus(blog.getId(), comment.commentID, CommentStatus.toString(newStatus));
+                    WordPress.wpDB.updateCommentStatus(blog.getLocalTableBlogId(), comment.commentID, CommentStatus.toString(newStatus));
 
                 if (actionListener != null) {
                     handler.post(new Runnable() {
@@ -294,7 +294,7 @@ public void run() {
                         blog.getHttppassword());
 
                 Object[] params = {
-                        blog.getBlogId(),
+                        blog.getRemoteBlogId(),
                         blog.getUsername(),
                         blog.getPassword(),
                         comment.commentID };
diff --git a/src/org/wordpress/android/ui/comments/CommentDetailFragment.java b/src/org/wordpress/android/ui/comments/CommentDetailFragment.java
index 69806fd4bd24..efb3ad606fe5 100644
--- a/src/org/wordpress/android/ui/comments/CommentDetailFragment.java
+++ b/src/org/wordpress/android/ui/comments/CommentDetailFragment.java
@@ -56,8 +56,7 @@
  * prior to this there were separate comment detail screens for each list
  */
 public class CommentDetailFragment extends Fragment implements NotificationFragment {
-    private int mAccountId;
-    private int mBlogId;
+    private int mLocalTableBlogId;
 
     private Comment mComment;
     private Note mNote;
@@ -87,9 +86,9 @@ public class CommentDetailFragment extends Fragment implements NotificationFragm
     /*
      * used when called from comment list
      */
-    protected static CommentDetailFragment newInstance(int blogId, final Comment comment) {
+    protected static CommentDetailFragment newInstance(int localBlogId, final Comment comment) {
         CommentDetailFragment fragment = new CommentDetailFragment();
-        fragment.setComment(blogId, comment);
+        fragment.setComment(localBlogId, comment);
         return fragment;
     }
 
@@ -146,14 +145,13 @@ public void onClick(View v) {
         return view;
     }
 
-    protected void setComment(int blogId, final Comment comment) {
+    protected void setComment(int localBlogId, final Comment comment) {
         mComment = comment;
-        mBlogId = blogId;
-        mAccountId = WordPress.wpDB.getAccountIdForBlogId(blogId);
+        mLocalTableBlogId = localBlogId;
 
         // is this comment on one of the user's blogs? it won't be if this was displayed from a
         // notification about a reply to a comment this user posted on someone else's blog
-        mIsUsersBlog = (comment != null && WordPress.wpDB.isBlogIdInDatabase(mBlogId));
+        mIsUsersBlog = (comment != null && WordPress.wpDB.isLocalBlogIdInDatabase(mLocalTableBlogId));
 
         if (hasActivity())
             showComment();
@@ -199,7 +197,7 @@ protected int getCommentId() {
     }
 
     protected int getBlogId() {
-        return mBlogId;
+        return mLocalTableBlogId;
     }
 
     /*
@@ -208,8 +206,8 @@ protected int getBlogId() {
     protected void refreshComment() {
         if (!hasComment())
             return;
-        Comment updatedComment = WordPress.wpDB.getComment(mAccountId, getCommentId());
-        setComment(mBlogId, updatedComment);
+        Comment updatedComment = WordPress.wpDB.getComment(mLocalTableBlogId, getCommentId());
+        setComment(mLocalTableBlogId, updatedComment);
     }
 
     /*
@@ -369,7 +367,7 @@ public void onActionResult(boolean succeeded) {
             }
         };
         mIsModeratingComment = true;
-        CommentActions.moderateComment(mAccountId, mComment, newStatus, actionListener);
+        CommentActions.moderateComment(mLocalTableBlogId, mComment, newStatus, actionListener);
     }
 
     /*
@@ -424,7 +422,7 @@ public void onActionResult(boolean succeeded) {
         if (mNote != null) {
             CommentActions.submitReplyToCommentNote(mNote, replyText, actionListener);
         } else {
-            CommentActions.submitReplyToComment(mAccountId, mComment, replyText, actionListener);
+            CommentActions.submitReplyToComment(mLocalTableBlogId, mComment, replyText, actionListener);
         }
     }
 
@@ -547,19 +545,19 @@ private void showCommentForNote(Note note) {
             JSONObject jsonAction = actions.get(firstKey);
             JSONObject jsonParams = jsonAction.optJSONObject("params");
             if (jsonParams != null) {
-                int blogId = jsonParams.optInt("blog_id");
+                int remoteBlogId = jsonParams.optInt("blog_id");
                 int commentId = jsonParams.optInt("comment_id");
 
-                // note that the account won't be found if the comment is from someone else's blog
-                int accountId = WordPress.wpDB.getAccountIdForBlogId(blogId);
+                // note that the local blog id won't be found if the comment is from someone else's blog
+                int localBlogId = WordPress.wpDB.getLocalTableBlogIdForRemoteBlogId(remoteBlogId);
 
                 // first try to get from local db, if that fails request it from the server
-                Comment comment = WordPress.wpDB.getComment(accountId, commentId);
+                Comment comment = WordPress.wpDB.getComment(localBlogId, commentId);
                 if (comment != null) {
                     comment.setProfileImageUrl(note.getIconURL());
-                    setComment(blogId, comment);
+                    setComment(localBlogId, comment);
                 } else {
-                    requestComment(blogId, commentId, note.getIconURL());
+                    requestComment(localBlogId, remoteBlogId, commentId, note.getIconURL());
                 }
             }
         } else {
@@ -573,7 +571,10 @@ private void showCommentForNote(Note note) {
      * either be wp.com or have Jetpack, but it's safe to do this since this method is only called when
      * displayed from a notification (and notifications require wp.com/Jetpack)
      */
-    private void requestComment(final int blogId, final int commentId, final String profileImageUrl) {
+    private void requestComment(final int localBlogId,
+                                final int remoteBlogId,
+                                final int commentId,
+                                final String profileImageUrl) {
         final ProgressBar progress = (hasActivity() ? (ProgressBar) getActivity().findViewById(R.id.progress_loading) : null);
         if (progress != null)
             progress.setVisibility(View.VISIBLE);
@@ -589,8 +590,8 @@ public void onResponse(JSONObject jsonObject) {
                     if (comment != null) {
                         if (profileImageUrl != null)
                             comment.setProfileImageUrl(profileImageUrl);
-                        WordPress.wpDB.addComment(mAccountId, comment);
-                        setComment(blogId, comment);
+                        WordPress.wpDB.addComment(localBlogId, comment);
+                        setComment(localBlogId, comment);
                     }
                 }
             }
@@ -608,7 +609,7 @@ public void onErrorResponse(VolleyError volleyError) {
             }
         };
 
-        final String path = String.format("/sites/%s/comments/%s", blogId, commentId);
+        final String path = String.format("/sites/%s/comments/%s", remoteBlogId, commentId);
         mIsRequestingComment = true;
         WordPress.restClient.get(path, restListener, restErrListener);
     }
diff --git a/src/org/wordpress/android/ui/comments/CommentsActivity.java b/src/org/wordpress/android/ui/comments/CommentsActivity.java
index 459eff28ede9..0de75d6bec06 100644
--- a/src/org/wordpress/android/ui/comments/CommentsActivity.java
+++ b/src/org/wordpress/android/ui/comments/CommentsActivity.java
@@ -176,14 +176,14 @@ public void onCommentSelected(Comment comment) {
                 WordPress.currentComment = comment;
                 FragmentTransaction ft = fm.beginTransaction();
                 ft.hide(commentList);
-                f = CommentDetailFragment.newInstance(WordPress.getCurrentBlogId(), comment);
+                f = CommentDetailFragment.newInstance(WordPress.getCurrentLocalTableBlogId(), comment);
                 ft.add(R.id.commentDetailFragmentContainer, f);
                 //ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
                 ft.addToBackStack(null);
                 ft.commitAllowingStateLoss();
                 mMenuDrawer.setDrawerIndicatorEnabled(false);
             } else {
-                f.setComment(WordPress.getCurrentBlogId(), comment);
+                f.setComment(WordPress.getCurrentLocalTableBlogId(), comment);
             }
         }
     }
@@ -260,7 +260,7 @@ public boolean onContextItemSelected(android.view.MenuItem item) {
              */
             showDialog(ID_DIALOG_DELETING);
             CommentActions.deleteComment(
-                    WordPress.getCurrentBlogAccountId(),
+                    WordPress.getCurrentLocalTableBlogId(),
                     WordPress.currentComment,
                     new CommentActions.CommentActionListener() {
                         @Override
@@ -295,7 +295,7 @@ public void onActionResult(boolean succeeded) {
                     return true;
             }
 
-            CommentActions.moderateComment(WordPress.getCurrentBlogAccountId(),
+            CommentActions.moderateComment(WordPress.getCurrentLocalTableBlogId(),
                                            WordPress.currentComment,
                                            status,
                     new CommentActions.CommentActionListener() {
diff --git a/src/org/wordpress/android/ui/comments/CommentsListFragment.java b/src/org/wordpress/android/ui/comments/CommentsListFragment.java
index db2d6624422c..e417e61dab06 100644
--- a/src/org/wordpress/android/ui/comments/CommentsListFragment.java
+++ b/src/org/wordpress/android/ui/comments/CommentsListFragment.java
@@ -258,7 +258,7 @@ protected void moderateComments(CommentStatus newStatus) {
             postHash.put("author_email", contentHash.get("email"));
 
             Object[] params = {
-                    blog.getBlogId(),
+                    blog.getRemoteBlogId(),
                     blog.getUsername(),
                     blog.getPassword(),
                     curCommentID,
@@ -273,8 +273,8 @@ protected void moderateComments(CommentStatus newStatus) {
                     listRow.setStatus(newStatusStr);
                     contentHash.put("status", newStatusStr);
                     model.set(i, listRow);
-                    WordPress.wpDB.updateCommentStatus(WordPress.currentBlog.getId(), listRow.commentID, newStatusStr);
-                    commentsUpdatedList.add(WordPress.wpDB.getComment(WordPress.currentBlog.getId(), listRow.commentID));
+                    WordPress.wpDB.updateCommentStatus(WordPress.currentBlog.getLocalTableBlogId(), listRow.commentID, newStatusStr);
+                    commentsUpdatedList.add(WordPress.wpDB.getComment(WordPress.currentBlog.getLocalTableBlogId(), listRow.commentID));
                 }
             } catch (XMLRPCException e) {
                 moderateErrorMsg = getResources().getText(R.string.error_moderate_comment).toString();
@@ -323,7 +323,7 @@ protected void deleteComments() {
             Comment listRow = (Comment) getListView().getItemAtPosition(i);
             int curCommentID = listRow.commentID;
 
-            Object[] params = {WordPress.currentBlog.getBlogId(),
+            Object[] params = {WordPress.currentBlog.getRemoteBlogId(),
                     WordPress.currentBlog.getUsername(),
                     WordPress.currentBlog.getPassword(), curCommentID};
 
@@ -371,7 +371,7 @@ public boolean loadComments(boolean refresh, boolean loadMore) {
         String author, postID, comment, dateCreatedFormatted, status, authorEmail, authorURL, postTitle;
         int commentID;
 
-        List<Map<String, Object>> loadedComments = WordPress.wpDB.loadComments(WordPress.currentBlog.getId());
+        List<Map<String, Object>> loadedComments = WordPress.wpDB.loadComments(WordPress.currentBlog.getLocalTableBlogId());
 
         if (refreshOnly) {
             if (model != null) {
@@ -522,7 +522,7 @@ public void refreshComments(boolean loadMore) {
             hPost.put("number", COMMENTS_PER_PAGE);
         }
 
-        Object[] params = { WordPress.currentBlog.getBlogId(),
+        Object[] params = { WordPress.currentBlog.getRemoteBlogId(),
                 WordPress.currentBlog.getUsername(),
                 WordPress.currentBlog.getPassword(), hPost };
 
@@ -718,7 +718,7 @@ protected void onPostExecute(Map<Integer, Map<?, ?>> commentsResult) {
 
             if (commentsResult == null) {
                 if (model != null && model.size() == 1) {
-                    WordPress.wpDB.clearComments(WordPress.currentBlog.getId());
+                    WordPress.wpDB.clearComments(WordPress.currentBlog.getLocalTableBlogId());
                     model.clear();
                     allComments.clear();
                     getListView().invalidateViews();
diff --git a/src/org/wordpress/android/ui/comments/EditCommentActivity.java b/src/org/wordpress/android/ui/comments/EditCommentActivity.java
index dcabc1ccfe51..2ffe6e7c113e 100644
--- a/src/org/wordpress/android/ui/comments/EditCommentActivity.java
+++ b/src/org/wordpress/android/ui/comments/EditCommentActivity.java
@@ -223,7 +223,7 @@ public void updateComment(Map<String, String> postHash){
                 WordPress.currentBlog.getHttpuser(),
                 WordPress.currentBlog.getHttppassword());
 
-        Object[] params = { WordPress.currentBlog.getBlogId(),
+        Object[] params = { WordPress.currentBlog.getRemoteBlogId(),
                 WordPress.currentBlog.getUsername(),
                 WordPress.currentBlog.getPassword(),
                 WordPress.currentComment.commentID,
@@ -248,7 +248,7 @@ public void updateComment(Map<String, String> postHash){
 
                 // Save the updates
                 WordPress.wpDB.updateComment(
-                        WordPress.currentBlog.getId(),
+                        WordPress.currentBlog.getLocalTableBlogId(),
                         WordPress.currentComment.commentID,
                         postHash);
 
diff --git a/src/org/wordpress/android/ui/media/MediaAddFragment.java b/src/org/wordpress/android/ui/media/MediaAddFragment.java
index d5413971ab9b..a2f571715f12 100644
--- a/src/org/wordpress/android/ui/media/MediaAddFragment.java
+++ b/src/org/wordpress/android/ui/media/MediaAddFragment.java
@@ -195,7 +195,7 @@ private void queueFileForUpload(String path) {
         String fileType = new String(path).replaceAll(".*\\.(\\w+)$", "$1").toLowerCase();
         
         MediaFile mediaFile = new MediaFile();
-        mediaFile.setBlogId(String.valueOf(blog.getBlogId()));
+        mediaFile.setBlogId(String.valueOf(blog.getLocalTableBlogId()));
         mediaFile.setFileName(fileName + "." + fileType);
         mediaFile.setFilePath(path);
         mediaFile.setUploadState("queued");
@@ -246,7 +246,7 @@ public void launchPictureLibrary() {
     }
     
     public void addToQueue(String mediaId) {
-        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
         WordPress.wpDB.updateMediaUploadState(blogId, mediaId, "queued");
         startMediaUploadService();
     }
diff --git a/src/org/wordpress/android/ui/media/MediaBrowserActivity.java b/src/org/wordpress/android/ui/media/MediaBrowserActivity.java
index 8d4eadb09465..ba93c87ed0d0 100644
--- a/src/org/wordpress/android/ui/media/MediaBrowserActivity.java
+++ b/src/org/wordpress/android/ui/media/MediaBrowserActivity.java
@@ -563,7 +563,7 @@ public boolean onMenuItemActionCollapse(MenuItem item) {
 
     @Override
     public void onDeleteMedia(final List<String> ids) {
-        final String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        final String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
         List<String> sanitizedIds = new ArrayList<String>(ids.size());
         
         if (mMediaItemFragment != null && mMediaItemFragment.isVisible()) {
@@ -660,7 +660,7 @@ public void onMediaAdded(String mediaId) {
         if (WordPress.getCurrentBlog() == null || mediaId == null) {
             return;
         }
-        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
         Cursor cursor = WordPress.wpDB.getMediaFile(blogId, mediaId);
 
         if (cursor == null || !cursor.moveToFirst()) {
@@ -741,7 +741,7 @@ private void handleNewPost() {
         if (mMediaGridFragment == null)
             return;
 
-        Post newPost = new Post(WordPress.getCurrentBlog().getId(), false);
+        Post newPost = new Post(WordPress.getCurrentBlog().getLocalTableBlogId(), false);
         if (newPost.getId() < 0) {
             return;
         }
@@ -780,7 +780,7 @@ private void handleMultiSelectPost() {
 
         ArrayList<String> ids = mMediaGridFragment.getCheckedItems();
 
-        Post newPost = new Post(WordPress.getCurrentBlog().getId(), false);
+        Post newPost = new Post(WordPress.getCurrentBlog().getLocalTableBlogId(), false);
         if (newPost.getId() < 0) {
             return;
         }
diff --git a/src/org/wordpress/android/ui/media/MediaEditFragment.java b/src/org/wordpress/android/ui/media/MediaEditFragment.java
index 51396913635d..56d07452d6ec 100644
--- a/src/org/wordpress/android/ui/media/MediaEditFragment.java
+++ b/src/org/wordpress/android/ui/media/MediaEditFragment.java
@@ -179,7 +179,7 @@ public void loadMedia(String mediaId) {
         Blog blog = WordPress.getCurrentBlog();
 
         if (blog != null && getActivity() != null) {
-            String blogId = String.valueOf(blog.getBlogId());
+            String blogId = String.valueOf(blog.getLocalTableBlogId());
 
             Cursor cursor = null;
 
@@ -216,7 +216,7 @@ public void editMedia() {
 
                     @Override
                     public void onSuccess() {
-                        String blogId = String.valueOf(currentBlog.getBlogId());
+                        String blogId = String.valueOf(currentBlog.getLocalTableBlogId());
                         WordPress.wpDB.updateMediaFile(blogId, mediaId, title, description, caption);
 
                         if (getActivity() != null)
diff --git a/src/org/wordpress/android/ui/media/MediaGalleryEditFragment.java b/src/org/wordpress/android/ui/media/MediaGalleryEditFragment.java
index 12d102d34828..e3cb607ec1ce 100644
--- a/src/org/wordpress/android/ui/media/MediaGalleryEditFragment.java
+++ b/src/org/wordpress/android/ui/media/MediaGalleryEditFragment.java
@@ -68,7 +68,7 @@ private void refreshGridView() {
         if (WordPress.getCurrentBlog() == null)
             return;
         
-        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
         
         Cursor cursor = WordPress.wpDB.getMediaFiles(blogId, mIds);
         
diff --git a/src/org/wordpress/android/ui/media/MediaGalleryPickerActivity.java b/src/org/wordpress/android/ui/media/MediaGalleryPickerActivity.java
index f4c89e94f514..9956dad99c5e 100644
--- a/src/org/wordpress/android/ui/media/MediaGalleryPickerActivity.java
+++ b/src/org/wordpress/android/ui/media/MediaGalleryPickerActivity.java
@@ -107,7 +107,7 @@ public void onSaveInstanceState(Bundle outState) {
     private void refereshViews() {
         if (WordPress.getCurrentBlog() == null)
             return;
-        final String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        final String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
         Cursor cursor = WordPress.wpDB.getMediaImagesForBlog(blogId, mFilteredItems);
         if (cursor.getCount() == 0) {
             refreshMediaFromServer(0);
@@ -214,7 +214,7 @@ public void onSuccess(int count) {
                     MediaGridAdapter adapter = (MediaGridAdapter) mGridView.getAdapter();
                     mHasRetrievedAllMedia = (count == 0);
                     adapter.setHasRetrieviedAll(mHasRetrievedAllMedia);
-                    String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+                    String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
                     if (WordPress.wpDB.getMediaCountAll(blogId) == 0 && count == 0) {
                         // There is no media at all
                         noMediaFinish();
@@ -229,7 +229,7 @@ public void onSuccess(int count) {
                             public void run() {
                                 //mListener.onMediaItemListDownloaded();
                                 mGridAdapter.setRefreshing(false);
-                                String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+                                String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
                                 Cursor cursor = WordPress.wpDB.getMediaImagesForBlog(blogId, mFilteredItems);
                                 mGridAdapter.swapCursor(cursor);
 
diff --git a/src/org/wordpress/android/ui/media/MediaGridFragment.java b/src/org/wordpress/android/ui/media/MediaGridFragment.java
index 3f3f15321b58..d966e0ac9243 100644
--- a/src/org/wordpress/android/ui/media/MediaGridFragment.java
+++ b/src/org/wordpress/android/ui/media/MediaGridFragment.java
@@ -258,7 +258,7 @@ private void updateFilterText() {
         if (WordPress.currentBlog == null)
             return;
 
-        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
 
         int countAll = WordPress.wpDB.getMediaCountAll(blogId);
         int countImages = WordPress.wpDB.getMediaCountImages(blogId);
@@ -405,7 +405,7 @@ public void search(String searchTerm) {
         mSearchTerm = searchTerm;
         Blog blog = WordPress.getCurrentBlog();
         if (blog != null) {
-            String blogId = String.valueOf(blog.getBlogId());
+            String blogId = String.valueOf(blog.getLocalTableBlogId());
             Cursor cursor = WordPress.wpDB.getMediaFilesForBlog(blogId, searchTerm);
             mGridAdapter.changeCursor(cursor);
         }
@@ -466,7 +466,7 @@ public Cursor setDateFilter() {
         if (blog == null)
             return null;
 
-        String blogId = String.valueOf(blog.getBlogId());
+        String blogId = String.valueOf(blog.getLocalTableBlogId());
 
         GregorianCalendar startDate = new GregorianCalendar(mStartYear, mStartMonth, mStartDay);
         GregorianCalendar endDate = new GregorianCalendar(mEndYear, mEndMonth, mEndDay);
@@ -498,7 +498,7 @@ private Cursor filterItems(Filter filter) {
         if (blog == null)
             return null;
 
-        String blogId = String.valueOf(blog.getBlogId());
+        String blogId = String.valueOf(blog.getLocalTableBlogId());
 
         switch (filter) {
             case ALL:
diff --git a/src/org/wordpress/android/ui/media/MediaItemFragment.java b/src/org/wordpress/android/ui/media/MediaItemFragment.java
index 4ba5f222c964..ef3e9c165596 100644
--- a/src/org/wordpress/android/ui/media/MediaItemFragment.java
+++ b/src/org/wordpress/android/ui/media/MediaItemFragment.java
@@ -138,7 +138,7 @@ public void loadMedia(String mediaId) {
         Blog blog = WordPress.getCurrentBlog();
         
         if (blog != null) {
-            String blogId = String.valueOf(blog.getBlogId());
+            String blogId = String.valueOf(blog.getLocalTableBlogId());
             
             Cursor cursor;
             
@@ -317,7 +317,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
         
         if (itemId == R.id.menu_delete) {
-            String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+            String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
             boolean canDeleteMedia = MediaUtils.canDeleteMedia(blogId, getMediaId());
             if (!canDeleteMedia) {
                 Toast.makeText(getActivity(), R.string.wait_until_upload_completes, Toast.LENGTH_LONG).show();
diff --git a/src/org/wordpress/android/ui/posts/EditPostActivity.java b/src/org/wordpress/android/ui/posts/EditPostActivity.java
index d0a85365090e..1524b09364a7 100644
--- a/src/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/src/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -26,8 +26,6 @@
 import org.wordpress.android.util.WPMobileStatsUtil;
 import org.wordpress.android.util.WPViewPager;
 
-import java.util.Locale;
-
 public class EditPostActivity extends SherlockFragmentActivity {
 
     public static final String EXTRA_POSTID = "postId";
@@ -108,15 +106,15 @@ protected void onCreate(Bundle savedInstanceState) {
                 }
 
                 // Create a new post for share intents and QuickPress
-                mPost = new Post(WordPress.getCurrentBlogAccountId(), false);
+                mPost = new Post(WordPress.getCurrentLocalTableBlogId(), false);
                 mIsNewPost = true;
             } else if (extras != null) {
                 // Load post from the postId passed in extras
                 long postId = extras.getLong(EXTRA_POSTID, -1);
                 boolean isPage = extras.getBoolean(EXTRA_IS_PAGE);
                 mIsNewPost = extras.getBoolean(EXTRA_IS_NEW_POST);
-                mPost = new Post(WordPress.getCurrentBlogAccountId(), postId, isPage);
-                mOriginalPost = new Post(WordPress.getCurrentBlogAccountId(), postId, isPage);
+                mPost = new Post(WordPress.getCurrentLocalTableBlogId(), postId, isPage);
+                mOriginalPost = new Post(WordPress.getCurrentLocalTableBlogId(), postId, isPage);
 
                 if (isPage) {
                     WPMobileStatsUtil.trackEventForWPCom(WPMobileStatsUtil.StatsEventPageDetailOpenedEditor);
diff --git a/src/org/wordpress/android/ui/posts/EditPostContentFragment.java b/src/org/wordpress/android/ui/posts/EditPostContentFragment.java
index d568a40d0986..11d7da3760be 100644
--- a/src/org/wordpress/android/ui/posts/EditPostContentFragment.java
+++ b/src/org/wordpress/android/ui/posts/EditPostContentFragment.java
@@ -728,7 +728,7 @@ private void addExistingMediaToEditor(String mediaId) {
         if (WordPress.getCurrentBlog() == null)
             return;
 
-        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        String blogId = String.valueOf(WordPress.getCurrentBlog().getRemoteBlogId());
 
         WPImageSpan imageSpan = MediaUtils.prepareWPImageSpan(getActivity(), blogId, mediaId);
         if (imageSpan == null)
@@ -796,7 +796,7 @@ private void updateMediaFileOnServer(WPImageSpan wpIS) {
 
                     @Override
                     public void onSuccess() {
-                        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+                        String blogId = String.valueOf(WordPress.getCurrentBlog().getRemoteBlogId());
                         WordPress.wpDB.updateMediaFile(blogId, mediaId, title, description, caption);
                     }
 
diff --git a/src/org/wordpress/android/ui/posts/EditPostSettingsFragment.java b/src/org/wordpress/android/ui/posts/EditPostSettingsFragment.java
index d847f95d901d..f4302d21b7dd 100644
--- a/src/org/wordpress/android/ui/posts/EditPostSettingsFragment.java
+++ b/src/org/wordpress/android/ui/posts/EditPostSettingsFragment.java
@@ -25,7 +25,6 @@
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
-import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TimePicker;
@@ -304,7 +303,7 @@ public void onClick(View v) {
             showPostDateSelectionDialog();
         } else if (id == R.id.selectCategories) {
             Bundle bundle = new Bundle();
-            bundle.putInt("id", WordPress.getCurrentBlog().getId());
+            bundle.putInt("id", WordPress.getCurrentBlog().getLocalTableBlogId());
             if (mCategories.size() > 0) {
                 bundle.putSerializable("categories", new HashSet<String>(mCategories));
             }
diff --git a/src/org/wordpress/android/ui/posts/PostsActivity.java b/src/org/wordpress/android/ui/posts/PostsActivity.java
index 5f5e7487753b..94fae244ebbf 100644
--- a/src/org/wordpress/android/ui/posts/PostsActivity.java
+++ b/src/org/wordpress/android/ui/posts/PostsActivity.java
@@ -220,7 +220,7 @@ public void onBackStackChanged() {
     };
 
     protected void checkForLocalChanges(boolean shouldPrompt) {
-        boolean hasLocalChanges = WordPress.wpDB.findLocalChanges(WordPress.getCurrentBlog().getId(), mIsPage);
+        boolean hasLocalChanges = WordPress.wpDB.findLocalChanges(WordPress.getCurrentBlog().getLocalTableBlogId(), mIsPage);
         if (hasLocalChanges) {
             if (!shouldPrompt)
                 return;
@@ -326,7 +326,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public void newPost() {
         WPMobileStatsUtil.trackEventForWPCom(statEventForNewPost());
         // Create a new post object
-        Post newPost = new Post(WordPress.getCurrentBlog().getId(), mIsPage);
+        Post newPost = new Post(WordPress.getCurrentBlog().getLocalTableBlogId(), mIsPage);
         Intent i = new Intent(this, EditPostActivity.class);
         i.putExtra(EditPostActivity.EXTRA_POSTID, newPost.getId());
         i.putExtra(EditPostActivity.EXTRA_IS_PAGE, mIsPage);
@@ -504,7 +504,7 @@ protected Boolean doInBackground(Post... params) {
             Object[] postParams = { "", post.getPostid(),
                     WordPress.currentBlog.getUsername(),
                     WordPress.currentBlog.getPassword() };
-            Object[] pageParams = { WordPress.currentBlog.getBlogId(),
+            Object[] pageParams = { WordPress.currentBlog.getRemoteBlogId(),
                     WordPress.currentBlog.getUsername(),
                     WordPress.currentBlog.getPassword(), post.getPostid() };
 
@@ -527,7 +527,7 @@ public class refreshCommentsTask extends AsyncTask<Void, Void, Void> {
         @Override
         protected Void doInBackground(Void... params) {
 
-            Object[] commentParams = { WordPress.currentBlog.getBlogId(),
+            Object[] commentParams = { WordPress.currentBlog.getRemoteBlogId(),
                     WordPress.currentBlog.getUsername(),
                     WordPress.currentBlog.getPassword() };
 
@@ -596,7 +596,7 @@ protected String doInBackground(Post... params) {
             Object versionResult = new Object();
             try {
                 if (mIsPage) {
-                    Object[] vParams = { WordPress.currentBlog.getBlogId(),
+                    Object[] vParams = { WordPress.currentBlog.getRemoteBlogId(),
                             post.getPostid(),
                             WordPress.currentBlog.getUsername(),
                             WordPress.currentBlog.getPassword() };
diff --git a/src/org/wordpress/android/ui/posts/PostsListFragment.java b/src/org/wordpress/android/ui/posts/PostsListFragment.java
index 0476cbb0b0f7..08c23bfad5a2 100644
--- a/src/org/wordpress/android/ui/posts/PostsListFragment.java
+++ b/src/org/wordpress/android/ui/posts/PostsListFragment.java
@@ -119,7 +119,7 @@ public void onResume() {
         super.onResume();
         mParentActivity = (PostsActivity) getActivity();
         Blog currentBlog = WordPress.getCurrentBlog();
-        if (currentBlog != null && mLoadedBlogId != currentBlog.getBlogId()) {
+        if (currentBlog != null && mLoadedBlogId != currentBlog.getRemoteBlogId()) {
             WordPress.currentPost = null;
             loadPosts(false);
         }
@@ -135,7 +135,7 @@ public void createSwitcher() {
 
         footer.setOnClickListener(new Button.OnClickListener() {
             public void onClick(View v) {
-                if (!WordPress.wpDB.findLocalChanges(WordPress.getCurrentBlog().getId(), isPage)) {
+                if (!WordPress.wpDB.findLocalChanges(WordPress.getCurrentBlog().getLocalTableBlogId(), isPage)) {
                     // first view is showing, show the second progress view
                     switcher.showNext();
                     // get 20 more posts
@@ -179,10 +179,10 @@ public void refreshPosts(final boolean loadMore) {
     public boolean loadPosts(boolean loadMore) { // loads posts from the db
         List<Map<String, Object>> loadedPosts;
         if (WordPress.currentBlog != null) {
-            mLoadedBlogId = WordPress.currentBlog.getBlogId();
+            mLoadedBlogId = WordPress.currentBlog.getRemoteBlogId();
         }
         try {
-            loadedPosts = WordPress.wpDB.loadUploadedPosts(WordPress.currentBlog.getId(), isPage);
+            loadedPosts = WordPress.wpDB.loadUploadedPosts(WordPress.currentBlog.getLocalTableBlogId(), isPage);
         } catch (Exception e1) {
             return false;
         }
@@ -322,7 +322,7 @@ public void onCreateContextMenu(ContextMenu menu, View v,
                         // Show comments menu option only if post allows commenting
                         boolean allowComments = false;
                         Post post = new Post(WordPress.currentBlog
-                                .getId(), mSelectedID, isPage);
+                                .getLocalTableBlogId(), mSelectedID, isPage);
                         if (post.getId() >= 0) {
                             allowComments = post.isMt_allow_comments();
                         }
@@ -432,10 +432,10 @@ private boolean loadDrafts() { // loads drafts from the db
         List<Map<String, Object>> loadedPosts;
         if (isPage) {
             loadedPosts = WordPress.wpDB.loadDrafts(
-                    WordPress.currentBlog.getId(), true);
+                    WordPress.currentBlog.getLocalTableBlogId(), true);
         } else {
             loadedPosts = WordPress.wpDB.loadDrafts(
-                    WordPress.currentBlog.getId(), false);
+                    WordPress.currentBlog.getLocalTableBlogId(), false);
         }
         if (loadedPosts != null) {
             mDraftIDs = new String[loadedPosts.size()];
@@ -520,7 +520,7 @@ public String statEventForViewClosing() {
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
-        Post post = new Post(WordPress.currentBlog.getId(), mSelectedID, isPage);
+        Post post = new Post(WordPress.currentBlog.getLocalTableBlogId(), mSelectedID, isPage);
 
         if (post.getId() < 0) {
             if (!getActivity().isFinishing()) {
@@ -559,7 +559,7 @@ public boolean onContextItemSelected(MenuItem item) {
                 Intent i = new Intent(getActivity(), PreviewPostActivity.class);
                 i.putExtra("isPage", itemGroupID == MENU_GROUP_PAGES ? true : false);
                 i.putExtra("postID", mSelectedID);
-                i.putExtra("blogID", WordPress.currentBlog.getId());
+                i.putExtra("blogID", WordPress.currentBlog.getLocalTableBlogId());
                 startActivity(i);
                 return true;
             case MENU_ITEM_SHARE:
@@ -625,7 +625,7 @@ protected Boolean doInBackground(List<?>... args) {
             XMLRPCClient client = new XMLRPCClient(mBlog.getUrl(),
                     mBlog.getHttpuser(),
                     mBlog.getHttppassword());
-            Object[] params = {mBlog.getBlogId(),
+            Object[] params = {mBlog.getRemoteBlogId(),
                     mBlog.getUsername(),
                     mBlog.getPassword(), recordCount};
             try {
@@ -636,13 +636,13 @@ protected Boolean doInBackground(List<?>... args) {
                         success = true;
                         List<Map<?, ?>> postsList = new ArrayList<Map<?, ?>>();
                         if (!mLoadMore) {
-                            WordPress.wpDB.deleteUploadedPosts(mBlog.getId(), mIsPage);
+                            WordPress.wpDB.deleteUploadedPosts(mBlog.getLocalTableBlogId(), mIsPage);
                         }
                         for (int ctr = 0; ctr < result.length; ctr++) {
                             Map<?, ?> postMap = (Map<?, ?>) result[ctr];
                             postsList.add(ctr, postMap);
                         }
-                        WordPress.wpDB.savePosts(postsList, mBlog.getId(), mIsPage);
+                        WordPress.wpDB.savePosts(postsList, mBlog.getLocalTableBlogId(), mIsPage);
                     }
                 }
             } catch (XMLRPCException e) {
@@ -668,7 +668,7 @@ public interface OnPostActionListener {
     }
 
     private void showPost(long selectedID) {
-        Post post = new Post(WordPress.currentBlog.getId(), selectedID, isPage);
+        Post post = new Post(WordPress.currentBlog.getLocalTableBlogId(), selectedID, isPage);
         if (post.getId() >= 0) {
             WordPress.currentPost = post;
             mOnPostSelectedListener.onPostSelected(post);
@@ -683,7 +683,7 @@ private void showPost(long selectedID) {
     }
 
     private void selectAndShowFirstPost() {
-        Post post = new Post(WordPress.currentBlog.getId(), Integer.valueOf(mPostIDs[0]), isPage);
+        Post post = new Post(WordPress.currentBlog.getLocalTableBlogId(), Integer.valueOf(mPostIDs[0]), isPage);
         if (post.getId() >= 0) {
             WordPress.currentPost = post;
             mOnPostSelectedListener.onPostSelected(post);
diff --git a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
index f1e514a07ca7..8efabaeca24c 100644
--- a/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
+++ b/src/org/wordpress/android/ui/posts/SelectCategoriesActivity.java
@@ -119,7 +119,7 @@ private void populateCategoryList() {
 
 
     private void populateOrFetchCategories() {
-        mCategories = CategoryNode.createCategoryTreeFromDB(blog.getId());
+        mCategories = CategoryNode.createCategoryTreeFromDB(blog.getLocalTableBlogId());
 
         if (mCategories.getChildren().size() > 0) {
             populateCategoryList();
@@ -190,7 +190,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
     public String fetchCategories() {
         String returnMessage;
         Object result[] = null;
-        Object[] params = { blog.getBlogId(), blog.getUsername(), blog.getPassword(), };
+        Object[] params = { blog.getRemoteBlogId(), blog.getUsername(), blog.getPassword(), };
         client = new XMLRPCClient(blog.getUrl(), blog.getHttpuser(), blog.getHttppassword());
 
         boolean success = false;
@@ -204,7 +204,7 @@ public String fetchCategories() {
 
         if (success) {
             // wipe out the categories table
-            WordPress.wpDB.clearCategories(blog.getId());
+            WordPress.wpDB.clearCategories(blog.getLocalTableBlogId());
 
             for (Object aResult : result) {
                 Map<?, ?> curHash = (Map<?, ?>) aResult;
@@ -213,7 +213,7 @@ public String fetchCategories() {
                 String categoryParentID = curHash.get("parentId").toString();
                 int convertedCategoryID = Integer.parseInt(categoryID);
                 int convertedCategoryParentID = Integer.parseInt(categoryParentID);
-                WordPress.wpDB.insertCategory(blog.getId(), convertedCategoryID, convertedCategoryParentID, categoryName);
+                WordPress.wpDB.insertCategory(blog.getLocalTableBlogId(), convertedCategoryID, convertedCategoryParentID, categoryName);
             }
             returnMessage = "gotCategories";
         } else {
@@ -247,7 +247,7 @@ public String addCategory(final String category_name, String category_slug, Stri
 
         client = new XMLRPCClient(blog.getUrl(), blog.getHttpuser(), blog.getHttppassword());
 
-        Object[] params = { blog.getBlogId(), blog.getUsername(), blog.getPassword(), struct };
+        Object[] params = { blog.getRemoteBlogId(), blog.getUsername(), blog.getPassword(), struct };
 
         Object result = null;
         try {
@@ -280,7 +280,7 @@ public void run() {
             }
 
             // Insert the new category into database
-            WordPress.wpDB.insertCategory(blog.getId(), category_id, parent_id, new_category_name);
+            WordPress.wpDB.insertCategory(blog.getLocalTableBlogId(), category_id, parent_id, new_category_name);
             returnString = "addCategory_success";
             // auto select new category
             mSelectedCategories.add(new_category_name);
@@ -341,7 +341,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
             return true;
         } else if (itemId == R.id.menu_new_category) {
             Bundle bundle = new Bundle();
-            bundle.putInt("id", blog.getId());
+            bundle.putInt("id", blog.getLocalTableBlogId());
             Intent i = new Intent(SelectCategoriesActivity.this, AddCategoryActivity.class);
             i.putExtras(bundle);
             startActivityForResult(i, 0);
@@ -357,7 +357,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
     private String getCanonicalCategoryName(int category_id) {
         String new_category_name = null;
         Map<?, ?> result = null;
-        Object[] params = { blog.getBlogId(), blog.getUsername(), blog.getPassword(), "category", category_id };
+        Object[] params = { blog.getRemoteBlogId(), blog.getUsername(), blog.getPassword(), "category", category_id };
         try {
             result = (Map<?, ?>) client.call("wp.getTerm", params);
         } catch (XMLRPCException e) {
diff --git a/src/org/wordpress/android/ui/posts/ViewPostFragment.java b/src/org/wordpress/android/ui/posts/ViewPostFragment.java
index 08a7a7b3868c..5b1a4a070c7a 100644
--- a/src/org/wordpress/android/ui/posts/ViewPostFragment.java
+++ b/src/org/wordpress/android/ui/posts/ViewPostFragment.java
@@ -343,7 +343,7 @@ public void onActionResult(boolean succeeded) {
             }
         };
 
-        int accountId = WordPress.getCurrentBlogAccountId();
+        int accountId = WordPress.getCurrentLocalTableBlogId();
         CommentActions.addComment(accountId, WordPress.currentPost.getPostid(), commentText, actionListener);
     }
 
diff --git a/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java b/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
index d23efe8e6b17..760bf4731523 100644
--- a/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
+++ b/src/org/wordpress/android/ui/prefs/BlogPreferencesActivity.java
@@ -146,7 +146,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
 
         blog.save();
         
-        if (WordPress.getCurrentBlog().getId() == blog.getId())
+        if (WordPress.getCurrentBlog().getLocalTableBlogId() == blog.getLocalTableBlogId())
             WordPress.currentBlog = blog;
         
         // exit settings screen
@@ -311,7 +311,7 @@ public void removeBlog(View view) {
         dialogBuilder.setMessage(getResources().getText(R.string.sure_to_remove_account));
         dialogBuilder.setPositiveButton(getResources().getText(R.string.yes), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int whichButton) {
-                boolean deleteSuccess = WordPress.wpDB.deleteAccount(BlogPreferencesActivity.this, blog.getId());
+                boolean deleteSuccess = WordPress.wpDB.deleteAccount(BlogPreferencesActivity.this, blog.getLocalTableBlogId());
                 if (deleteSuccess) {
                     Toast.makeText(activity, getResources().getText(R.string.blog_removed_successfully), Toast.LENGTH_SHORT)
                             .show();
@@ -348,7 +348,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
     public void viewAdmin(View view) {
         mIsViewingAdmin = true;
         Intent i = new Intent(this, DashboardActivity.class);
-        i.putExtra("blogID", blog.getId());
+        i.putExtra("blogID", blog.getLocalTableBlogId());
         startActivity(i);
     }
 }
diff --git a/src/org/wordpress/android/ui/reader_native/adapters/ReaderReblogAdapter.java b/src/org/wordpress/android/ui/reader_native/adapters/ReaderReblogAdapter.java
index 2a15f892b00e..b96c57e390fd 100644
--- a/src/org/wordpress/android/ui/reader_native/adapters/ReaderReblogAdapter.java
+++ b/src/org/wordpress/android/ui/reader_native/adapters/ReaderReblogAdapter.java
@@ -115,7 +115,7 @@ protected Boolean doInBackground(Void... voids) {
                 return false;
 
             Blog blog = WordPress.getCurrentBlog();
-            int currentBlogId = (blog != null ? blog.getBlogId() : 0);
+            int currentBlogId = (blog != null ? blog.getRemoteBlogId() : 0);
 
             Iterator<Map<String, Object>> it = accounts.iterator();
             while (it.hasNext()) {
diff --git a/src/org/wordpress/android/ui/stats/StatsActivity.java b/src/org/wordpress/android/ui/stats/StatsActivity.java
index c343d5c82721..4f04af4f43ee 100644
--- a/src/org/wordpress/android/ui/stats/StatsActivity.java
+++ b/src/org/wordpress/android/ui/stats/StatsActivity.java
@@ -174,7 +174,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     Map<String, String> args = new HashMap<String, String>();
                     args.put("jetpack_client_id", "jetpack_client_id");
                     Object[] params = {
-                            currentBlog.getBlogId(), currentBlog.getUsername(), currentBlog.getPassword(), args
+                            currentBlog.getRemoteBlogId(), currentBlog.getUsername(), currentBlog.getPassword(), args
                     };
                     xmlrpcClient.callAsync(new XMLRPCCallback() {
                         @Override
@@ -448,7 +448,7 @@ private void refreshStats() {
         String blogId;
         
         if (WordPress.getCurrentBlog().isDotcomFlag() && dotComCredentialsMatch())
-            blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+            blogId = String.valueOf(WordPress.getCurrentBlog().getRemoteBlogId());
         else {
             blogId = getBlogId();
             if (blogId == null) {
@@ -511,7 +511,7 @@ public void onClick(DialogInterface dialog, int id) {
     public String getBlogId() {
         // for dotcom blogs that were added manually
         if (WordPress.getCurrentBlog().isDotcomFlag() && !dotComCredentialsMatch())
-            return String.valueOf(WordPress.getCurrentBlog().getBlogId());
+            return String.valueOf(WordPress.getCurrentBlog().getRemoteBlogId());
 
         // for self-hosted blogs
         try {
diff --git a/src/org/wordpress/android/ui/stats/StatsCommentsFragment.java b/src/org/wordpress/android/ui/stats/StatsCommentsFragment.java
index baa9f3864252..cdc683acd0eb 100644
--- a/src/org/wordpress/android/ui/stats/StatsCommentsFragment.java
+++ b/src/org/wordpress/android/ui/stats/StatsCommentsFragment.java
@@ -235,7 +235,7 @@ private void refreshStatsFromFile() {
             if (WordPress.getCurrentBlog() == null)
                 return;
             
-            final String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+            final String blogId = String.valueOf(WordPress.getCurrentBlog().getRemoteBlogId());
             new AsyncTask<Void, Void, StatsSummary>() {
 
                 @Override
diff --git a/src/org/wordpress/android/ui/themes/ThemeBrowserActivity.java b/src/org/wordpress/android/ui/themes/ThemeBrowserActivity.java
index 01dcda544c14..7d1b6929d406 100644
--- a/src/org/wordpress/android/ui/themes/ThemeBrowserActivity.java
+++ b/src/org/wordpress/android/ui/themes/ThemeBrowserActivity.java
@@ -305,7 +305,7 @@ public void onBackPressed() {
     }
 
     private String getBlogId() {
-        return String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        return String.valueOf(WordPress.getCurrentBlog().getRemoteBlogId());
     }
 
     public class FetchThemesTask extends AsyncTask<JSONObject, Void, ArrayList<Theme>> {
diff --git a/src/org/wordpress/android/ui/themes/ThemeDetailsFragment.java b/src/org/wordpress/android/ui/themes/ThemeDetailsFragment.java
index 90334985c19b..a9ac276c3fd2 100644
--- a/src/org/wordpress/android/ui/themes/ThemeDetailsFragment.java
+++ b/src/org/wordpress/android/ui/themes/ThemeDetailsFragment.java
@@ -240,7 +240,7 @@ public void onThemeActivated(boolean activated) {
     }
     
     public void loadTheme(String themeId) {
-        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        String blogId = String.valueOf(WordPress.getCurrentBlog().getRemoteBlogId());
         Theme theme = WordPress.wpDB.getTheme(blogId, themeId);
         if (theme != null) {
             if (mNameView != null) {
diff --git a/src/org/wordpress/android/ui/themes/ThemeTabFragment.java b/src/org/wordpress/android/ui/themes/ThemeTabFragment.java
index a07c2d436393..81339a96b5f0 100644
--- a/src/org/wordpress/android/ui/themes/ThemeTabFragment.java
+++ b/src/org/wordpress/android/ui/themes/ThemeTabFragment.java
@@ -200,7 +200,7 @@ private void refresh() {
     }
     
     protected String getBlogId() {
-        return String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        return String.valueOf(WordPress.getCurrentBlog().getRemoteBlogId());
     }
 
     @Override
diff --git a/src/org/wordpress/android/util/MediaDeleteService.java b/src/org/wordpress/android/util/MediaDeleteService.java
index 29cc3794c7cc..c31c7b41dd5a 100644
--- a/src/org/wordpress/android/util/MediaDeleteService.java
+++ b/src/org/wordpress/android/util/MediaDeleteService.java
@@ -74,7 +74,7 @@ private Cursor getQueueItem() {
         if (WordPress.getCurrentBlog() == null)
             return null;
         
-        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
         return WordPress.wpDB.getMediaDeleteQueueItem(blogId);
     }
     
diff --git a/src/org/wordpress/android/util/MediaUploadService.java b/src/org/wordpress/android/util/MediaUploadService.java
index 4db85b2f94e4..73c2dd80f2f9 100644
--- a/src/org/wordpress/android/util/MediaUploadService.java
+++ b/src/org/wordpress/android/util/MediaUploadService.java
@@ -84,7 +84,7 @@ private void cancelOldUploads() {
         // Since we won't be able to receive notifications for these, set them to 'failed'.
         
         if(WordPress.getCurrentBlog() != null){
-            String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+            String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
             WordPress.wpDB.setMediaUploadingToFailed(blogId);
     
             sendUpdateBroadcast(null);
@@ -95,7 +95,7 @@ private Cursor getQueue() {
         if (WordPress.getCurrentBlog() == null)
             return null;
         
-        String blogId = String.valueOf(WordPress.getCurrentBlog().getBlogId());
+        String blogId = String.valueOf(WordPress.getCurrentBlog().getLocalTableBlogId());
         return WordPress.wpDB.getMediaUploadQueue(blogId);
     }
     
diff --git a/src/org/wordpress/android/util/PostUploadService.java b/src/org/wordpress/android/util/PostUploadService.java
index 386b9a2e2815..b0005069a60d 100644
--- a/src/org/wordpress/android/util/PostUploadService.java
+++ b/src/org/wordpress/android/util/PostUploadService.java
@@ -394,7 +394,7 @@ protected Boolean doInBackground(Post... posts) {
             Object[] params;
 
             if (post.isLocalDraft() && !post.isUploaded())
-                params = new Object[]{blog.getBlogId(), blog.getUsername(), blog.getPassword(),
+                params = new Object[]{blog.getRemoteBlogId(), blog.getUsername(), blog.getPassword(),
                         contentStruct, publishThis};
             else
                 params = new Object[]{post.getPostid(), blog.getUsername(), blog.getPassword(), contentStruct,
diff --git a/src/org/xmlrpc/android/ApiHelper.java b/src/org/xmlrpc/android/ApiHelper.java
index 2994d075488e..c9927fa9cadb 100644
--- a/src/org/xmlrpc/android/ApiHelper.java
+++ b/src/org/xmlrpc/android/ApiHelper.java
@@ -53,7 +53,7 @@ static void refreshComments(final int id, final Context ctx) {
         hPost.put("post_id", "");
         hPost.put("number", 30);
 
-        Object[] params = { blog.getBlogId(), blog.getUsername(),
+        Object[] params = { blog.getRemoteBlogId(), blog.getUsername(),
                 blog.getPassword(), hPost };
         Object[] result = null;
         try {
@@ -146,7 +146,7 @@ protected Object doInBackground(List<?>... args) {
                     blog.getHttppassword());
 
             Object result = null;
-            Object[] params = { blog.getBlogId(), blog.getUsername(),
+            Object[] params = { blog.getRemoteBlogId(), blog.getUsername(),
                     blog.getPassword(), "show-supported" };
             try {
                 result = (Object) client.call("wp.getPostFormats", params);
@@ -177,7 +177,7 @@ public interface Callback {
         private Callback mCallback;
 
         public RefreshBlogContentTask(Context context, Blog blog, Callback callback) {
-            mBlogIdentifier = new BlogIdentifier(blog.getUrl(), blog.getBlogId());
+            mBlogIdentifier = new BlogIdentifier(blog.getUrl(), blog.getRemoteBlogId());
             if (refreshedBlogs.contains(mBlogIdentifier)) {
                 cancel(true);
             } else {
@@ -251,7 +251,7 @@ protected Boolean doInBackground(Boolean... params) {
                 hPost.put("admin_url", "admin_url");
                 hPost.put("login_url", "login_url");
 
-                Object[] vParams = {mBlog.getBlogId(), mBlog.getUsername(), mBlog.getPassword(),
+                Object[] vParams = {mBlog.getRemoteBlogId(), mBlog.getUsername(), mBlog.getPassword(),
                         hPost};
                 Object versionResult;
                 try {
@@ -273,7 +273,7 @@ protected Boolean doInBackground(Boolean... params) {
             }
 
             // Check if user is an admin
-            Object[] userParams = {mBlog.getBlogId(), mBlog.getUsername(), mBlog.getPassword()};
+            Object[] userParams = {mBlog.getRemoteBlogId(), mBlog.getUsername(), mBlog.getPassword()};
             try {
                 Map<String, Object> userInfos = (HashMap<String, Object>)
                         client.call("wp.getProfile", userParams);
@@ -286,7 +286,7 @@ protected Boolean doInBackground(Boolean... params) {
             Map<String, Object> hPost = new HashMap<String, Object>();
             hPost.put("number", 30);
             Object[] commentParams = {
-                    mBlog.getBlogId(), mBlog.getUsername(), mBlog.getPassword(), hPost
+                    mBlog.getRemoteBlogId(), mBlog.getUsername(), mBlog.getPassword(), hPost
             };
 
             try {
@@ -351,7 +351,7 @@ protected void onPostExecute(Boolean success) {
 
             String formattedDate = getFormattedCommentDate(ctx, d);
 
-            dbValues.put("blogID", String.valueOf(blog.getId()));
+            dbValues.put("blogID", String.valueOf(blog.getLocalTableBlogId()));
             dbValues.put("postID", postID);
             dbValues.put("commentID", commentID);
             dbValues.put("author", author);
@@ -424,7 +424,7 @@ protected Integer doInBackground(List<?>... params) {
                 return -1;
             }
 
-            String blogId = String.valueOf(blog.getBlogId());
+            String blogId = String.valueOf(blog.getLocalTableBlogId());
             
             client = new XMLRPCClient(blog.getUrl(),
                     blog.getHttpuser(),
@@ -442,7 +442,7 @@ else if(mFilter == Filter.UNATTACHED)
                 
             
             Object[] apiParams = { 
-                    blog.getBlogId(),
+                    blog.getRemoteBlogId(),
                     blog.getUsername(),
                     blog.getPassword(),
                     filter
@@ -534,7 +534,7 @@ protected Boolean doInBackground(List<?>... params) {
             contentStruct.put("post_excerpt", mCaption);
             
             Object[] apiParams = {
-                    blog.getBlogId(),
+                    blog.getRemoteBlogId(),
                     blog.getUsername(),
                     blog.getPassword(),
                     mMediaId,
@@ -590,14 +590,14 @@ protected MediaFile doInBackground(List<?>... params) {
                 return null;
             }
             
-            String blogId = String.valueOf(blog.getBlogId());
+            String blogId = String.valueOf(blog.getLocalTableBlogId());
             
             client = new XMLRPCClient(blog.getUrl(),
                     blog.getHttpuser(),
                     blog.getHttppassword());
             
             Object[] apiParams = { 
-                    blog.getBlogId(),
+                    blog.getRemoteBlogId(),
                     blog.getUsername(),
                     blog.getPassword(),
                     mMediaId
@@ -747,7 +747,7 @@ protected Boolean doInBackground(List<?>... params) {
                     blog.getHttppassword());
             
             Object[] apiParams = new Object[] {
-                    blog.getBlogId(),
+                    blog.getRemoteBlogId(),
                     blog.getUsername(),
                     blog.getPassword(),
                     mMediaId
@@ -809,7 +809,7 @@ protected FeatureSet doInBackground(List<?>... params) {
                     blog.getHttppassword());
             
             Object[] apiParams = new Object[] {
-                    blog.getBlogId(),
+                    blog.getRemoteBlogId(),
                     blog.getUsername(),
                     blog.getPassword(),
             };
@@ -822,7 +822,7 @@ protected FeatureSet doInBackground(List<?>... params) {
             }
             
             if (resultMap != null) {
-                return new FeatureSet(blog.getBlogId(), resultMap);
+                return new FeatureSet(blog.getRemoteBlogId(), resultMap);
             }
             
             return null;