diff --git a/js/id/actions/change_entity_tags.js b/js/id/actions/change_tags.js
similarity index 71%
rename from js/id/actions/change_entity_tags.js
rename to js/id/actions/change_tags.js
index 96901c2eb..c5972644e 100644
--- a/js/id/actions/change_entity_tags.js
+++ b/js/id/actions/change_tags.js
@@ -1,4 +1,4 @@
-iD.actions.ChangeEntityTags = function(entityId, tags) {
+iD.actions.ChangeTags = function(entityId, tags) {
     return function(graph) {
         var entity = graph.entity(entityId);
         return graph.replace(entity.update({tags: tags}));
diff --git a/js/id/modes/select.js b/js/id/modes/select.js
index 3e0acc5a1..83e0d72b8 100644
--- a/js/id/modes/select.js
+++ b/js/id/modes/select.js
@@ -13,7 +13,7 @@ iD.modes.Select = function(entity, initial) {
     function changeTags(d, tags) {
         if (!_.isEqual(entity.tags, tags)) {
             mode.history.perform(
-                iD.actions.ChangeEntityTags(d.id, tags),
+                iD.actions.ChangeTags(d.id, tags),
                 t('operations.change_tags.annotation'));
         }
     }
diff --git a/test/spec/actions/change_entity_tags.js b/test/spec/actions/change_entity_tags.js
index bfa9830c6..0cc198230 100644
--- a/test/spec/actions/change_entity_tags.js
+++ b/test/spec/actions/change_entity_tags.js
@@ -1,8 +1,8 @@
-describe("iD.actions.ChangeEntityTags", function () {
+describe("iD.actions.ChangeTags", function () {
     it("changes an entity's tags", function () {
         var entity = iD.Entity(),
             tags   = {foo: 'bar'},
-            graph  = iD.actions.ChangeEntityTags(entity.id, tags)(iD.Graph([entity]));
+            graph  = iD.actions.ChangeTags(entity.id, tags)(iD.Graph([entity]));
         expect(graph.entity(entity.id).tags).to.eql(tags);
     });
 });