Change GNUTLS into GnuTLS.

31 files changed, 125 insertions, 125 deletions

diff --git a/guile/Makefile.am b/guile/Makefile.am
index 3517df8fcc..6e730607ef 100644
--- a/guile/Makefile.am
+++ b/guile/Makefile.am
@@ -1,18 +1,18 @@
-#  GNUTLS -- Guile bindings for GnuTLS.
+#  GnuTLS --- Guile bindings for GnuTLS.
 #  Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 #
-#  GNUTLS is free software; you can redistribute it and/or
+#  GnuTLS is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
 #  License as published by the Free Software Foundation; either
 #  version 2.1 of the License, or (at your option) any later version.
 #
-#  GNUTLS is distributed in the hope that it will be useful,
+#  GnuTLS is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #  Lesser General Public License for more details.
 #
 #  You should have received a copy of the GNU Lesser General Public
-#  License along with GNUTLS; if not, write to the Free Software
+#  License along with GnuTLS; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 SUBDIRS = modules src tests
diff --git a/guile/modules/Makefile.am b/guile/modules/Makefile.am
index 786da89c0a..c1829ed553 100644
--- a/guile/modules/Makefile.am
+++ b/guile/modules/Makefile.am
@@ -1,18 +1,18 @@
-#  GNUTLS -- Guile bindings for GnuTLS.
+#  GnuTLS --- Guile bindings for GnuTLS.
 #  Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 #
-#  GNUTLS is free software; you can redistribute it and/or
+#  GnuTLS is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
 #  License as published by the Free Software Foundation; either
 #  version 2.1 of the License, or (at your option) any later version.
 #
-#  GNUTLS is distributed in the hope that it will be useful,
+#  GnuTLS is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #  Lesser General Public License for more details.
 #
 #  You should have received a copy of the GNU Lesser General Public
-#  License along with GNUTLS; if not, write to the Free Software
+#  License along with GnuTLS; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 guilemoduledir = $(GUILE_SITE)
diff --git a/guile/modules/gnutls.scm b/guile/modules/gnutls.scm
index 425e7bd70d..ed5efd893c 100644
--- a/guile/modules/gnutls.scm
+++ b/guile/modules/gnutls.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>
diff --git a/guile/modules/gnutls/build/enums.scm b/guile/modules/gnutls/build/enums.scm
index 4c65e8ba74..2ae6a02e72 100644
--- a/guile/modules/gnutls/build/enums.scm
+++ b/guile/modules/gnutls/build/enums.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>
diff --git a/guile/modules/gnutls/build/priorities.scm b/guile/modules/gnutls/build/priorities.scm
index f3beba6af8..3cd733a65f 100644
--- a/guile/modules/gnutls/build/priorities.scm
+++ b/guile/modules/gnutls/build/priorities.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>
diff --git a/guile/modules/gnutls/build/smobs.scm b/guile/modules/gnutls/build/smobs.scm
index 81cdd2e314..f20e22379e 100644
--- a/guile/modules/gnutls/build/smobs.scm
+++ b/guile/modules/gnutls/build/smobs.scm
@@ -1,20 +1,20 @@
 ;;; Help produce Guile wrappers for GnuTLS types.
 ;;;
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>
diff --git a/guile/modules/gnutls/build/utils.scm b/guile/modules/gnutls/build/utils.scm
index 349254cfa0..9c5958f33d 100644
--- a/guile/modules/gnutls/build/utils.scm
+++ b/guile/modules/gnutls/build/utils.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>
diff --git a/guile/modules/gnutls/extra.scm b/guile/modules/gnutls/extra.scm
index 35db12bab1..b47f4900bd 100644
--- a/guile/modules/gnutls/extra.scm
+++ b/guile/modules/gnutls/extra.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS-EXTRA --- Guile bindings for GnuTLS-EXTRA.
+;;; GnuTLS-extra --- Guile bindings for GnuTLS-EXTRA.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS-EXTRA is free software; you can redistribute it and/or modify
+;;; GnuTLS-extra is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 3 of the License, or
 ;;; (at your option) any later version.
 ;;;
-;;; GNUTLS-EXTRA is distributed in the hope that it will be useful,
+;;; GnuTLS-extra is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;; GNU General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU General Public License
-;;; along with GNUTLS-EXTRA; if not, write to the Free Software
+;;; along with GnuTLS-EXTRA; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 ;;; USA.
 
diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
index bc4f52d41f..e8e81b1fb0 100644
--- a/guile/src/Makefile.am
+++ b/guile/src/Makefile.am
@@ -1,18 +1,18 @@
-#  GNUTLS -- Guile bindings for GnuTLS.
+#  GnuTLS --- Guile bindings for GnuTLS.
 #  Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
-#  GNUTLS is free software; you can redistribute it and/or
+#  GnuTLS is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
 #  License as published by the Free Software Foundation; either
 #  version 2.1 of the License, or (at your option) any later version.
 #
-#  GNUTLS is distributed in the hope that it will be useful,
+#  GnuTLS is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #  Lesser General Public License for more details.
 #
 #  You should have received a copy of the GNU Lesser General Public
-#  License along with GNUTLS; if not, write to the Free Software
+#  License along with GnuTLS; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 GUILE_FOR_BUILD =						\
diff --git a/guile/src/core.c b/guile/src/core.c
index 79ea2be92e..4df2440dfd 100644
--- a/guile/src/core.c
+++ b/guile/src/core.c
@@ -1,18 +1,18 @@
-/* GNUTLS --- Guile bindings for GnuTLS.
+/* GnuTLS --- Guile bindings for GnuTLS.
    Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
-   GNUTLS is free software; you can redistribute it and/or
+   GnuTLS is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
-   GNUTLS is distributed in the hope that it will be useful,
+   GnuTLS is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with GNUTLS; if not, write to the Free Software
+   License along with GnuTLS; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA  */
 
 /* Written by Ludovic Courtès <ludo@gnu.org>.  */
diff --git a/guile/src/errors.c b/guile/src/errors.c
index bffb7c1f62..2ac7145630 100644
--- a/guile/src/errors.c
+++ b/guile/src/errors.c
@@ -1,18 +1,18 @@
-/* GNUTLS --- Guile bindings for GnuTLS.
+/* GnuTLS --- Guile bindings for GnuTLS.
    Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
-   GNUTLS is free software; you can redistribute it and/or
+   GnuTLS is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
-   GNUTLS is distributed in the hope that it will be useful,
+   GnuTLS is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with GNUTLS; if not, write to the Free Software
+   License along with GnuTLS; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA  */
 
 /* Written by Ludovic Courtès <ludo@chbouib.org>.  */
diff --git a/guile/src/errors.h b/guile/src/errors.h
index 00c5969105..337cdb6ed0 100644
--- a/guile/src/errors.h
+++ b/guile/src/errors.h
@@ -1,18 +1,18 @@
-/* GNUTLS --- Guile bindings for GnuTLS.
+/* GnuTLS --- Guile bindings for GnuTLS.
    Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 
-   GNUTLS is free software; you can redistribute it and/or
+   GnuTLS is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
-   GNUTLS is distributed in the hope that it will be useful,
+   GnuTLS is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with GNUTLS; if not, write to the Free Software
+   License along with GnuTLS; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA  */
 
 #ifndef GUILE_GNUTLS_ERRORS_H
