diff --git a/Makefile.am b/Makefile.am
index 39a0e7e..94a9fbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,11 +104,9 @@
   src/security/certificate/certificate.cpp \
   src/security/certificate/identity-certificate.cpp \
   src/security/certificate/public-key.cpp \
-  src/security/identity/basic-identity-storage.cpp \
-  src/security/identity/identity-storage.cpp \
-  src/security/identity/memory-identity-storage.cpp \
-  src/security/identity/memory-private-key-storage.cpp \
-  src/security/key-chain.cpp \
+  src/security/identity/sec-public-info-sqlite3.cpp \
+  src/security/identity/sec-public-info-memory.cpp \
+  src/security/identity/sec-tpm-memory.cpp \
   src/security/verifier.cpp \
   src/security/policy/no-verify-policy-manager.cpp \
   src/security/policy/self-verify-policy-manager.cpp \
@@ -126,9 +124,9 @@
   src/util/time.hpp
 
 if HAVE_OSX_SECURITY
-  libndn_cpp_la_SOURCES += src/security/identity/osx-private-key-storage.cpp
+  libndn_cpp_la_SOURCES += src/security/identity/sec-tpm-osx.cpp
 else
-  EXTRA_DIST = src/security/identity/osx-private-key-storage.cpp
+  EXTRA_DIST = src/security/identity/sec-tpm-osx.cpp
 endif
 
 libndn_cpp_la_LIBADD  = @OPENSSL_LIBS@     @CRYPTOPP_LIBS@     @OSX_SECURITY_LIBS@  @BOOST_SYSTEM_LIB@