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 4f3bc6c..0f2c0b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@
   include/ndn-cpp/forwarding-entry.hpp \
   include/ndn-cpp/forwarding-flags.hpp \
   include/ndn-cpp/interest.hpp \
-  include/ndn-cpp/key.hpp \
+  include/ndn-cpp/key-locator.hpp \
   include/ndn-cpp/name.hpp \
   include/ndn-cpp/node.hpp \
   include/ndn-cpp/publisher-public-key-digest.hpp \
@@ -80,6 +80,7 @@
   src/c/forwarding-entry.h \
   src/c/forwarding-flags.c \
   src/c/interest.c src/c/interest.h \
+  src/c/key-locator.h \
   src/c/name.c src/c/name.h \
   src/c/publisher-public-key-digest.h \
   src/c/encoding/binary-xml.h \
@@ -110,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 a5dfe8d..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 \
@@ -595,7 +595,7 @@
   include/ndn-cpp/forwarding-entry.hpp \
   include/ndn-cpp/forwarding-flags.hpp \
   include/ndn-cpp/interest.hpp \
-  include/ndn-cpp/key.hpp \
+  include/ndn-cpp/key-locator.hpp \
   include/ndn-cpp/name.hpp \
   include/ndn-cpp/node.hpp \
   include/ndn-cpp/publisher-public-key-digest.hpp \
@@ -639,6 +639,7 @@
   src/c/forwarding-entry.h \
   src/c/forwarding-flags.c \
   src/c/interest.c src/c/interest.h \
+  src/c/key-locator.h \
   src/c/name.c src/c/name.h \
   src/c/publisher-public-key-digest.h \
   src/c/encoding/binary-xml.h \
@@ -670,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 \
@@ -885,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) \
@@ -1142,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/include/ndn-cpp/key.hpp b/include/ndn-cpp/key-locator.hpp
similarity index 97%
rename from include/ndn-cpp/key.hpp
rename to include/ndn-cpp/key-locator.hpp
index b81f3bf..5c1f6c1 100644
--- a/include/ndn-cpp/key.hpp
+++ b/include/ndn-cpp/key-locator.hpp
@@ -5,8 +5,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#ifndef NDN_KEY_HPP
-#define NDN_KEY_HPP
+#ifndef NDN_KEY_LOCATOR_HPP
+#define NDN_KEY_LOCATOR_HPP
 
 #include <vector>
 #include "c/key-types.h"
diff --git a/include/ndn-cpp/sha256-with-rsa-signature.hpp b/include/ndn-cpp/sha256-with-rsa-signature.hpp
index ceb5c5b..d2e5374 100644
--- a/include/ndn-cpp/sha256-with-rsa-signature.hpp
+++ b/include/ndn-cpp/sha256-with-rsa-signature.hpp
@@ -9,7 +9,7 @@
 #define NDN_SHA256_WITH_RSA_SIGNATURE_HPP
 
 #include "data.hpp"
-#include "key.hpp"
+#include "key-locator.hpp"
 #include "publisher-public-key-digest.hpp"
 
 namespace ndn {
diff --git a/src/c/data.h b/src/c/data.h
index 68ed6ed..4750ae9 100644
--- a/src/c/data.h
+++ b/src/c/data.h
@@ -10,7 +10,7 @@
 #include <ndn-cpp/c/data-types.h>
 #include "name.h"
 #include "publisher-public-key-digest.h"
-#include "key.h"
+#include "key-locator.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/c/encoding/binary-xml-key.h b/src/c/encoding/binary-xml-key.h
index 391fa72..efd8f54 100644
--- a/src/c/encoding/binary-xml-key.h
+++ b/src/c/encoding/binary-xml-key.h
@@ -7,7 +7,7 @@
 #ifndef NDN_BINARYXMLKEY_H
 #define NDN_BINARYXMLKEY_H
 
-#include "../key.h"
+#include "../key-locator.h"
 #include "../errors.h"
 #include "binary-xml-encoder.h"
 #include "binary-xml-decoder.h"
diff --git a/src/c/key.h b/src/c/key-locator.h
similarity index 97%
rename from src/c/key.h
rename to src/c/key-locator.h
index b7f8751..b609d97 100644
--- a/src/c/key.h
+++ b/src/c/key-locator.h
@@ -4,8 +4,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#ifndef NDN_KEY_H
-#define NDN_KEY_H
+#ifndef NDN_KEY_LOCATOR_H
+#define NDN_KEY_LOCATOR_H
 
 #include <ndn-cpp/c/key-types.h>
 #include "name.h"
diff --git a/src/key.cpp b/src/key-locator.cpp
similarity index 93%
rename from src/key.cpp
rename to src/key-locator.cpp
index 0cf59ed..fbd7729 100644
--- a/src/key.cpp
+++ b/src/key-locator.cpp
@@ -6,8 +6,8 @@
  */
 
 #include <ndn-cpp/common.hpp>
-#include <ndn-cpp/key.hpp>
-#include "c/key.h"
+#include <ndn-cpp/key-locator.hpp>
+#include "c/key-locator.h"
 
 using namespace std;
 
diff --git a/src/security/identity/identity-manager.cpp b/src/security/identity/identity-manager.cpp
index 10168d1..28e1d10 100644
--- a/src/security/identity/identity-manager.cpp
+++ b/src/security/identity/identity-manager.cpp
@@ -16,7 +16,7 @@
 #include <ctime>
 #include <fstream>
 #include <math.h>
-#include <ndn-cpp/key.hpp>
+#include <ndn-cpp/key-locator.hpp>
 #include <ndn-cpp/sha256-with-rsa-signature.hpp>
 #include <ndn-cpp/security/security-exception.hpp>
 #include "../../util/logging.hpp"
diff --git a/tests/test-encode-decode-benchmark.cpp b/tests/test-encode-decode-benchmark.cpp
index 4213e76..344a02f 100644
--- a/tests/test-encode-decode-benchmark.cpp
+++ b/tests/test-encode-decode-benchmark.cpp
@@ -12,7 +12,7 @@
 #include <stdexcept>
 #include <ndn-cpp/data.hpp>
 #include <ndn-cpp/sha256-with-rsa-signature.hpp>
-#include <ndn-cpp/key.hpp>
+#include <ndn-cpp/key-locator.hpp>
 #include <ndn-cpp/security/key-chain.hpp>
 #include <ndn-cpp/security/identity/memory-identity-storage.hpp>
 #include <ndn-cpp/security/identity/memory-private-key-storage.hpp>