diff --git a/tests/unit-tests/security/test-signature-sha256.cpp b/tests/unit-tests/security/test-digest-sha256.cpp
similarity index 95%
rename from tests/unit-tests/security/test-signature-sha256.cpp
rename to tests/unit-tests/security/test-digest-sha256.cpp
index 7aac44e..94ded5b 100644
--- a/tests/unit-tests/security/test-signature-sha256.cpp
+++ b/tests/unit-tests/security/test-digest-sha256.cpp
@@ -29,7 +29,7 @@
 using namespace std;
 namespace ndn {
 
-BOOST_AUTO_TEST_SUITE(SecurityTestSignatureSha256)
+BOOST_AUTO_TEST_SUITE(SecurityTestDigestSha256)
 
 string SHA256_RESULT("a883dafc480d466ee04e0d6da986bd78eb1fdd2178d04693723da3a8f95d42f4");
 
@@ -61,7 +61,7 @@
 
   testData.wireEncode();
 
-  SignatureSha256 sig(testData.getSignature());
+  DigestSha256 sig(testData.getSignature());
 
   BOOST_REQUIRE(Validator::verifySignature(testData, sig));
 }
diff --git a/tests/unit-tests/test-data.cpp b/tests/unit-tests/test-data.cpp
index f86c2bc..e7be94e 100644
--- a/tests/unit-tests/test-data.cpp
+++ b/tests/unit-tests/test-data.cpp
@@ -232,12 +232,12 @@
   BOOST_CHECK_EQUAL(a == b, true);
   BOOST_CHECK_EQUAL(a != b, false);
 
-  a = SignatureSha256();
+  a = DigestSha256();
   b = SignatureSha256WithRsa();
   BOOST_CHECK_EQUAL(a == b, false);
   BOOST_CHECK_EQUAL(a != b, true);
 
-  b = SignatureSha256();
+  b = DigestSha256();
   BOOST_CHECK_EQUAL(a == b, true);
   BOOST_CHECK_EQUAL(a != b, false);
 }
diff --git a/tests/unit-tests/test-interest.cpp b/tests/unit-tests/test-interest.cpp
index 5bb0a85..f02a8a8 100644
--- a/tests/unit-tests/test-interest.cpp
+++ b/tests/unit-tests/test-interest.cpp
@@ -22,7 +22,7 @@
 #include "interest.hpp"
 #include "data.hpp"
 #include "security/signature-sha256-with-rsa.hpp"
-#include "security/signature-sha256.hpp"
+#include "security/digest-sha256.hpp"
 #include "encoding/buffer-stream.hpp"
 
 #include "boost-test.hpp"
@@ -492,7 +492,7 @@
   interest.setPublisherPublicKeyLocator(KeyLocator("ndn:/B"));
 
   Data data4 = data;
-  SignatureSha256 signature4; // violates PublisherPublicKeyLocator
+  DigestSha256 signature4; // violates PublisherPublicKeyLocator
   data4.setSignature(signature4);
   data4.wireEncode();
   BOOST_CHECK_EQUAL(interest.matchesData(data4), false);