diff --git a/guile/src/extra.c b/guile/src/extra.c
index 80a0079503..7244fa9fe4 100644
--- a/guile/src/extra.c
+++ b/guile/src/extra.c
@@ -1,18 +1,18 @@
-/* GNUTLS-EXTRA --- Guile bindings for GNUTLS-EXTRA.
+/* GnuTLS-extra --- Guile bindings for GnuTLS-extra.
    Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
-   GNUTLS-EXTRA is free software; you can redistribute it and/or modify
+   GnuTLS-extra is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
-   GNUTLS-EXTRA is distributed in the hope that it will be useful,
+   GnuTLS-extra is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GNUTLS-EXTRA; if not, write to the Free Software
+   along with GnuTLS-EXTRA; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Important note: As written above, this part of the code is ditributed
diff --git a/guile/src/make-enum-header.scm b/guile/src/make-enum-header.scm
index c794bfeeef..e9085c6866 100644
--- a/guile/src/make-enum-header.scm
+++ b/guile/src/make-enum-header.scm
@@ -1,20 +1,20 @@
 ;;; Help produce Guile wrappers for GnuTLS types.
 ;;;
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@gnu.org>.
diff --git a/guile/src/make-enum-map.scm b/guile/src/make-enum-map.scm
index 58c692bede..0e4b7a7c2e 100644
--- a/guile/src/make-enum-map.scm
+++ b/guile/src/make-enum-map.scm
@@ -1,20 +1,20 @@
 ;;; Help produce Guile wrappers for GnuTLS types.
 ;;;
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
diff --git a/guile/src/make-session-priorities.scm b/guile/src/make-session-priorities.scm
index c6bb2bdb39..8aeb820933 100644
--- a/guile/src/make-session-priorities.scm
+++ b/guile/src/make-session-priorities.scm
@@ -1,20 +1,20 @@
 ;;; Help produce Guile wrappers for GnuTLS types.
 ;;;
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
diff --git a/guile/src/make-smob-header.scm b/guile/src/make-smob-header.scm
index 8416f0fcb6..24d554de2a 100644
--- a/guile/src/make-smob-header.scm
+++ b/guile/src/make-smob-header.scm
@@ -1,20 +1,20 @@
 ;;; Help produce Guile wrappers for GnuTLS types.
 ;;;
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
diff --git a/guile/src/make-smob-types.scm b/guile/src/make-smob-types.scm
index 8138bdf170..0256d9a535 100644
--- a/guile/src/make-smob-types.scm
+++ b/guile/src/make-smob-types.scm
@@ -1,20 +1,20 @@
 ;;; Help produce Guile wrappers for GnuTLS types.
 ;;;
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
diff --git a/guile/src/utils.c b/guile/src/utils.c
index be47827287..ae5984e3b5 100644
--- a/guile/src/utils.c
+++ b/guile/src/utils.c
@@ -1,18 +1,18 @@
-/* GNUTLS --- Guile bindings for GnuTLS.
+/* GnuTLS --- Guile bindings for GnuTLS.
    Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
-   GNUTLS is free software; you can redistribute it and/or
+   GnuTLS is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
-   GNUTLS is distributed in the hope that it will be useful,
+   GnuTLS is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with GNUTLS; if not, write to the Free Software
+   License along with GnuTLS; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA  */
 
 /* Written by Ludovic Courtès <ludo@chbouib.org>.  */
diff --git a/guile/src/utils.h b/guile/src/utils.h
index 0122b46527..7213f385ea 100644
--- a/guile/src/utils.h
+++ b/guile/src/utils.h
@@ -1,18 +1,18 @@
-/* GNUTLS --- Guile bindings for GnuTLS.
+/* GnuTLS --- Guile bindings for GnuTLS.
    Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
-   GNUTLS is free software; you can redistribute it and/or
+   GnuTLS is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
-   GNUTLS is distributed in the hope that it will be useful,
+   GnuTLS is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with GNUTLS; if not, write to the Free Software
+   License along with GnuTLS; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA  */
 
 #ifndef GUILE_GNUTLS_UTILS_H
diff --git a/guile/tests/Makefile.am b/guile/tests/Makefile.am
index ab78ecc1cc..aaa8e9a987 100644
--- a/guile/tests/Makefile.am
+++ b/guile/tests/Makefile.am
@@ -1,18 +1,18 @@
-#  GNUTLS -- Guile bindings for GnuTLS.
+#  GnuTLS --- Guile bindings for GnuTLS.
 #  Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 #
-#  GNUTLS is free software; you can redistribute it and/or
+#  GnuTLS is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
 #  License as published by the Free Software Foundation; either
 #  version 2.1 of the License, or (at your option) any later version.
 #
-#  GNUTLS is distributed in the hope that it will be useful,
+#  GnuTLS is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 #  Lesser General Public License for more details.
 #
 #  You should have received a copy of the GNU Lesser General Public
-#  License along with GNUTLS; if not, write to the Free Software
+#  License along with GnuTLS; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 TESTS = anonymous-auth.scm session-record-port.scm		\
diff --git a/guile/tests/anonymous-auth.scm b/guile/tests/anonymous-auth.scm
index 5a42d31d79..7d5941e8de 100644
--- a/guile/tests/anonymous-auth.scm
+++ b/guile/tests/anonymous-auth.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
diff --git a/guile/tests/errors.scm b/guile/tests/errors.scm
index 1bfc829ed9..cec6491649 100644
--- a/guile/tests/errors.scm
+++ b/guile/tests/errors.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
diff --git a/guile/tests/openpgp-auth.scm b/guile/tests/openpgp-auth.scm
index 34300cf5d6..e02db5fed2 100644
--- a/guile/tests/openpgp-auth.scm
+++ b/guile/tests/openpgp-auth.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS-EXTRA --- Guile bindings for GnuTLS-EXTRA.
+;;; GnuTLS-extra --- Guile bindings for GnuTLS-EXTRA.
 ;;; Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS-EXTRA is free software; you can redistribute it and/or modify
+;;; GnuTLS-extra is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 3 of the License, or
 ;;; (at your option) any later version.
 ;;;
