diff --git a/bigint/bigint-stub.c b/bigint/bigint-stub.c
index 451e8d7..351bab9 100644
--- a/bigint/bigint-stub.c
+++ b/bigint/bigint-stub.c
@@ -1,6 +1,6 @@
 /* bigint.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/bigint/bigint.c b/bigint/bigint.c
index 6b76c18..f832d5f 100644
--- a/bigint/bigint.c
+++ b/bigint/bigint.c
@@ -1,6 +1,6 @@
 /* bigint.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/bigint/bigint.h b/bigint/bigint.h
index 2f45d1d..af1e451 100644
--- a/bigint/bigint.h
+++ b/bigint/bigint.h
@@ -1,6 +1,6 @@
 /* bigint.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/bigint/bigint_io.c b/bigint/bigint_io.c
index d0dde86..bf3fca7 100644
--- a/bigint/bigint_io.c
+++ b/bigint/bigint_io.c
@@ -1,6 +1,6 @@
 /* bigint_io.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/bigint/bigint_io.h b/bigint/bigint_io.h
index e47391d..e82247e 100644
--- a/bigint/bigint_io.h
+++ b/bigint/bigint_io.h
@@ -1,6 +1,6 @@
 /* bigint_io.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/grain/grain.c b/grain/grain.c
index 7edfb1e..8f15de6 100644
--- a/grain/grain.c
+++ b/grain/grain.c
@@ -1,6 +1,6 @@
 /* grain.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/grain/grain.h b/grain/grain.h
index 06e8c78..186dc91 100644
--- a/grain/grain.h
+++ b/grain/grain.h
@@ -1,6 +1,6 @@
 /* grain.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/rabbit/rabbit.h b/rabbit/rabbit.h
index b49b55a..354820e 100644
--- a/rabbit/rabbit.h
+++ b/rabbit/rabbit.h
@@ -1,6 +1,6 @@
 /* rabbit.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/salsa20/salsa20.c b/salsa20/salsa20.c
index ddd2226..b2f388b 100644
--- a/salsa20/salsa20.c
+++ b/salsa20/salsa20.c
@@ -1,6 +1,6 @@
 /* salsa20.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2006-2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/salsa20/salsa20.h b/salsa20/salsa20.h
index 29e7e81..ddfd743 100644
--- a/salsa20/salsa20.h
+++ b/salsa20/salsa20.h
@@ -1,6 +1,6 @@
 /* salsa20.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal-basic.c b/scal/scal-basic.c
index f46c995..e9775e0 100644
--- a/scal/scal-basic.c
+++ b/scal/scal-basic.c
@@ -1,6 +1,6 @@
 /* scal-basic.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal-basic.h b/scal/scal-basic.h
index fcfadc0..adc6f28 100644
--- a/scal/scal-basic.h
+++ b/scal/scal-basic.h
@@ -1,6 +1,6 @@
 /* scal-basic.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal-nessie.c b/scal/scal-nessie.c
index 5a29f7b..a398df5 100644
--- a/scal/scal-nessie.c
+++ b/scal/scal-nessie.c
@@ -1,6 +1,6 @@
 /* scal-nessie.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2006-2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal-nessie.h b/scal/scal-nessie.h
index 3d785dd..df66d36 100644
--- a/scal/scal-nessie.h
+++ b/scal/scal-nessie.h
@@ -1,6 +1,6 @@
 /* scal-nessie.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_arcfour.c b/scal/scal_arcfour.c
index 24b5321..0719bbd 100644
--- a/scal/scal_arcfour.c
+++ b/scal/scal_arcfour.c
@@ -1,6 +1,6 @@
 /* scal_arcfour.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_arcfour.h b/scal/scal_arcfour.h
index 512e90d..169a37f 100644
--- a/scal/scal_arcfour.h
+++ b/scal/scal_arcfour.h
@@ -1,6 +1,6 @@
 /* scal_arcfour.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_grain.c b/scal/scal_grain.c
index b79963f..da49d53 100644
--- a/scal/scal_grain.c
+++ b/scal/scal_grain.c
@@ -1,6 +1,6 @@
 /* scal_grain.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_grain.h b/scal/scal_grain.h
index a67d1d5..7880fcc 100644
--- a/scal/scal_grain.h
+++ b/scal/scal_grain.h
@@ -1,6 +1,6 @@
 /* scal_grain.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_mickey128.c b/scal/scal_mickey128.c
index b9e146e..85b7860 100644
--- a/scal/scal_mickey128.c
+++ b/scal/scal_mickey128.c
@@ -1,6 +1,6 @@
 /* scal_mickey128.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_mickey128.h b/scal/scal_mickey128.h
index c874867..03903db 100644
--- a/scal/scal_mickey128.h
+++ b/scal/scal_mickey128.h
@@ -1,6 +1,6 @@
 /* scal_mickey128.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_rabbit.c b/scal/scal_rabbit.c
index 9f1be77..7f1bae5 100644
--- a/scal/scal_rabbit.c
+++ b/scal/scal_rabbit.c
@@ -1,6 +1,6 @@
 /* scal_rabbit.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_rabbit.h b/scal/scal_rabbit.h
index ee172c8..dacbdf5 100644
--- a/scal/scal_rabbit.h
+++ b/scal/scal_rabbit.h
@@ -1,6 +1,6 @@
 /* scal_rabbit.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_salsa20.c b/scal/scal_salsa20.c
index 8f91349..08997ff 100644
--- a/scal/scal_salsa20.c
+++ b/scal/scal_salsa20.c
@@ -1,6 +1,6 @@
 /* scal_salsa20.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_salsa20.h b/scal/scal_salsa20.h
index 23c9f2b..dc8ad97 100644
--- a/scal/scal_salsa20.h
+++ b/scal/scal_salsa20.h
@@ -1,6 +1,6 @@
 /* scal_salsa20.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_trivium.c b/scal/scal_trivium.c
index 607d677..e8c30f0 100644
--- a/scal/scal_trivium.c
+++ b/scal/scal_trivium.c
@@ -1,6 +1,6 @@
 /* scal_trivium.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/scal/scal_trivium.h b/scal/scal_trivium.h
index 17f921a..ece3942 100644
--- a/scal/scal_trivium.h
+++ b/scal/scal_trivium.h
@@ -1,6 +1,6 @@
 /* scal_trivium.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/cli.c b/test_src/cli.c
index d517829..8176d5f 100644
--- a/test_src/cli.c
+++ b/test_src/cli.c
@@ -1,6 +1,6 @@
 /* cli.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/cli.h b/test_src/cli.h
index 4210695..f4e615f 100644
--- a/test_src/cli.h
+++ b/test_src/cli.h
@@ -1,6 +1,6 @@
 /* cli.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/hw_regs.h b/test_src/hw_regs.h
index c6d859b..37cdb61 100644
--- a/test_src/hw_regs.h
+++ b/test_src/hw_regs.h
@@ -1,6 +1,6 @@
 /* hw_regs.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/main-base64-test.c b/test_src/main-base64-test.c
index 67fb730..4edf387 100644
--- a/test_src/main-base64-test.c
+++ b/test_src/main-base64-test.c
@@ -1,6 +1,6 @@
 /* main-base64-test.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008, 2009  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/main-bigint-test.c b/test_src/main-bigint-test.c
index 621e70f..4f4dfdc 100644
--- a/test_src/main-bigint-test.c
+++ b/test_src/main-bigint-test.c
@@ -1,6 +1,6 @@
 /* main-bigint-test.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008, 2009, 2010  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/main-test-common.h b/test_src/main-test-common.h
index 3649c05..6eab2b9 100644
--- a/test_src/main-test-common.h
+++ b/test_src/main-test-common.h
@@ -1,6 +1,6 @@
 /* main-test-common.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2011 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/string-extras.c b/test_src/string-extras.c
index 8f216c2..5293a1f 100644
--- a/test_src/string-extras.c
+++ b/test_src/string-extras.c
@@ -1,6 +1,6 @@
 /* string_extras.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/string-extras.h b/test_src/string-extras.h
index d9ef2e0..04aa707 100644
--- a/test_src/string-extras.h
+++ b/test_src/string-extras.h
@@ -1,6 +1,6 @@
 /* string-extras.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/sysclock.h b/test_src/sysclock.h
index e598349..2fc95d5 100644
--- a/test_src/sysclock.h
+++ b/test_src/sysclock.h
@@ -1,6 +1,6 @@
 /* sysclock.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/uart_defines.h b/test_src/uart_defines.h
index 976f2ee..9640060 100644
--- a/test_src/uart_defines.h
+++ b/test_src/uart_defines.h
@@ -1,6 +1,6 @@
 /* uart_defines.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/uart_lowlevel.c b/test_src/uart_lowlevel.c
index 2261ebb..85c4d90 100644
--- a/test_src/uart_lowlevel.c
+++ b/test_src/uart_lowlevel.c
@@ -1,6 +1,6 @@
 /* uart_lowlevel.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/test_src/uart_lowlevel.h b/test_src/uart_lowlevel.h
index 68c30de..825e4e0 100644
--- a/test_src/uart_lowlevel.h
+++ b/test_src/uart_lowlevel.h
@@ -1,6 +1,6 @@
 /* uart_lowlevel.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/trivium/trivium.c b/trivium/trivium.c
index 92040bd..64b7e16 100644
--- a/trivium/trivium.c
+++ b/trivium/trivium.c
@@ -1,6 +1,6 @@
 /* trivium.c */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
diff --git a/trivium/trivium.h b/trivium/trivium.h
index ced7784..d879757 100644
--- a/trivium/trivium.h
+++ b/trivium/trivium.h
@@ -1,6 +1,6 @@
 /* trivium.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
+    This file is part of the ARM-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify