9 files changed, 45 insertions, 43 deletions
diff --git a/src/block/serpent_simd/info.txt b/src/block/serpent_simd/info.txt
new file mode 100644
index 000000000..4ec5d0dfe
--- /dev/null
+++ b/src/block/serpent_simd/info.txt
@@ -0,0 +1,9 @@
+realname "Serpent (SIMD)"
+
+define SERPENT_SIMD
+
+<requires>
+serpent
+simd_32
+simd_engine
+</requires>
diff --git a/src/block/serpent_sse2/serp_sse2.cpp b/src/block/serpent_simd/serp_simd.cpp
index be79e870d..b394b0c26 100644
--- a/src/block/serpent_sse2/serp_sse2.cpp
+++ b/src/block/serpent_simd/serp_simd.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/serp_sse2.h>
-#include <botan/serp_sse2_sbox.h>
+#include <botan/serp_simd.h>
+#include <botan/serp_simd_sbox.h>
 #include <botan/simd_32.h>
 #include <botan/loadstor.h>
 
@@ -54,7 +54,7 @@ namespace {
    } while(0);
 
 /*
-* SSE2 Serpent Encryption of 4 blocks in parallel
+* SIMD Serpent Encryption of 4 blocks in parallel
 */
 void serpent_encrypt_4(const byte in[64],
                        byte out[64],
@@ -112,7 +112,7 @@ void serpent_encrypt_4(const byte in[64],
    }
 
 /*
-* SSE2 Serpent Decryption of 4 blocks in parallel
+* SIMD Serpent Decryption of 4 blocks in parallel
 */
 void serpent_decrypt_4(const byte in[64],
                        byte out[64],
@@ -174,7 +174,7 @@ void serpent_decrypt_4(const byte in[64],
 /*
 * Serpent Encryption
 */
-void Serpent_SSE2::encrypt_n(const byte in[], byte out[], u32bit blocks) const
+void Serpent_SIMD::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
    while(blocks >= 4)
       {
@@ -190,7 +190,7 @@ void Serpent_SSE2::encrypt_n(const byte in[], byte out[], u32bit blocks) const
 /*
 * Serpent Decryption
 */
-void Serpent_SSE2::decrypt_n(const byte in[], byte out[], u32bit blocks) const
+void Serpent_SIMD::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
    while(blocks >= 4)
       {
diff --git a/src/block/serpent_sse2/serp_sse2.h b/src/block/serpent_simd/serp_simd.h
index f1e5c2028..1ecb70159 100644
--- a/src/block/serpent_sse2/serp_sse2.h
+++ b/src/block/serpent_simd/serp_simd.h
@@ -1,12 +1,12 @@
 /*
-* Serpent (SSE2)
+* Serpent (SIMD)
 * (C) 2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#ifndef BOTAN_SERPENT_SSE2_H__
-#define BOTAN_SERPENT_SSE2_H__
+#ifndef BOTAN_SERPENT_SIMD_H__
+#define BOTAN_SERPENT_SIMD_H__
 
 #include <botan/serpent.h>
 
@@ -15,13 +15,13 @@ namespace Botan {
 /*
 * Serpent
 */
-class BOTAN_DLL Serpent_SSE2 : public Serpent
+class BOTAN_DLL Serpent_SIMD : public Serpent
    {
    public:
       void encrypt_n(const byte in[], byte out[], u32bit blocks) const;
       void decrypt_n(const byte in[], byte out[], u32bit blocks) const;
 
-      BlockCipher* clone() const { return new Serpent_SSE2; }
+      BlockCipher* clone() const { return new Serpent_SIMD; }
    };
 
 }
diff --git a/src/block/serpent_sse2/serp_sse2_sbox.h b/src/block/serpent_simd/serp_simd_sbox.h
index 6e3da7359..6e3da7359 100644
--- a/src/block/serpent_sse2/serp_sse2_sbox.h
+++ b/src/block/serpent_simd/serp_simd_sbox.h
diff --git a/src/block/serpent_sse2/info.txt b/src/block/serpent_sse2/info.txt
deleted file mode 100644
index da7eef6bc..000000000
--- a/src/block/serpent_sse2/info.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-realname "Serpent (SSE2)"
-
-define SERPENT_SSE2
-
-<requires>
-serpent
-sse2_eng
-</requires>
diff --git a/src/block/xtea_simd/info.txt b/src/block/xtea_simd/info.txt
new file mode 100644
index 000000000..0cdce14ef
--- /dev/null
+++ b/src/block/xtea_simd/info.txt
@@ -0,0 +1,16 @@
+realname "XTEA (SIMD)"
+
+define XTEA_SIMD
+
+load_on auto
+
+<add>
+xtea_simd.cpp
+xtea_simd.h
+</add>
+
+<requires>
+xtea
+simd_32
+simd_engine
+</requires>
diff --git a/src/block/xtea_sse2/xtea_sse2.cpp b/src/block/xtea_simd/xtea_simd.cpp
index 5d9c7dd05..6151c355c 100644
--- a/src/block/xtea_sse2/xtea_sse2.cpp
+++ b/src/block/xtea_simd/xtea_simd.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/xtea_sse2.h>
+#include <botan/xtea_simd.h>
 #include <botan/loadstor.h>
 #include <botan/simd_32.h>
 
@@ -92,7 +92,7 @@ void xtea_decrypt_8(const byte in[64], byte out[64], const u32bit EK[64])
 /*
 * XTEA Encryption
 */
-void XTEA_SSE2::encrypt_n(const byte in[], byte out[], u32bit blocks) const
+void XTEA_SIMD::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
    while(blocks >= 8)
       {
@@ -108,7 +108,7 @@ void XTEA_SSE2::encrypt_n(const byte in[], byte out[], u32bit blocks) const
 /*
 * XTEA Decryption
 */
-void XTEA_SSE2::decrypt_n(const byte in[], byte out[], u32bit blocks) const
+void XTEA_SIMD::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
    while(blocks >= 8)
       {
diff --git a/src/block/xtea_sse2/xtea_sse2.h b/src/block/xtea_simd/xtea_simd.h
index e691e5c40..e4ce734ed 100644
--- a/src/block/xtea_sse2/xtea_sse2.h
+++ b/src/block/xtea_simd/xtea_simd.h
@@ -1,26 +1,26 @@
 /*
-* XTEA in SSE2
+* XTEA in SIMD
 * (C) 2009 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#ifndef BOTAN_XTEA_SSE2_H__
-#define BOTAN_XTEA_SSE2_H__
+#ifndef BOTAN_XTEA_SIMD_H__
+#define BOTAN_XTEA_SIMD_H__
 
 #include <botan/xtea.h>
 
 namespace Botan {
 
 /*
-* XTEA (SSE2 variant)
+* XTEA (SIMD variant)
 */
-class BOTAN_DLL XTEA_SSE2 : public XTEA
+class BOTAN_DLL XTEA_SIMD : public XTEA
    {
    public:
       void encrypt_n(const byte in[], byte out[], u32bit blocks) const;
       void decrypt_n(const byte in[], byte out[], u32bit blocks) const;
-      BlockCipher* clone() const { return new XTEA_SSE2; }
+      BlockCipher* clone() const { return new XTEA_SIMD; }
    };
 
 }
diff --git a/src/block/xtea_sse2/info.txt b/src/block/xtea_sse2/info.txt
deleted file mode 100644
index edcdd114d..000000000
--- a/src/block/xtea_sse2/info.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-realname "XTEA (SSE2)"
-
-define XTEA_SSE2
-
-load_on auto
-
-<add>
-xtea_sse2.cpp
-xtea_sse2.h
-</add>
-
-<requires>
-xtea
-sse2_eng
-</requires>