diff --git a/jp3d/LICENSE.txt b/jp3d/LICENSE.txt
index a128b1a7..52984fc0 100755
--- a/jp3d/LICENSE.txt
+++ b/jp3d/LICENSE.txt
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez, Image Processing Laboratory (LPI) - University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/codec/convert.c b/jp3d/codec/convert.c
index 626e5e9d..7a5d177d 100755
--- a/jp3d/codec/convert.c
+++ b/jp3d/codec/convert.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/codec/convert.h b/jp3d/codec/convert.h
index 61e7f3fe..85885561 100755
--- a/jp3d/codec/convert.h
+++ b/jp3d/codec/convert.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/codec/jp3d_to_volume.c b/jp3d/codec/jp3d_to_volume.c
index eb7fe308..9c5c9adb 100755
--- a/jp3d/codec/jp3d_to_volume.c
+++ b/jp3d/codec/jp3d_to_volume.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/codec/volume_to_jp3d.c b/jp3d/codec/volume_to_jp3d.c
index a7568a59..e00785d4 100755
--- a/jp3d/codec/volume_to_jp3d.c
+++ b/jp3d/codec/volume_to_jp3d.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/bio.c b/jp3d/libjp3dvm/bio.c
index b5f01e30..bc3b1138 100755
--- a/jp3d/libjp3dvm/bio.c
+++ b/jp3d/libjp3dvm/bio.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/bio.h b/jp3d/libjp3dvm/bio.h
index 4f15b22d..36bb942b 100755
--- a/jp3d/libjp3dvm/bio.h
+++ b/jp3d/libjp3dvm/bio.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/cio.c b/jp3d/libjp3dvm/cio.c
index b934888f..4ac64fd3 100755
--- a/jp3d/libjp3dvm/cio.c
+++ b/jp3d/libjp3dvm/cio.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/cio.h b/jp3d/libjp3dvm/cio.h
index 54e0478a..860d0b26 100755
--- a/jp3d/libjp3dvm/cio.h
+++ b/jp3d/libjp3dvm/cio.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/dwt.c b/jp3d/libjp3dvm/dwt.c
index 42b5527b..8f30daeb 100755
--- a/jp3d/libjp3dvm/dwt.c
+++ b/jp3d/libjp3dvm/dwt.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/dwt.h b/jp3d/libjp3dvm/dwt.h
index 147ec9b0..d87f799f 100755
--- a/jp3d/libjp3dvm/dwt.h
+++ b/jp3d/libjp3dvm/dwt.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyrigth (c) 2006, Mónica Díez, LPI-UVA, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/event.c b/jp3d/libjp3dvm/event.c
index af011e7f..e27df654 100755
--- a/jp3d/libjp3dvm/event.c
+++ b/jp3d/libjp3dvm/event.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/jp3d/libjp3dvm/event.h b/jp3d/libjp3dvm/event.h
index 4d6ca0e2..e01f4684 100755
--- a/jp3d/libjp3dvm/event.h
+++ b/jp3d/libjp3dvm/event.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/jp3d/libjp3dvm/fix.h b/jp3d/libjp3dvm/fix.h
index 484947b2..3b5e77ca 100755
--- a/jp3d/libjp3dvm/fix.h
+++ b/jp3d/libjp3dvm/fix.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/int.h b/jp3d/libjp3dvm/int.h
index 38b946e5..55be844a 100755
--- a/jp3d/libjp3dvm/int.h
+++ b/jp3d/libjp3dvm/int.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/jp3d.c b/jp3d/libjp3dvm/jp3d.c
index 0b9e7a77..2fd5d02f 100755
--- a/jp3d/libjp3dvm/jp3d.c
+++ b/jp3d/libjp3dvm/jp3d.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/jp3d.h b/jp3d/libjp3dvm/jp3d.h
index fbd14d63..5d0978c0 100755
--- a/jp3d/libjp3dvm/jp3d.h
+++ b/jp3d/libjp3dvm/jp3d.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/jp3d_lib.c b/jp3d/libjp3dvm/jp3d_lib.c
index 844e6405..4445e859 100755
--- a/jp3d/libjp3dvm/jp3d_lib.c
+++ b/jp3d/libjp3dvm/jp3d_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/jp3d/libjp3dvm/jp3d_lib.h b/jp3d/libjp3dvm/jp3d_lib.h
index aab66fb0..a2fb05ba 100755
--- a/jp3d/libjp3dvm/jp3d_lib.h
+++ b/jp3d/libjp3dvm/jp3d_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/jp3d/libjp3dvm/mct.c b/jp3d/libjp3dvm/mct.c
index 64123600..e915e390 100755
--- a/jp3d/libjp3dvm/mct.c
+++ b/jp3d/libjp3dvm/mct.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/mct.h b/jp3d/libjp3dvm/mct.h
index d7d6baf7..0b8edb7b 100755
--- a/jp3d/libjp3dvm/mct.h
+++ b/jp3d/libjp3dvm/mct.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/mqc.c b/jp3d/libjp3dvm/mqc.c
index 87c30704..12ac90d6 100755
--- a/jp3d/libjp3dvm/mqc.c
+++ b/jp3d/libjp3dvm/mqc.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/mqc.h b/jp3d/libjp3dvm/mqc.h
index 7bc8f13f..90253356 100755
--- a/jp3d/libjp3dvm/mqc.h
+++ b/jp3d/libjp3dvm/mqc.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/openjpeg.c b/jp3d/libjp3dvm/openjpeg.c
index 3a1d649e..ab2744e1 100755
--- a/jp3d/libjp3dvm/openjpeg.c
+++ b/jp3d/libjp3dvm/openjpeg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/openjpeg3d.h b/jp3d/libjp3dvm/openjpeg3d.h
index 9ba9487b..fdfe2834 100755
--- a/jp3d/libjp3dvm/openjpeg3d.h
+++ b/jp3d/libjp3dvm/openjpeg3d.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/opj_includes.h b/jp3d/libjp3dvm/opj_includes.h
index 84aa7d0f..0bff66ea 100755
--- a/jp3d/libjp3dvm/opj_includes.h
+++ b/jp3d/libjp3dvm/opj_includes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/jp3d/libjp3dvm/pi.c b/jp3d/libjp3dvm/pi.c
index d506ace5..f9b8a963 100755
--- a/jp3d/libjp3dvm/pi.c
+++ b/jp3d/libjp3dvm/pi.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/pi.h b/jp3d/libjp3dvm/pi.h
index f4177903..1edcc5fc 100755
--- a/jp3d/libjp3dvm/pi.h
+++ b/jp3d/libjp3dvm/pi.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/raw.c b/jp3d/libjp3dvm/raw.c
index 14e3aa40..b6a58106 100755
--- a/jp3d/libjp3dvm/raw.c
+++ b/jp3d/libjp3dvm/raw.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/raw.h b/jp3d/libjp3dvm/raw.h
index 48e55944..c26546ad 100755
--- a/jp3d/libjp3dvm/raw.h
+++ b/jp3d/libjp3dvm/raw.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/t1.c b/jp3d/libjp3dvm/t1.c
index 0e18e544..db1d2601 100755
--- a/jp3d/libjp3dvm/t1.c
+++ b/jp3d/libjp3dvm/t1.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/t1.h b/jp3d/libjp3dvm/t1.h
index 287e5bb8..7b4a18f5 100755
--- a/jp3d/libjp3dvm/t1.h
+++ b/jp3d/libjp3dvm/t1.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/t2.c b/jp3d/libjp3dvm/t2.c
index f3fa05b9..6638b328 100755
--- a/jp3d/libjp3dvm/t2.c
+++ b/jp3d/libjp3dvm/t2.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/t2.h b/jp3d/libjp3dvm/t2.h
index e1589703..b937290b 100755
--- a/jp3d/libjp3dvm/t2.h
+++ b/jp3d/libjp3dvm/t2.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/tcd.c b/jp3d/libjp3dvm/tcd.c
index f10b6124..e5147e29 100755
--- a/jp3d/libjp3dvm/tcd.c
+++ b/jp3d/libjp3dvm/tcd.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/tcd.h b/jp3d/libjp3dvm/tcd.h
index e90e653e..52504d10 100755
--- a/jp3d/libjp3dvm/tcd.h
+++ b/jp3d/libjp3dvm/tcd.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
diff --git a/jp3d/libjp3dvm/tgt.c b/jp3d/libjp3dvm/tgt.c
index e50432fd..1772afac 100755
--- a/jp3d/libjp3dvm/tgt.c
+++ b/jp3d/libjp3dvm/tgt.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/tgt.h b/jp3d/libjp3dvm/tgt.h
index 4f1cea01..ad8e88d8 100755
--- a/jp3d/libjp3dvm/tgt.h
+++ b/jp3d/libjp3dvm/tgt.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * All rights reserved.
  *
