diff --git a/Makefile.am b/Makefile.am
index a124878..99309c6 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 \
diff --git a/Makefile.in b/Makefile.in
index 49d2d4b..533be0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 \
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/key.cpp b/src/key.cpp
index 24501ff..fbd7729 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -6,7 +6,7 @@
  */
 
 #include <ndn-cpp/common.hpp>
-#include <ndn-cpp/key.hpp>
+#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>