-;;; GNUTLS-EXTRA is distributed in the hope that it will be useful,
+;;; GnuTLS-extra is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;; GNU General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU General Public License
-;;; along with GNUTLS-EXTRA; if not, write to the Free Software
+;;; along with GnuTLS-EXTRA; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 ;;; USA.
 
diff --git a/guile/tests/openpgp-keyring.scm b/guile/tests/openpgp-keyring.scm
index 9083d2fb4e..e5cffc5d87 100644
--- a/guile/tests/openpgp-keyring.scm
+++ b/guile/tests/openpgp-keyring.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS-EXTRA --- Guile bindings for GnuTLS-EXTRA.
+;;; GnuTLS-extra --- Guile bindings for GnuTLS-EXTRA.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS-EXTRA is free software; you can redistribute it and/or modify
+;;; GnuTLS-extra is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 3 of the License, or
 ;;; (at your option) any later version.
 ;;;
-;;; GNUTLS-EXTRA is distributed in the hope that it will be useful,
+;;; GnuTLS-extra is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;; GNU General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU General Public License
-;;; along with GNUTLS-EXTRA; if not, write to the Free Software
+;;; along with GnuTLS-EXTRA; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 ;;; USA.
 
diff --git a/guile/tests/openpgp-keys.scm b/guile/tests/openpgp-keys.scm
index f97c7af30f..774fa64dba 100644
--- a/guile/tests/openpgp-keys.scm
+++ b/guile/tests/openpgp-keys.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS-EXTRA --- Guile bindings for GnuTLS-EXTRA.
+;;; GnuTLS-extra --- Guile bindings for GnuTLS-EXTRA.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS-EXTRA is free software; you can redistribute it and/or modify
+;;; GnuTLS-extra is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 ;;; the Free Software Foundation; either version 3 of the License, or
 ;;; (at your option) any later version.
 ;;;
-;;; GNUTLS-EXTRA is distributed in the hope that it will be useful,
+;;; GnuTLS-extra is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;;; GNU General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU General Public License
-;;; along with GNUTLS-EXTRA; if not, write to the Free Software
+;;; along with GnuTLS-EXTRA; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 ;;; USA.
 
diff --git a/guile/tests/pkcs-import-export.scm b/guile/tests/pkcs-import-export.scm
index d1cafde06b..79f9aeebcf 100644
--- a/guile/tests/pkcs-import-export.scm
+++ b/guile/tests/pkcs-import-export.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
diff --git a/guile/tests/session-record-port.scm b/guile/tests/session-record-port.scm
index 021c2a2ae2..49eaa5f3e5 100644
--- a/guile/tests/session-record-port.scm
+++ b/guile/tests/session-record-port.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
diff --git a/guile/tests/srp-base64.scm b/guile/tests/srp-base64.scm
index 7c81fd29d0..c928f25306 100644
--- a/guile/tests/srp-base64.scm
+++ b/guile/tests/srp-base64.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
@@ -25,7 +25,7 @@
 (use-modules (gnutls))
 
 (define %message
-  "GNUTLS is free software; you can redistribute it and/or
+  "GnuTLS is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) any later version.")
diff --git a/guile/tests/x509-auth.scm b/guile/tests/x509-auth.scm
index 8582fc1e4a..4363e43416 100644
--- a/guile/tests/x509-auth.scm
+++ b/guile/tests/x509-auth.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.
diff --git a/guile/tests/x509-certificates.scm b/guile/tests/x509-certificates.scm
index 3ecddb9711..fda227bbaa 100644
--- a/guile/tests/x509-certificates.scm
+++ b/guile/tests/x509-certificates.scm
@@ -1,18 +1,18 @@
-;;; GNUTLS --- Guile bindings for GnuTLS.
+;;; GnuTLS --- Guile bindings for GnuTLS.
 ;;; Copyright (C) 2007, 2010 Free Software Foundation, Inc.
 ;;;
-;;; GNUTLS is free software; you can redistribute it and/or
+;;; GnuTLS is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
 ;;; License as published by the Free Software Foundation; either
 ;;; version 2.1 of the License, or (at your option) any later version.
 ;;;
-;;; GNUTLS is distributed in the hope that it will be useful,
+;;; GnuTLS is distributed in the hope that it will be useful,
 ;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;; Lesser General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU Lesser General Public
-;;; License along with GNUTLS; if not, write to the Free Software
+;;; License along with GnuTLS; if not, write to the Free Software
 ;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 ;;; Written by Ludovic Courtès <ludo@chbouib.org>.