diff --git a/des/des.c b/des/des.c
index 2600a22..0b993c0 100644
--- a/des/des.c
+++ b/des/des.c
@@ -380,9 +380,9 @@ void tdes_enc(void* out, void* in, const void* key){
 /******************************************************************************/
 
 void tdes_dec(void* out, void* in, const uint8_t* key){
-	des_dec(out,  in, (uint8_t*)key + 0);
+	des_dec(out,  in, (uint8_t*)key +16);
 	des_enc(out, out, (uint8_t*)key + 8);
-	des_dec(out, out, (uint8_t*)key +16);
+	des_dec(out, out, (uint8_t*)key + 0);
 }
 
 /******************************************************************************/
diff --git a/mkfiles/jh_simple_small_c.mk b/mkfiles/jh_simple_small_c.mk
index a916a7c..51d0c74 100644
--- a/mkfiles/jh_simple_small_c.mk
+++ b/mkfiles/jh_simple_small_c.mk
@@ -1,7 +1,7 @@
-# Makefile for Grøstl
+# Makefile for JH
 ALGO_NAME := JH_SIMPLE_SMALL_C
 
-# comment out the following line for removement of Grøstl from the build process
+# comment out the following line for removement of JH from the build process
 HASHES += $(ALGO_NAME)
 
 $(ALGO_NAME)_DIR      := jh/
diff --git a/testvectors/Rc6-128-128.verified.test-vectors b/testvectors/Rc6-128-128.verified.test-vectors
index a2f01c6..196698d 100644
Binary files a/testvectors/Rc6-128-128.verified.test-vectors and b/testvectors/Rc6-128-128.verified.test-vectors differ
diff --git a/testvectors/shavs/Groestl/ExtremelyLongMsgKAT_224.txt b/testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_224.txt
similarity index 100%
rename from testvectors/shavs/Groestl/ExtremelyLongMsgKAT_224.txt
rename to testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_224.txt
diff --git a/testvectors/shavs/Groestl/ExtremelyLongMsgKAT_256.txt b/testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_256.txt
similarity index 100%
rename from testvectors/shavs/Groestl/ExtremelyLongMsgKAT_256.txt
rename to testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_256.txt
diff --git a/testvectors/shavs/Groestl/ExtremelyLongMsgKAT_384.txt b/testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_384.txt
similarity index 100%
rename from testvectors/shavs/Groestl/ExtremelyLongMsgKAT_384.txt
rename to testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_384.txt
diff --git a/testvectors/shavs/Groestl/ExtremelyLongMsgKAT_512.txt b/testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_512.txt
similarity index 100%
rename from testvectors/shavs/Groestl/ExtremelyLongMsgKAT_512.txt
rename to testvectors/shavs/Groestl-round2/ExtremelyLongMsgKAT_512.txt
diff --git a/testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_224.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_224.txt
similarity index 100%
rename from testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_224.txt
rename to testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_224.txt
diff --git a/testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_256.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_256.txt
similarity index 100%
rename from testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_256.txt
rename to testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_256.txt
diff --git a/testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_384.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_384.txt
similarity index 100%
rename from testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_384.txt
rename to testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_384.txt
diff --git a/testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_512.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_512.txt
similarity index 100%
rename from testvectors/shavs/Groestl/IntermediateValues_1BlockMsg_512.txt
rename to testvectors/shavs/Groestl-round2/IntermediateValues_1BlockMsg_512.txt
diff --git a/testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_224.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_224.txt
similarity index 100%
rename from testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_224.txt
rename to testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_224.txt
diff --git a/testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_256.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_256.txt
similarity index 100%
rename from testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_256.txt
rename to testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_256.txt
diff --git a/testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_384.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_384.txt
similarity index 100%
rename from testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_384.txt
rename to testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_384.txt
diff --git a/testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_512.txt b/testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_512.txt
similarity index 100%
rename from testvectors/shavs/Groestl/IntermediateValues_2BlockMsg_512.txt
rename to testvectors/shavs/Groestl-round2/IntermediateValues_2BlockMsg_512.txt
diff --git a/testvectors/shavs/Groestl/LongMsgKAT_224.txt b/testvectors/shavs/Groestl-round2/LongMsgKAT_224.txt
similarity index 100%
rename from testvectors/shavs/Groestl/LongMsgKAT_224.txt
rename to testvectors/shavs/Groestl-round2/LongMsgKAT_224.txt
diff --git a/testvectors/shavs/Groestl/LongMsgKAT_256.txt b/testvectors/shavs/Groestl-round2/LongMsgKAT_256.txt
similarity index 100%
rename from testvectors/shavs/Groestl/LongMsgKAT_256.txt
rename to testvectors/shavs/Groestl-round2/LongMsgKAT_256.txt
diff --git a/testvectors/shavs/Groestl/LongMsgKAT_384.txt b/testvectors/shavs/Groestl-round2/LongMsgKAT_384.txt
similarity index 100%
rename from testvectors/shavs/Groestl/LongMsgKAT_384.txt
rename to testvectors/shavs/Groestl-round2/LongMsgKAT_384.txt
diff --git a/testvectors/shavs/Groestl/LongMsgKAT_512.txt b/testvectors/shavs/Groestl-round2/LongMsgKAT_512.txt
similarity index 100%
rename from testvectors/shavs/Groestl/LongMsgKAT_512.txt
rename to testvectors/shavs/Groestl-round2/LongMsgKAT_512.txt
diff --git a/testvectors/shavs/Groestl/MonteCarlo_224.txt b/testvectors/shavs/Groestl-round2/MonteCarlo_224.txt
similarity index 100%
rename from testvectors/shavs/Groestl/MonteCarlo_224.txt
rename to testvectors/shavs/Groestl-round2/MonteCarlo_224.txt
diff --git a/testvectors/shavs/Groestl/MonteCarlo_256.txt b/testvectors/shavs/Groestl-round2/MonteCarlo_256.txt
similarity index 100%
rename from testvectors/shavs/Groestl/MonteCarlo_256.txt
rename to testvectors/shavs/Groestl-round2/MonteCarlo_256.txt
diff --git a/testvectors/shavs/Groestl/MonteCarlo_384.txt b/testvectors/shavs/Groestl-round2/MonteCarlo_384.txt
similarity index 100%
rename from testvectors/shavs/Groestl/MonteCarlo_384.txt
rename to testvectors/shavs/Groestl-round2/MonteCarlo_384.txt
diff --git a/testvectors/shavs/Groestl/MonteCarlo_512.txt b/testvectors/shavs/Groestl-round2/MonteCarlo_512.txt
similarity index 100%
rename from testvectors/shavs/Groestl/MonteCarlo_512.txt
rename to testvectors/shavs/Groestl-round2/MonteCarlo_512.txt
diff --git a/testvectors/shavs/Groestl/ShortMsgKAT_224.txt b/testvectors/shavs/Groestl-round2/ShortMsgKAT_224.txt
similarity index 100%
rename from testvectors/shavs/Groestl/ShortMsgKAT_224.txt
rename to testvectors/shavs/Groestl-round2/ShortMsgKAT_224.txt
diff --git a/testvectors/shavs/Groestl/ShortMsgKAT_256.txt b/testvectors/shavs/Groestl-round2/ShortMsgKAT_256.txt
similarity index 100%
rename from testvectors/shavs/Groestl/ShortMsgKAT_256.txt
rename to testvectors/shavs/Groestl-round2/ShortMsgKAT_256.txt
diff --git a/testvectors/shavs/Groestl/ShortMsgKAT_384.txt b/testvectors/shavs/Groestl-round2/ShortMsgKAT_384.txt
similarity index 100%
rename from testvectors/shavs/Groestl/ShortMsgKAT_384.txt
rename to testvectors/shavs/Groestl-round2/ShortMsgKAT_384.txt
diff --git a/testvectors/shavs/Groestl/ShortMsgKAT_512.txt b/testvectors/shavs/Groestl-round2/ShortMsgKAT_512.txt
similarity index 100%
rename from testvectors/shavs/Groestl/ShortMsgKAT_512.txt
rename to testvectors/shavs/Groestl-round2/ShortMsgKAT_512.txt