diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index 09cb7e8d8..1b1198974 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -271,7 +271,7 @@ public class TagViewFragment extends TaskListFragment {
 
     private void updateCommentCount() {
         if (tagData != null) {
-            long lastViewedComments = Preferences.getLong(TagUpdatesFragment.UPDATES_LAST_VIEWED + tagData.getValue(TagData.REMOTE_ID), 0);
+            long lastViewedComments = Preferences.getLong(TagUpdatesFragment.UPDATES_LAST_VIEWED + tagData.getValue(TagData.UUID), 0);
             int unreadCount = 0;
             TodorooCursor<Update> commentCursor = tagDataService.getUpdatesWithExtraCriteria(tagData, Update.CREATION_DATE.gt(lastViewedComments));
             try {
@@ -472,7 +472,7 @@ public class TagViewFragment extends TaskListFragment {
         public void onReceive(Context context, Intent intent) {
             if(!intent.hasExtra("tag_id"))
                 return;
-            if(tagData == null || !Long.toString(tagData.getValue(TagData.REMOTE_ID)).equals(intent.getStringExtra("tag_id")))
+            if(tagData == null || !tagData.getValue(TagData.UUID).toString().equals(intent.getStringExtra("tag_id")))
                 return;
 
             getActivity().runOnUiThread(new Runnable() {
@@ -484,7 +484,7 @@ public class TagViewFragment extends TaskListFragment {
             refreshData(false);
 
             NotificationManager nm = new AndroidNotificationManager(ContextManager.getContext());
-            nm.cancel(tagData.getValue(TagData.REMOTE_ID).intValue());
+            nm.cancel(tagData.getValue(TagData.UUID).intValue());
         }
     };
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagMetadata.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagMetadata.java
index 3a5f2635f..b61f694e8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagMetadata.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagMetadata.java
@@ -33,7 +33,7 @@ public class TagMetadata {
 
     /**
      * New metadata object for linking a task to the specified tag. The task
-     * object should be saved and have the remote_id property. All parameters
+     * object should be saved and have the uuid property. All parameters
      * are manditory
      * @param task
      * @param tagName
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index 10127c6b8..a4b3abce8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -182,7 +182,7 @@ public final class TagService {
         Long[] emergentTags = getEmergentTagIds();
 
         return new QueryTemplate().where(Criterion.and(
-                Criterion.not(Task.REMOTE_ID.in(Query.select(TagMetadata.TASK_UUID).from(Metadata.TABLE)
+                Criterion.not(Task.UUID.in(Query.select(TagMetadata.TASK_UUID).from(Metadata.TABLE)
                         .where(Criterion.and(MetadataCriteria.withKey(TagMetadata.KEY), Metadata.DELETION_DATE.eq(0), Criterion.not(TagMetadata.TAG_UUID.in(emergentTags)))))),
                 TaskCriteria.isActive(),
                 TaskApiDao.TaskCriteria.ownedByMe(),
@@ -294,13 +294,13 @@ public final class TagService {
     }
 
     public TodorooCursor<TagData> getTagDataForTask(long taskId, boolean includeEmergent, Property<?>... properties) {
-        Criterion criterion = TagData.REMOTE_ID.in(Query.select(TagMetadata.TAG_UUID)
+        Criterion criterion = TagData.UUID.in(Query.select(TagMetadata.TAG_UUID)
                 .from(Metadata.TABLE)
                 .where(Criterion.and(MetadataCriteria.withKey(TagMetadata.KEY),
                         Metadata.DELETION_DATE.eq(0),
                         Metadata.TASK.eq(taskId))));
         if (!includeEmergent)
-            criterion = Criterion.and(Criterion.not(TagData.REMOTE_ID.in(getEmergentTagIds())), criterion);
+            criterion = Criterion.and(Criterion.not(TagData.ID.in(getEmergentTagIds())), criterion);
 
         return tagDataService.query(Query.select(properties).where(criterion));
     }