diff --git a/jp3d/libjp3dvm/volume.c b/jp3d/libjp3dvm/volume.c
index c26bb0ee..35728daf 100755
--- a/jp3d/libjp3dvm/volume.c
+++ b/jp3d/libjp3dvm/volume.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/jp3d/libjp3dvm/volume.h b/jp3d/libjp3dvm/volume.h
index 464a9e5d..02f28d2a 100755
--- a/jp3d/libjp3dvm/volume.h
+++ b/jp3d/libjp3dvm/volume.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2006, Mónica Díez García, Image Processing Laboratory, University of Valladolid, Spain
  * All rights reserved.
  *
diff --git a/jpwl/crc.c b/jpwl/crc.c
index 64f72cb5..f65e4e1e 100644
--- a/jpwl/crc.c
+++ b/jpwl/crc.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/crc.h b/jpwl/crc.h
index 1db27bb5..4ea2c4ce 100644
--- a/jpwl/crc.h
+++ b/jpwl/crc.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/jpwl.c b/jpwl/jpwl.c
index da75901d..42c88718 100644
--- a/jpwl/jpwl.c
+++ b/jpwl/jpwl.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/jpwl.h b/jpwl/jpwl.h
index 0c5d93cf..d1d066cd 100644
--- a/jpwl/jpwl.h
+++ b/jpwl/jpwl.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/jpwl_lib.c b/jpwl/jpwl_lib.c
index 504f59ca..ea53c935 100644
--- a/jpwl/jpwl_lib.c
+++ b/jpwl/jpwl_lib.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/rs.c b/jpwl/rs.c
index dbe5c9f5..0841c637 100644
--- a/jpwl/rs.c
+++ b/jpwl/rs.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/jpwl/rs.h b/jpwl/rs.h
index aa72d55a..7d02a477 100644
--- a/jpwl/rs.h
+++ b/jpwl/rs.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
  * Copyright (c) 2005-2006, Dept. of Electronic and Information Engineering, Universita' degli Studi di Perugia, Italy
  * All rights reserved.
