diff --git a/CHANGELOG b/CHANGELOG
index 32ad567..dddc3e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@
 Changes
 * http://redmine.named-data.net/issues/1085 In Name::Component, added comparison operators.
 * http://redmine.named-data.net/issues/1086 In Name::getPrefix, support a negative argument, e.g. getPrefix(-1).
+* http://redmine.named-data.net/issues/1089 Renamed key.hpp to key-locator.hpp .
 * MetaInfo: Added setFinalBlockID for Name::Component, remove unused setFinalBlockID which take uint8_t*, etc.
 * Fix clang compiler warnings: Include headers, parentheses and cast explicitly.
 * Moved class ExcludeEntry to inner class Exclude::Entry.
diff --git a/Makefile.am b/Makefile.am
index 99309c6..0f2c0b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,7 +111,7 @@
   src/face.cpp \
   src/forwarding-entry.cpp \
   src/interest.cpp \
-  src/key.cpp \
+  src/key-locator.cpp \
   src/name.cpp \
   src/node.cpp \
   src/publisher-public-key-digest.cpp \
diff --git a/Makefile.in b/Makefile.in
index 533be0e..77170c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -179,7 +179,7 @@
 	src/c/util/ndn_realloc.lo src/c/util/time.lo
 am_libndn_cpp_la_OBJECTS = $(am__objects_2) $(am__objects_1) \
 	src/common.lo src/data.lo src/face.lo src/forwarding-entry.lo \
-	src/interest.lo src/key.lo src/name.lo src/node.lo \
+	src/interest.lo src/key-locator.lo src/name.lo src/node.lo \
 	src/publisher-public-key-digest.lo \
 	src/sha256-with-rsa-signature.lo \
 	src/encoding/binary-xml-wire-format.lo \
@@ -671,7 +671,7 @@
   src/face.cpp \
   src/forwarding-entry.cpp \
   src/interest.cpp \
-  src/key.cpp \
+  src/key-locator.cpp \
   src/name.cpp \
   src/node.cpp \
   src/publisher-public-key-digest.cpp \
@@ -886,7 +886,7 @@
 src/forwarding-entry.lo: src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/interest.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/key.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/key-locator.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/name.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/node.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/publisher-public-key-digest.lo: src/$(am__dirstamp) \
@@ -1143,7 +1143,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/face.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/forwarding-entry.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/interest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/key.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/key-locator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/name.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/node.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/publisher-public-key-digest.Plo@am__quote@
diff --git a/src/key.cpp b/src/key-locator.cpp
similarity index 100%
rename from src/key.cpp
rename to src/key-locator.cpp