12 files changed, 33 insertions, 14 deletions
diff --git a/src/build-data/policy/bsi.txt b/src/build-data/policy/bsi.txt
index b02b82f84..4626ade84 100644
--- a/src/build-data/policy/bsi.txt
+++ b/src/build-data/policy/bsi.txt
@@ -103,8 +103,8 @@ shacal2
 shacal2_x86
 shacal2_simd
 sm4
-threefish
-threefish_avx2
+threefish_512
+threefish_512_avx2
 twofish
 xtea
 
diff --git a/src/build-data/policy/modern.txt b/src/build-data/policy/modern.txt
index 212d06b1b..2c3335af6 100644
--- a/src/build-data/policy/modern.txt
+++ b/src/build-data/policy/modern.txt
@@ -1,7 +1,7 @@
 <required>
 aes
 serpent
-threefish
+threefish_512
 chacha
 
 sha2_32
@@ -61,7 +61,7 @@ http_util # needed by x509 for OCSP online checks
 aes_ni
 aes_ssse3
 serpent_simd
-threefish_avx2
+threefish_512_avx2
 chacha_sse2
 
 sha1_sse2
diff --git a/src/build-data/policy/nist.txt b/src/build-data/policy/nist.txt
index b253ac982..1bc2c752d 100644
--- a/src/build-data/policy/nist.txt
+++ b/src/build-data/policy/nist.txt
@@ -106,8 +106,8 @@ sm4
 shacal2
 shacal2_x86
 shacal2_simd
-threefish
-threefish_avx2
+threefish_512
+threefish_512_avx2
 twofish
 xtea
 
diff --git a/src/lib/block/block_cipher.cpp b/src/lib/block/block_cipher.cpp
index 8be2de664..544cbbc36 100644
--- a/src/lib/block/block_cipher.cpp
+++ b/src/lib/block/block_cipher.cpp
@@ -86,7 +86,7 @@
 #endif
 
 #if defined(BOTAN_HAS_THREEFISH_512)
-  #include <botan/threefish.h>
+  #include <botan/threefish_512.h>
 #endif
 
 #if defined(BOTAN_HAS_XTEA)
diff --git a/src/lib/block/threefish/info.txt b/src/lib/block/threefish_512/info.txt
index e12223679..e12223679 100644
--- a/src/lib/block/threefish/info.txt
+++ b/src/lib/block/threefish_512/info.txt
diff --git a/src/lib/block/threefish_512/threefish.h b/src/lib/block/threefish_512/threefish.h
new file mode 100644
index 000000000..2c2a2750f
--- /dev/null
+++ b/src/lib/block/threefish_512/threefish.h
@@ -0,0 +1,19 @@
+/*
+* Threefish
+* (C) 2013,2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
+#ifndef BOTAN_THREEFISH_H_
+#define BOTAN_THREEFISH_H_
+
+#if defined(__GNUC__)
+  #warning "botan/threefish.h is deprecated"
+#elif defined(_MSC_VER)
+  #pragma message ("botan/threefish.h is deprecated")
+#endif
+
+#include <botan/threefish_512.h>
+
+#endif
diff --git a/src/lib/block/threefish/threefish.cpp b/src/lib/block/threefish_512/threefish_512.cpp
index 60f793d64..0e6ba8889 100644
--- a/src/lib/block/threefish/threefish.cpp
+++ b/src/lib/block/threefish_512/threefish_512.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/threefish.h>
+#include <botan/threefish_512.h>
 #include <botan/loadstor.h>
 #include <botan/cpuid.h>
 
diff --git a/src/lib/block/threefish/threefish.h b/src/lib/block/threefish_512/threefish_512.h
index 6b87c3eb2..24f15190c 100644
--- a/src/lib/block/threefish/threefish.h
+++ b/src/lib/block/threefish_512/threefish_512.h
@@ -1,12 +1,12 @@
 /*
-* Threefish
+* Threefish-512
 * (C) 2013,2014 Jack Lloyd
 *
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#ifndef BOTAN_THREEFISH_H_
-#define BOTAN_THREEFISH_H_
+#ifndef BOTAN_THREEFISH_512_H_
+#define BOTAN_THREEFISH_512_H_
 
 #include <botan/block_cipher.h>
 
diff --git a/src/lib/block/threefish/threefish_avx2/info.txt b/src/lib/block/threefish_512/threefish_512_avx2/info.txt
index bc2675fb4..bc2675fb4 100644
--- a/src/lib/block/threefish/threefish_avx2/info.txt
+++ b/src/lib/block/threefish_512/threefish_512_avx2/info.txt
diff --git a/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp b/src/lib/block/threefish_512/threefish_512_avx2/threefish_avx2.cpp
index b8e2320ae..26dc40095 100644
--- a/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp
+++ b/src/lib/block/threefish_512/threefish_512_avx2/threefish_avx2.cpp
@@ -5,7 +5,7 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
-#include <botan/threefish.h>
+#include <botan/threefish_512.h>
 #include <immintrin.h>
 
 namespace Botan {
diff --git a/src/lib/hash/skein/info.txt b/src/lib/hash/skein/info.txt
index 3de41289a..3445c376f 100644
--- a/src/lib/hash/skein/info.txt
+++ b/src/lib/hash/skein/info.txt
@@ -3,5 +3,5 @@ SKEIN_512 -> 20131128
 </defines>
 
 <requires>
-threefish
+threefish_512
 </requires>
diff --git a/src/lib/hash/skein/skein_512.h b/src/lib/hash/skein/skein_512.h
index a602b4b5e..8bf6e3e7a 100644
--- a/src/lib/hash/skein/skein_512.h
+++ b/src/lib/hash/skein/skein_512.h
@@ -9,7 +9,7 @@
 #define BOTAN_SKEIN_512_H_
 
 #include <botan/hash.h>
-#include <botan/threefish.h>
+#include <botan/threefish_512.h>
 #include <string>
 #include <memory>