diff --git a/Makefile.am b/Makefile.am
index 4f3bc6c..a124878 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/Makefile.in b/Makefile.in
index a5dfe8d..49d2d4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 \
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.cpp
index 0cf59ed..24501ff 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -7,7 +7,7 @@
 
 #include <ndn-cpp/common.hpp>
 #include <ndn-cpp/key.hpp>
-#include "c/key.h"
+#include "c/key-locator.h"
 
 using namespace std;