diff --git a/libopenjpeg/event.h b/libopenjpeg/event.h
index 0a6898da..f181793f 100644
--- a/libopenjpeg/event.h
+++ b/libopenjpeg/event.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libopenjpeg/image.c b/libopenjpeg/image.c
index a0bb273d..a4d2c010 100644
--- a/libopenjpeg/image.c
+++ b/libopenjpeg/image.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libopenjpeg/image.h b/libopenjpeg/image.h
index 5789e547..f828b5b7 100644
--- a/libopenjpeg/image.h
+++ b/libopenjpeg/image.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libopenjpeg/j2k_lib.c b/libopenjpeg/j2k_lib.c
index 2eaabd53..a66e31e9 100644
--- a/libopenjpeg/j2k_lib.c
+++ b/libopenjpeg/j2k_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libopenjpeg/j2k_lib.h b/libopenjpeg/j2k_lib.h
index f8177be5..5f3406e5 100644
--- a/libopenjpeg/j2k_lib.h
+++ b/libopenjpeg/j2k_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 51257d5e..c79c7fe1 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h
index c4dda3ce..418ca6fc 100644
--- a/libopenjpeg/opj_includes.h
+++ b/libopenjpeg/opj_includes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/libopenjpeg/opj_malloc.h b/libopenjpeg/opj_malloc.h
index 8b3f7c19..0b1d4fc1 100644
--- a/libopenjpeg/opj_malloc.h
+++ b/libopenjpeg/opj_malloc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Hervcalloc Drolon, FreeImage Team
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
  * All rights reserved.
  *