diff --git a/.gitignore b/.gitignore
index 5248d406..c7c72543 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,7 +97,7 @@ test/default/hash3
test/default/onetimeauth
test/default/onetimeauth2
test/default/onetimeauth7
-test/default/pwhash
+test/default/pwhash_scrypt
test/default/pwhash_scrypt_ll
test/default/randombytes
test/default/scalarmult
diff --git a/builds/msvc/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj
index e8637bdf..49771481 100644
--- a/builds/msvc/vs2010/test/test.vcxproj
+++ b/builds/msvc/vs2010/test/test.vcxproj
@@ -157,7 +157,7 @@
true
-
+
true
diff --git a/builds/msvc/vs2010/test/test.vcxproj.filters b/builds/msvc/vs2010/test/test.vcxproj.filters
index 94f42b43..2c950f6c 100644
--- a/builds/msvc/vs2010/test/test.vcxproj.filters
+++ b/builds/msvc/vs2010/test/test.vcxproj.filters
@@ -154,7 +154,7 @@
src
-
+
src
@@ -189,4 +189,4 @@
{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}
-
\ No newline at end of file
+
diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj
index 61c495e3..3375e484 100644
--- a/builds/msvc/vs2012/test/test.vcxproj
+++ b/builds/msvc/vs2012/test/test.vcxproj
@@ -157,7 +157,7 @@
true
-
+
true
diff --git a/builds/msvc/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters
index 94f42b43..2c950f6c 100644
--- a/builds/msvc/vs2012/test/test.vcxproj.filters
+++ b/builds/msvc/vs2012/test/test.vcxproj.filters
@@ -154,7 +154,7 @@
src
-
+
src
@@ -189,4 +189,4 @@
{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}
-
\ No newline at end of file
+
diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj
index 9ce099a3..b79b5cd4 100644
--- a/builds/msvc/vs2013/test/test.vcxproj
+++ b/builds/msvc/vs2013/test/test.vcxproj
@@ -157,7 +157,7 @@
true
-
+
true
diff --git a/builds/msvc/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters
index 94f42b43..2c950f6c 100644
--- a/builds/msvc/vs2013/test/test.vcxproj.filters
+++ b/builds/msvc/vs2013/test/test.vcxproj.filters
@@ -154,7 +154,7 @@
src
-
+
src
@@ -189,4 +189,4 @@
{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}
-
\ No newline at end of file
+
diff --git a/builds/msvc/vs2015/test/test.vcxproj b/builds/msvc/vs2015/test/test.vcxproj
index 2e5e88c3..39493112 100644
--- a/builds/msvc/vs2015/test/test.vcxproj
+++ b/builds/msvc/vs2015/test/test.vcxproj
@@ -157,7 +157,7 @@
true
-
+
true
diff --git a/builds/msvc/vs2015/test/test.vcxproj.filters b/builds/msvc/vs2015/test/test.vcxproj.filters
index 94f42b43..2c950f6c 100644
--- a/builds/msvc/vs2015/test/test.vcxproj.filters
+++ b/builds/msvc/vs2015/test/test.vcxproj.filters
@@ -154,7 +154,7 @@
src
-
+
src
@@ -189,4 +189,4 @@
{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}
-
\ No newline at end of file
+
diff --git a/test/default/Makefile.am b/test/default/Makefile.am
index 9c24295e..f192ae7d 100644
--- a/test/default/Makefile.am
+++ b/test/default/Makefile.am
@@ -36,7 +36,7 @@ EXTRA_DIST = \
onetimeauth.exp \
onetimeauth2.exp \
onetimeauth7.exp \
- pwhash.exp \
+ pwhash_scrypt.exp \
pwhash_scrypt_ll.exp \
randombytes.exp \
scalarmult.exp \
@@ -97,7 +97,7 @@ DISTCLEANFILES = \
onetimeauth.res \
onetimeauth2.res \
onetimeauth7.res \
- pwhash.res \
+ pwhash_scrypt.res \
pwhash_scrypt_ll.res \
randombytes.res \
scalarmult.res \
@@ -159,7 +159,7 @@ CLEANFILES = \
onetimeauth.final \
onetimeauth2.final \
onetimeauth7.final \
- pwhash.final \
+ pwhash_scrypt.final \
pwhash_scrypt_ll.final \
randombytes.final \
scalarmult.final \
@@ -216,7 +216,7 @@ CLEANFILES = \
onetimeauth.nexe \
onetimeauth2.nexe \
onetimeauth7.nexe \
- pwhash.nexe \
+ pwhash_scrypt.nexe \
pwhash_scrypt_ll.nexe \
randombytes.nexe \
scalarmult.nexe \
@@ -285,7 +285,7 @@ TESTS_TARGETS = \
onetimeauth \
onetimeauth2 \
onetimeauth7 \
- pwhash \
+ pwhash_scrypt \
pwhash_scrypt_ll \
randombytes \
scalarmult \
@@ -421,8 +421,8 @@ onetimeauth2_LDADD = $(TESTS_LDADD)
onetimeauth7_SOURCE = cmptest.h onetimeauth7.c
onetimeauth7_LDADD = $(TESTS_LDADD)
-pwhash_SOURCE = cmptest.h pwhash.c
-pwhash_LDADD = $(TESTS_LDADD)
+pwhash_scrypt_SOURCE = cmptest.h pwhash_scrypt.c
+pwhash_scrypt_LDADD = $(TESTS_LDADD)
pwhash_scrypt_ll_SOURCE = cmptest.h pwhash_scrypt_ll.c
pwhash_scrypt_ll_LDADD = $(TESTS_LDADD)
diff --git a/test/default/pwhash.c b/test/default/pwhash_scrypt.c
similarity index 99%
rename from test/default/pwhash.c
rename to test/default/pwhash_scrypt.c
index 3fa8e7f5..62eaf2a7 100644
--- a/test/default/pwhash.c
+++ b/test/default/pwhash_scrypt.c
@@ -1,5 +1,5 @@
-#define TEST_NAME "pwhash"
+#define TEST_NAME "pwhash_scrypt"
#include "cmptest.h"
#define OUT_LEN 128
diff --git a/test/default/pwhash.exp b/test/default/pwhash_scrypt.exp
similarity index 100%
rename from test/default/pwhash.exp
rename to test/default/pwhash_scrypt.exp