diff --git a/README.md b/README.md
index db7305f4e..66aec2c11 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ translaters for Pygments lexers and styles.
 
 ## Supported languages
 
-ABNF, ANTLR, APL, ActionScript, ActionScript, Ada, Angular2, ApacheConf, AppleScript, Awk, BNF, Base, Bash, Batchfile, BlitzBasic, Brainfuck, C, C++, CFEngine3, CMake, COBOL, CSS, Cap'n, Ceylon, ChaiScript, Cheetah, Clojure, CoffeeScript, Common, Coq, Crystal, Cython, DTD, Dart, Diff, Django/Jinja, Docker, EBNF, Elixir, Elm, EmacsLisp, Erlang, FSharp, Factor, Fish, Forth, Fortran, GAS, GLSL, Genshi, Gnuplot, Go, Groovy, HTML, Handlebars, Haskell, Haxe, Hy, INI, Idris, Io, JSON, Java, JavaScript, Julia, Kotlin, LLVM, Lighttpd, Lua, Mako, Mason, Mathematica, Modula-2, MySQL, Myghty, NASM, Newspeak, Nginx, Nimrod, OCaml, Octave, PHP, PL/pgSQL, POVRay, PacmanConf, Perl, Pig, PkgConfig, PostScript, PostgreSQL, PowerShell, Prolog, Protocol, Puppet, Python, Python, QBasic, R, Racket, Ragel, Rexx, Ruby, Rust, SPARQL, SQL, Sass, Scala, Scheme, Scilab, Smalltalk, Smarty, Snobol, SquidConf, Swift, TASM, Tcl, Tcsh, Termcap, Terminfo, Terraform, Thrift, Transact-SQL, Turtle, Twig, TypeScript, TypoScript, TypoScriptCssData, TypoScriptHtmlData, VimL, XML, Xorg, cfstatement, markdown, reg, verilog, vhdl
+ABNF, ANTLR, APL, ActionScript, ActionScript 3, Ada, Angular2, ApacheConf, AppleScript, Awk, BNF, Base Makefile, Bash, Batchfile, BlitzBasic, Brainfuck, C, C++, CFEngine3, CMake, COBOL, CSS, Cap'n Proto, Ceylon, ChaiScript, Cheetah, Clojure, CoffeeScript, Common Lisp, Coq, Crystal, Cython, DTD, Dart, Diff, Django/Jinja, Docker, EBNF, Elixir, Elm, EmacsLisp, Erlang, FSharp, Factor, Fish, Forth, Fortran, GAS, GLSL, Genshi, Genshi HTML, Genshi Text, Gnuplot, Go, Groovy, HTML, Handlebars, Haskell, Haxe, Hy, INI, Idris, Io, JSON, Java, JavaScript, Julia, Kotlin, LLVM, Lighttpd configuration file, Lua, Mako, Mason, Mathematica, Modula-2, MySQL, Myghty, NASM, Newspeak, Nginx configuration file, Nimrod, OCaml, Octave, PHP, PL/pgSQL, POVRay, PacmanConf, Perl, Pig, PkgConfig, PostScript, PostgreSQL SQL dialect, PowerShell, Prolog, Protocol Buffer, Puppet, Python, Python 3, QBasic, R, Racket, Ragel, Rexx, Ruby, Rust, SPARQL, SQL, Sass, Scala, Scheme, Scilab, Smalltalk, Smarty, Snobol, SquidConf, Swift, TASM, Tcl, Tcsh, Termcap, Terminfo, Terraform, Thrift, Transact-SQL, Turtle, Twig, TypeScript, TypoScript, TypoScriptCssData, TypoScriptHtmlData, VimL, XML, Xorg, cfstatement, markdown, reg, verilog, vhdl
 
 _I will attempt to keep this section up to date, but an authoritative list can be
 displayed with `chroma --list`._
diff --git a/lexers/genshi.go b/lexers/genshi.go
index 96b926be0..3534b1be2 100644
--- a/lexers/genshi.go
+++ b/lexers/genshi.go
@@ -37,7 +37,7 @@ var GenshiText = Register(MustNewLexer(
 // Html+Genshi lexer.
 var GenshiHTMLTemplate = Register(MustNewLexer(
 	&Config{
-		Name:         "HTML+Genshi",
+		Name:         "Genshi HTML",
 		Aliases:      []string{"html+genshi", "html+kid"},
 		Filenames:    []string{},
 		MimeTypes:    []string{"text/html+genshi"},