diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html
index 8bb65ec66..a3efdf609 100644
--- a/Doc/Manual/Perl5.html
+++ b/Doc/Manual/Perl5.html
@@ -122,7 +122,7 @@ options are found near the end of the chapter.
 
 
 <p>
-To build a Perl5 module, run SWIG using the <tt>-perl</tt> option as
+To build a Perl5 module, run SWIG using the <tt>-perl</tt> or <tt>-perl5</tt> option as
 follows:
 </p>
 
diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html
index 0de819639..365cd2940 100644
--- a/Doc/Manual/SWIG.html
+++ b/Doc/Manual/SWIG.html
@@ -128,13 +128,13 @@ Supported Target Language Options
      -mzscheme       - Generate Mzscheme wrappers
      -ocaml          - Generate Ocaml wrappers
      -octave         - Generate Octave wrappers
-     -perl           - Generate Perl wrappers
-     -php7           - Generate PHP7 wrappers
+     -perl5          - Generate Perl 5 wrappers
+     -php7           - Generate PHP 7 wrappers
      -python         - Generate Python wrappers
      -r              - Generate R (aka GNU S) wrappers
      -ruby           - Generate Ruby wrappers
      -scilab         - Generate Scilab wrappers
-     -tcl            - Generate Tcl wrappers
+     -tcl8           - Generate Tcl 8 wrappers
      -xml            - Generate XML wrappers
 
 Experimental Target Language Options
diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html
index 7e7cd5f87..2eb49bde9 100644
--- a/Doc/Manual/Tcl.html
+++ b/Doc/Manual/Tcl.html
@@ -88,7 +88,7 @@ this is no longer supported.
 
 
 <p>
-To build a Tcl module, run SWIG using the <tt>-tcl</tt> option :
+To build a Tcl module, run SWIG using the <tt>-tcl</tt> or <tt>-tcl8</tt> option :
 </p>
 
 <div class="code"><pre>
diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx
index 9fa301a21..dfa85f3c8 100644
--- a/Source/Modules/perl5.cxx
+++ b/Source/Modules/perl5.cxx
@@ -16,7 +16,7 @@
 #include <ctype.h>
 
 static const char *usage = "\
-Perl5 Options (available with -perl5)\n\
+Perl 5 Options (available with -perl5)\n\
      -compat         - Compatibility mode\n\
      -const          - Wrap constants as constants and not variables (implies -proxy)\n\
      -nopm           - Do not generate the .pm file\n\
diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
index 386e48b52..a3ea8003e 100644
--- a/Source/Modules/php.cxx
+++ b/Source/Modules/php.cxx
@@ -43,7 +43,7 @@
 #include <errno.h>
 
 static const char *usage = "\
-PHP Options (available with -php7)\n\
+PHP 7 Options (available with -php7)\n\
      -noproxy         - Don't generate proxy classes.\n\
      -prefix <prefix> - Prepend <prefix> to all class names in PHP wrappers\n\
 \n";
diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx
index e1ccaf598..472264c26 100644
--- a/Source/Modules/swigmain.cxx
+++ b/Source/Modules/swigmain.cxx
@@ -66,20 +66,20 @@ static TargetLanguageModule modules[] = {
   {"-mzscheme", swig_mzscheme, "Mzscheme", Supported},
   {"-ocaml", swig_ocaml, "Ocaml", Supported},
   {"-octave", swig_octave, "Octave", Supported},
-  {"-perl", swig_perl5, "Perl", Supported},
-  {"-perl5", swig_perl5, NULL, Supported},
+  {"-perl", swig_perl5, NULL, Supported},
+  {"-perl5", swig_perl5, "Perl 5", Supported},
   {"-php", swig_php, NULL, Supported},
-  {"-php4", NULL, "PHP4", Disabled},
-  {"-php5", NULL, "PHP5", Disabled},
-  {"-php7", swig_php, "PHP7", Supported},
+  {"-php4", NULL, "PHP 4", Disabled},
+  {"-php5", NULL, "PHP 5", Disabled},
+  {"-php7", swig_php, "PHP 7", Supported},
   {"-pike", NULL, "Pike", Disabled},
   {"-python", swig_python, "Python", Supported},
   {"-r", swig_r, "R (aka GNU S)", Supported},
   {"-ruby", swig_ruby, "Ruby", Supported},
   {"-scilab", swig_scilab, "Scilab", Supported},
   {"-sexp", NULL, "Lisp S-Expressions", Disabled},
-  {"-tcl", swig_tcl, "Tcl", Supported},
-  {"-tcl8", swig_tcl, NULL, Supported},
+  {"-tcl", swig_tcl, NULL, Supported},
+  {"-tcl8", swig_tcl, "Tcl 8", Supported},
   {"-uffi", NULL, "Common Lisp / UFFI", Disabled},
   {"-xml", swig_xml, "XML", Supported},
   {NULL, NULL, NULL, Disabled}
diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx
index 57ef3e97b..7a78ede9b 100644
--- a/Source/Modules/tcl8.cxx
+++ b/Source/Modules/tcl8.cxx
@@ -15,7 +15,7 @@
 #include "cparse.h"
 
 static const char *usage = "\
-Tcl 8 Options (available with -tcl)\n\
+Tcl 8 Options (available with -tcl8)\n\
      -itcl           - Enable ITcl support\n\
      -nosafe         - Leave out SafeInit module function.\n\
      -prefix <name>  - Set a prefix <name> to be prepended to all names\n\