diff --git a/src/security/identity/basic-identity-storage.cpp b/src/security/identity/basic-identity-storage.cpp
index 67a68f0..85af9a9 100644
--- a/src/security/identity/basic-identity-storage.cpp
+++ b/src/security/identity/basic-identity-storage.cpp
@@ -100,10 +100,11 @@
     // Strip the ending '/'.
     homeDir.erase(homeDir.size() - 1);
   
-  string identityDir = homeDir + '/' + ".ndn-identity";
+  string identityDir = homeDir + '/' + ".ndnx";
+  // TODO: Handle non-unix file systems which don't have "mkdir -p".
   ::system(("mkdir -p " + identityDir).c_str());
   
-  int res = sqlite3_open((identityDir + '/' + "identity.db").c_str(), &database_);
+  int res = sqlite3_open((identityDir + '/' + "ndnsec-identity.db").c_str(), &database_);
 
   if (res != SQLITE_OK)
     throw SecurityException("identity DB cannot be opened/created");