[gtksourceview] language-specs: do not mark strings for translation



commit eec7a2fed40c738826a7a6fe9a605313e2691540
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed Sep 6 17:27:52 2017 +0200

    language-specs: do not mark strings for translation
    
    Keep only the _section translatable, those make sense to translate.
    
    The language names (e.g. Swift, Kotlin, Maxima) should not be
    translated, for example if Maxima is translated the user will certainly
    be confused…
    
    The style names are not very useful to translate, because the user never
    sees those strings! It is used for example by a gedit plugin to
    create/edit style schemes. The style names are probably hard to
    translate anyway, and I'm sure that it was often translated in a way
    that the user didn't understand what it means… So, since those strings
    are extremely rarely used, and since they are hard to translate without
    context, it is better to not translate them at all. It's like GObject
    properties.
    
    Also, the *.lang file format doesn't support well translatable strings.
    Ideally each translatable string should have its own tag, with the
    translatable="yes" property, the possibility to add a context, etc.

 data/language-specs/R.lang                |   20 ++++----
 data/language-specs/abnf.lang             |   14 +++---
 data/language-specs/actionscript.lang     |   28 ++++++------
 data/language-specs/ada.lang              |   24 +++++-----
 data/language-specs/ansforth94.lang       |   28 ++++++------
 data/language-specs/asp.lang              |   26 +++++-----
 data/language-specs/automake.lang         |   18 ++++----
 data/language-specs/awk.lang              |   10 ++--
 data/language-specs/bennugd.lang          |   22 ++++----
 data/language-specs/bibtex.lang           |    8 ++--
 data/language-specs/bluespec.lang         |   14 +++---
 data/language-specs/boo.lang              |   28 ++++++------
 data/language-specs/c.lang                |   42 ++++++++--------
 data/language-specs/cg.lang               |   36 +++++++-------
 data/language-specs/changelog.lang        |   16 +++---
 data/language-specs/chdr.lang             |    2 +-
 data/language-specs/cmake.lang            |   16 +++---
 data/language-specs/cobol.lang            |   20 ++++----
 data/language-specs/cpp.lang              |    8 ++--
 data/language-specs/cpphdr.lang           |    2 +-
 data/language-specs/csharp.lang           |   30 ++++++------
 data/language-specs/css.lang              |   30 ++++++------
 data/language-specs/csv.lang              |   10 ++--
 data/language-specs/cuda.lang             |   12 ++--
 data/language-specs/d.lang                |   28 ++++++------
 data/language-specs/def.lang              |   72 ++++++++++++++--------------
 data/language-specs/desktop.lang          |   22 ++++----
 data/language-specs/diff.lang             |   16 +++---
 data/language-specs/docbook.lang          |   10 ++--
 data/language-specs/dosbatch.lang         |   10 ++--
 data/language-specs/dot.lang              |   10 ++--
 data/language-specs/dpatch.lang           |    4 +-
 data/language-specs/dtd.lang              |   10 ++--
 data/language-specs/dtl.lang              |   24 +++++-----
 data/language-specs/eiffel.lang           |   30 ++++++------
 data/language-specs/erlang.lang           |   24 +++++-----
 data/language-specs/fcl.lang              |   14 +++---
 data/language-specs/forth.lang            |   20 ++++----
 data/language-specs/fortran.lang          |   26 +++++-----
 data/language-specs/fsharp.lang           |   38 ++++++++--------
 data/language-specs/gap.lang              |   12 ++--
 data/language-specs/gdb-log.lang          |   22 ++++----
 data/language-specs/genie.lang            |   30 ++++++------
 data/language-specs/glsl.lang             |   16 +++---
 data/language-specs/go.lang               |   34 +++++++-------
 data/language-specs/gtk-doc.lang          |   24 +++++-----
 data/language-specs/gtkrc.lang            |   18 ++++----
 data/language-specs/haddock.lang          |   30 ++++++------
 data/language-specs/haskell-literate.lang |    2 +-
 data/language-specs/haskell.lang          |   28 ++++++------
 data/language-specs/haxe.lang             |   36 +++++++-------
 data/language-specs/html.lang             |   26 +++++-----
 data/language-specs/idl-exelis.lang       |   18 ++++----
 data/language-specs/idl.lang              |   12 ++--
 data/language-specs/imagej.lang           |   18 ++++----
 data/language-specs/ini.lang              |   18 ++++----
 data/language-specs/j.lang                |   34 +++++++-------
 data/language-specs/jade.lang             |   20 ++++----
 data/language-specs/java.lang             |   30 ++++++------
 data/language-specs/javascript.lang       |   26 +++++-----
 data/language-specs/json.lang             |   16 +++---
 data/language-specs/julia.lang            |   28 ++++++------
 data/language-specs/latex.lang            |   36 +++++++-------
 data/language-specs/lex.lang              |   10 ++--
 data/language-specs/libtool.lang          |    6 +-
 data/language-specs/llvm.lang             |   22 ++++----
 data/language-specs/lua.lang              |   20 ++++----
 data/language-specs/m4.lang               |   10 ++--
 data/language-specs/makefile.lang         |   20 ++++----
 data/language-specs/mallard.lang          |   10 ++--
 data/language-specs/markdown.lang         |   30 ++++++------
 data/language-specs/matlab.lang           |    8 ++--
 data/language-specs/mediawiki.lang        |   30 ++++++------
 data/language-specs/meson.lang            |   10 ++--
 data/language-specs/modelica.lang         |   26 +++++-----
 data/language-specs/mxml.lang             |    6 +-
 data/language-specs/nemerle.lang          |   30 ++++++------
 data/language-specs/netrexx.lang          |   30 ++++++------
 data/language-specs/nsis.lang             |   10 ++--
 data/language-specs/objc.lang             |   10 ++--
 data/language-specs/objj.lang             |   16 +++---
 data/language-specs/ocaml.lang            |   40 ++++++++--------
 data/language-specs/ocl.lang              |   14 +++---
 data/language-specs/octave.lang           |   22 ++++----
 data/language-specs/ooc.lang              |   36 +++++++-------
 data/language-specs/opal.lang             |   22 ++++----
 data/language-specs/opencl.lang           |   16 +++---
 data/language-specs/pascal.lang           |   14 +++---
 data/language-specs/perl.lang             |   40 ++++++++--------
 data/language-specs/php.lang              |   40 ++++++++--------
 data/language-specs/pig.lang              |   14 +++---
 data/language-specs/pkgconfig.lang        |    6 +-
 data/language-specs/po.lang               |   14 +++---
 data/language-specs/prolog.lang           |   18 ++++----
 data/language-specs/protobuf.lang         |   14 +++---
 data/language-specs/puppet.lang           |   16 +++---
 data/language-specs/python.lang           |   40 ++++++++--------
 data/language-specs/python3.lang          |   32 ++++++------
 data/language-specs/rpmspec.lang          |   28 ++++++------
 data/language-specs/rst.lang              |   20 ++++----
 data/language-specs/ruby.lang             |   46 +++++++++---------
 data/language-specs/rust.lang             |   26 +++++-----
 data/language-specs/scala.lang            |   32 ++++++------
 data/language-specs/scheme.lang           |   12 ++--
 data/language-specs/scilab.lang           |   16 +++---
 data/language-specs/sh.lang               |   22 ++++----
 data/language-specs/sml.lang              |   24 +++++-----
 data/language-specs/sparql.lang           |   28 ++++++------
 data/language-specs/sql.lang              |   18 ++++----
 data/language-specs/sweave.lang           |    8 ++--
 data/language-specs/systemverilog.lang    |   10 ++--
 data/language-specs/t2t.lang              |   32 ++++++------
 data/language-specs/tcl.lang              |    6 +-
 data/language-specs/texinfo.lang          |   20 ++++----
 data/language-specs/thrift.lang           |   10 ++--
 data/language-specs/vala.lang             |   20 ++++----
 data/language-specs/vbnet.lang            |   16 +++---
 data/language-specs/verilog.lang          |   30 ++++++------
 data/language-specs/vhdl.lang             |   20 ++++----
 data/language-specs/xml.lang              |   24 +++++-----
 data/language-specs/xslt.lang             |    6 +-
 data/language-specs/yacc.lang             |    8 ++--
 data/language-specs/yaml.lang             |   26 +++++-----
 123 files changed, 1283 insertions(+), 1283 deletions(-)
---
diff --git a/data/language-specs/R.lang b/data/language-specs/R.lang
index b9ce392..a2c1578 100644
--- a/data/language-specs/R.lang
+++ b/data/language-specs/R.lang
@@ -22,7 +22,7 @@
 
 -->
 <!-- Translators: It is the section for a set of languages related for this purpose -->
-<language id="r" _name="R" version="2.0" _section="Scientific">
+<language id="r" name="R" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-R</property>
     <property name="globs">*.R;*.Rout;*.r;*.Rhistory;*.Rt;*.Rout.save;*.Rout.fail</property>
@@ -30,15 +30,15 @@
   </metadata>
 
   <styles>
-    <style id="keyword"             _name="Keyword"               map-to="def:keyword"/>
-    <style id="reserved-classes"    _name="Reserved Class"        map-to="def:type"/>
-    <style id="assignment-operator" _name="Assignment Operator"   map-to="def:operator"/>
-    <style id="delimiter"           _name="Delimiter"             map-to="def:operator"/>
-    <style id="special-constant"    _name="Special Constant"      map-to="def:special-constant"/>
-    <style id="boolean"             _name="Boolean value"         map-to="def:boolean"/>
-    <style id="integer-number"      _name="Integer Number"        map-to="def:base-n-integer"/>
-    <style id="floating-point"      _name="Floating point number" map-to="def:floating-point"/>
-    <style id="functions"           _name="Functions"             map-to="def:function"/>
+    <style id="keyword"             name="Keyword"               map-to="def:keyword"/>
+    <style id="reserved-classes"    name="Reserved Class"        map-to="def:type"/>
+    <style id="assignment-operator" name="Assignment Operator"   map-to="def:operator"/>
+    <style id="delimiter"           name="Delimiter"             map-to="def:operator"/>
+    <style id="special-constant"    name="Special Constant"      map-to="def:special-constant"/>
+    <style id="boolean"             name="Boolean value"         map-to="def:boolean"/>
+    <style id="integer-number"      name="Integer Number"        map-to="def:base-n-integer"/>
+    <style id="floating-point"      name="Floating point number" map-to="def:floating-point"/>
+    <style id="functions"           name="Functions"             map-to="def:function"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/abnf.lang b/data/language-specs/abnf.lang
index 7b6c413..a750d84 100644
--- a/data/language-specs/abnf.lang
+++ b/data/language-specs/abnf.lang
@@ -27,19 +27,19 @@ References:
        https://tools.ietf.org/html/rfc5234
        https://tools.ietf.org/html/rfc7405
 -->
-<language id="abnf" _name="ABNF" version="2.0" _section="Source">
+<language id="abnf" name="ABNF" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.abnf</property>
     <property name="line-comment-start">;</property>
   </metadata>
 
   <styles>
-    <style id="comment"     _name="Comment"            map-to="def:comment"/>
-    <style id="rulename"    _name="Rule Name"          map-to="def:type"/>
-    <style id="binary"      _name="Binary number"      map-to="def:base-n-integer"/>
-    <style id="decimal"     _name="Decimal number"     map-to="def:decimal"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
-    <style id="string"      _name="String"             map-to="def:string"/>
+    <style id="comment"     name="Comment"            map-to="def:comment"/>
+    <style id="rulename"    name="Rule Name"          map-to="def:type"/>
+    <style id="binary"      name="Binary number"      map-to="def:base-n-integer"/>
+    <style id="decimal"     name="Decimal number"     map-to="def:decimal"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="string"      name="String"             map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/actionscript.lang b/data/language-specs/actionscript.lang
index e5cc1f8..9f70fb3 100644
--- a/data/language-specs/actionscript.lang
+++ b/data/language-specs/actionscript.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="actionscript" _name="ActionScript" version="2.0" _section="Source">
+<language id="actionscript" name="ActionScript" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-actionscript</property>
     <property name="globs">*.as</property>
@@ -31,19 +31,19 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="external" _name="External" map-to="def:preprocessor"/>
-    <style id="declaration" _name="Declaration" map-to="def:type"/>
-    <style id="storage-class" _name="Storage Class" map-to="def:type"/>
-    <style id="scope-declaration" _name="Scope Declaration" map-to="def:type"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="number" _name="Number" map-to="def:decimal"/>
-    <style id="reserved" _name="Future Reserved Keywords" map-to="def:error"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="external" name="External" map-to="def:preprocessor"/>
+    <style id="declaration" name="Declaration" map-to="def:type"/>
+    <style id="storage-class" name="Storage Class" map-to="def:type"/>
+    <style id="scope-declaration" name="Scope Declaration" map-to="def:type"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="number" name="Number" map-to="def:decimal"/>
+    <style id="reserved" name="Future Reserved Keywords" map-to="def:error"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ada.lang b/data/language-specs/ada.lang
index 8bd94e5..085dc68 100644
--- a/data/language-specs/ada.lang
+++ b/data/language-specs/ada.lang
@@ -22,7 +22,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="ada" _name="Ada" version="2.0" _section="Source">
+<language id="ada" name="Ada" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-ada;text/x-adasrc</property>
     <property name="globs">*.adb;*.ads</property>
@@ -30,17 +30,17 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="storage-class" _name="Storage Class" map-to="def:type"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="base-n-number" _name="Arbitrary base number" map-to="def:base-n-integer"/>
-    <style id="real" _name="Real number" map-to="def:floating-point"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="storage-class" name="Storage Class" map-to="def:type"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="base-n-number" name="Arbitrary base number" map-to="def:base-n-integer"/>
+    <style id="real" name="Real number" map-to="def:floating-point"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/ansforth94.lang b/data/language-specs/ansforth94.lang
index a887f2a..98f74b1 100644
--- a/data/language-specs/ansforth94.lang
+++ b/data/language-specs/ansforth94.lang
@@ -21,7 +21,7 @@
 
 -->
 
-<language id="ansforth94" _name="ANS-Forth94" version="2.0" _section="Source">
+<language id="ansforth94" name="ANS-Forth94" version="2.0" _section="Source">
 
   <metadata>
     <property name="mimetypes">text/x-forth</property>
@@ -32,20 +32,20 @@
   </metadata>
 
   <styles>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="obs-keyword" _name="Obsolete Keyword" map-to="def:keyword"/>
-
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="alert" _name="Alert" map-to="def:note"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="word" _name="Word" map-to="def:function"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="constant" _name="Constant" map-to="def:constant"/>
-    <style id="variable" _name="Variable" map-to="def:type"/>
-    <style id="local-variable" _name="Local Variable" map-to="def:type"/>
-    <style id="single-number" _name="Single Number" map-to="def:base-n-integer"/>
-    <style id="double-number" _name="Double Number" map-to="def:base-n-integer"/>
-    <style id="float" _name="Float" map-to="def:floating-point"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="obs-keyword" name="Obsolete Keyword" map-to="def:keyword"/>
+
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="alert" name="Alert" map-to="def:note"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="word" name="Word" map-to="def:function"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="constant" name="Constant" map-to="def:constant"/>
+    <style id="variable" name="Variable" map-to="def:type"/>
+    <style id="local-variable" name="Local Variable" map-to="def:type"/>
+    <style id="single-number" name="Single Number" map-to="def:base-n-integer"/>
+    <style id="double-number" name="Double Number" map-to="def:base-n-integer"/>
+    <style id="float" name="Float" map-to="def:floating-point"/>
   </styles>
 
 
diff --git a/data/language-specs/asp.lang b/data/language-specs/asp.lang
index a40d698..1160ce0 100644
--- a/data/language-specs/asp.lang
+++ b/data/language-specs/asp.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="asp" _name="ASP" version="2.0" _section="Source">
+<language id="asp" name="ASP" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-asp;application/x-asp;application/x-asap</property>
     <property name="globs">*.asp</property>
@@ -28,18 +28,18 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="object" _name="ASP Object" map-to="def:type"/>
-    <style id="constant" _name="VBScript and ADO constants" map-to="def:constant"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="special-constant" _name="Special constant" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="number" _name="Number" map-to="def:decimal"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="object" name="ASP Object" map-to="def:type"/>
+    <style id="constant" name="VBScript and ADO constants" map-to="def:constant"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="special-constant" name="Special constant" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="number" name="Number" map-to="def:decimal"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/automake.lang b/data/language-specs/automake.lang
index cb0c9a4..43869d4 100644
--- a/data/language-specs/automake.lang
+++ b/data/language-specs/automake.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="automake" _name="Automake" version="2.0" _section="Source">
+<language id="automake" name="Automake" version="2.0" _section="Source">
   <metadata>
     <property name="globs">Makefile.am;GNUmakefile.am</property>
     <property name="line-comment-start">#</property>
@@ -35,14 +35,14 @@
   -->
 
   <styles>
-    <style id="lhs"       _name="Automake Variable" map-to="def:identifier"/>
-    <style id="primary"   _name="Primary"           map-to="def:type"/>
-    <style id="secondary" _name="Secondary"         map-to="def:statement"/>
-    <style id="prefix"    _name="Prefix"            map-to="def:statement"/>
-    <style id="target"    _name="Optional Target"   map-to="def:statement"/>
-    <style id="dirname"   _name="Built-in Target"   map-to="def:statement"/>
-    <style id="keyword"   _name="Other Keyword"     map-to="def:statement"/>
-    <style id="subst"     _name="Substitution"      map-to="def:preprocessor"/>
+    <style id="lhs"       name="Automake Variable" map-to="def:identifier"/>
+    <style id="primary"   name="Primary"           map-to="def:type"/>
+    <style id="secondary" name="Secondary"         map-to="def:statement"/>
+    <style id="prefix"    name="Prefix"            map-to="def:statement"/>
+    <style id="target"    name="Optional Target"   map-to="def:statement"/>
+    <style id="dirname"   name="Built-in Target"   map-to="def:statement"/>
+    <style id="keyword"   name="Other Keyword"     map-to="def:statement"/>
+    <style id="subst"     name="Substitution"      map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/awk.lang b/data/language-specs/awk.lang
index 1ce7f29..9de238d 100644
--- a/data/language-specs/awk.lang
+++ b/data/language-specs/awk.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="awk" _name="awk" version="2.0" _section="Script">
+<language id="awk" name="awk" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">application/x-awk</property>
     <property name="globs">*.awk</property>
@@ -28,10 +28,10 @@
   </metadata>
 
   <styles>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="pattern" _name="Pattern" map-to="def:preprocessor"/>
-    <style id="variable" _name="Variable" map-to="def:identifier"/>
-    <style id="builtin-function" _name="Builtin Function" map-to="def:builtin"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="pattern" name="Pattern" map-to="def:preprocessor"/>
+    <style id="variable" name="Variable" map-to="def:identifier"/>
+    <style id="builtin-function" name="Builtin Function" map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/bennugd.lang b/data/language-specs/bennugd.lang
index 250a7b5..8070263 100644
--- a/data/language-specs/bennugd.lang
+++ b/data/language-specs/bennugd.lang
@@ -19,7 +19,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="bennugd" _name="BennuGD" version="2.0" _section="Source">
+<language id="bennugd" name="BennuGD" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.prg</property>
     <property name="line-comment-start">//</property>
@@ -28,16 +28,16 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"               map-to="def:comment"/>
-    <style id="preprocessor"      _name="Preprocessor"          map-to="def:preprocessor"/>
-    <style id="identifier"        _name="Identifier"            map-to="def:identifier"/>
-    <style id="operator"          _name="Operator"              map-to="def:operator"/>
-    <style id="keywords"          _name="Keyword"               map-to="def:keyword"/>
-    <style id="types"             _name="Data Type"             map-to="def:type"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"           _name="Decimal number"        map-to="def:decimal"/>
-    <style id="hexadecimal"       _name="Hexadecimal number"    map-to="def:base-n-integer"/>
-    <style id="boolean"           _name="Boolean value"         map-to="def:boolean"/>
+    <style id="comment"           name="Comment"               map-to="def:comment"/>
+    <style id="preprocessor"      name="Preprocessor"          map-to="def:preprocessor"/>
+    <style id="identifier"        name="Identifier"            map-to="def:identifier"/>
+    <style id="operator"          name="Operator"              map-to="def:operator"/>
+    <style id="keywords"          name="Keyword"               map-to="def:keyword"/>
+    <style id="types"             name="Data Type"             map-to="def:type"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"           name="Decimal number"        map-to="def:decimal"/>
+    <style id="hexadecimal"       name="Hexadecimal number"    map-to="def:base-n-integer"/>
+    <style id="boolean"           name="Boolean value"         map-to="def:boolean"/>
   </styles>
 
   <default-regex-options case-sensitive="false" />
diff --git a/data/language-specs/bibtex.lang b/data/language-specs/bibtex.lang
index 4f8becd..b074cd0 100644
--- a/data/language-specs/bibtex.lang
+++ b/data/language-specs/bibtex.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="bibtex" _name="BibTeX" version="2.0" _section="Markup">
+<language id="bibtex" name="BibTeX" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-bibtex</property>
     <property name="globs">*.bib</property>
@@ -28,9 +28,9 @@
   </metadata>
 
   <styles>
-    <style id="entry-type" _name="Entries" map-to="def:keyword"/>
-    <style id="field"      _name="Field"   map-to="def:identifier"/>
-    <style id="string"     _name="String"  map-to="def:string"/>
+    <style id="entry-type" name="Entries" map-to="def:keyword"/>
+    <style id="field"      name="Field"   map-to="def:identifier"/>
+    <style id="string"     name="String"  map-to="def:string"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/bluespec.lang b/data/language-specs/bluespec.lang
index c0a9c4d..3105894 100644
--- a/data/language-specs/bluespec.lang
+++ b/data/language-specs/bluespec.lang
@@ -18,7 +18,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="bluespec" _name="Bluespec SystemVerilog" version="2.0" _section="Source">
+<language id="bluespec" name="Bluespec SystemVerilog" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.bsv</property>
     <property name="line-comment-start">//</property>
@@ -27,12 +27,12 @@
   </metadata>
 
   <styles>
-    <style id="system-task" _name="System Task" map-to="def:keyword"/>
-    <style id="annotation" _name="Annotation" map-to="def:function"/>
-    <style id="attribute" _name="Attribute" map-to="def:type"/>
-    <style id="import-bvi" _name="Import BVI" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Type" map-to="def:type"/>
+    <style id="system-task" name="System Task" map-to="def:keyword"/>
+    <style id="annotation" name="Annotation" map-to="def:function"/>
+    <style id="attribute" name="Attribute" map-to="def:type"/>
+    <style id="import-bvi" name="Import BVI" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Type" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/boo.lang b/data/language-specs/boo.lang
index 33e396a..10b4a9d 100644
--- a/data/language-specs/boo.lang
+++ b/data/language-specs/boo.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="boo" _name="Boo" version="2.0" _section="Source">
+<language id="boo" name="Boo" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-boo</property>
     <property name="globs">*.boo</property>
@@ -30,19 +30,19 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"             map-to="def:comment"/>
-    <style id="multiline-string"  _name="Multiline string"    map-to="def:string"/>
-    <style id="string"            _name="String"              map-to="def:string"/>
-    <style id="regex"             _name="Regular Expression"  map-to="def:string"/>
-    <style id="namespace"         _name="Namespace"           map-to="def:preprocessor"/>
-    <style id="type"              _name="Data Type"           map-to="def:type"/>
-    <style id="definition"        _name="Definition"          map-to="def:keyword"/>
-    <style id="keyword"           _name="Keyword"             map-to="def:keyword"/>
-    <style id="special-variable"  _name="Special Variable"    map-to="def:identifier"/>
-    <style id="null-value"        _name="Null Value"          map-to="def:special-constant"/>
-    <style id="boolean"           _name="Boolean"             map-to="def:boolean"/>
-    <style id="number"            _name="Number"              map-to="def:number"/>
-    <style id="builtin"           _name="Builtin Function"    map-to="def:builtin"/>
+    <style id="comment"           name="Comment"             map-to="def:comment"/>
+    <style id="multiline-string"  name="Multiline string"    map-to="def:string"/>
+    <style id="string"            name="String"              map-to="def:string"/>
+    <style id="regex"             name="Regular Expression"  map-to="def:string"/>
+    <style id="namespace"         name="Namespace"           map-to="def:preprocessor"/>
+    <style id="type"              name="Data Type"           map-to="def:type"/>
+    <style id="definition"        name="Definition"          map-to="def:keyword"/>
+    <style id="keyword"           name="Keyword"             map-to="def:keyword"/>
+    <style id="special-variable"  name="Special Variable"    map-to="def:identifier"/>
+    <style id="null-value"        name="Null Value"          map-to="def:special-constant"/>
+    <style id="boolean"           name="Boolean"             map-to="def:boolean"/>
+    <style id="number"            name="Number"              map-to="def:number"/>
+    <style id="builtin"           name="Builtin Function"    map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/c.lang b/data/language-specs/c.lang
index a4c61cf..12f6010 100644
--- a/data/language-specs/c.lang
+++ b/data/language-specs/c.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="c" _name="C" version="2.0" _section="Source">
+<language id="c" name="C" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-c;text/x-csrc;image/x-xpixmap</property>
     <property name="globs">*.c</property>
@@ -31,26 +31,26 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"               map-to="def:comment"/>
-    <style id="string"            _name="String"                map-to="def:string"/>
-    <style id="preprocessor"      _name="Preprocessor"          map-to="def:preprocessor"/>
-    <style id="common-defines"    _name="Common Defines"        map-to="def:special-constant"/>
-    <style id="included-file"     _name="Included File"         map-to="def:string"/>
-    <style id="char"              _name="Character"             map-to="def:character"/>
-    <style id="keyword"           _name="Keyword"               map-to="def:keyword"/>
-    <style id="operator"          _name="Operator"              map-to="def:operator"/>
-    <style id="type"              _name="Data Type"             map-to="def:type"/>
-    <style id="storage-class"     _name="Storage Class"         map-to="def:type"/>
-    <style id="printf"            _name="printf Conversion"     map-to="def:special-char"/>
-    <style id="escaped-character" _name="Escaped Character"     map-to="def:special-char"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"           _name="Decimal number"        map-to="def:decimal"/>
-    <style id="octal"             _name="Octal number"          map-to="def:base-n-integer"/>
-    <style id="hexadecimal"       _name="Hexadecimal number"    map-to="def:base-n-integer"/>
-    <style id="boolean"           _name="Boolean value"         map-to="def:boolean"/>
-    <style id="standard-stream"   _name="Standard stream"       map-to="def:constant"/>
-    <style id="signal-name"       _name="Signal name"           map-to="def:constant"/>
-    <style id="error"             _name="Error"                 map-to="def:error"/>
+    <style id="comment"           name="Comment"               map-to="def:comment"/>
+    <style id="string"            name="String"                map-to="def:string"/>
+    <style id="preprocessor"      name="Preprocessor"          map-to="def:preprocessor"/>
+    <style id="common-defines"    name="Common Defines"        map-to="def:special-constant"/>
+    <style id="included-file"     name="Included File"         map-to="def:string"/>
+    <style id="char"              name="Character"             map-to="def:character"/>
+    <style id="keyword"           name="Keyword"               map-to="def:keyword"/>
+    <style id="operator"          name="Operator"              map-to="def:operator"/>
+    <style id="type"              name="Data Type"             map-to="def:type"/>
+    <style id="storage-class"     name="Storage Class"         map-to="def:type"/>
+    <style id="printf"            name="printf Conversion"     map-to="def:special-char"/>
+    <style id="escaped-character" name="Escaped Character"     map-to="def:special-char"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"           name="Decimal number"        map-to="def:decimal"/>
+    <style id="octal"             name="Octal number"          map-to="def:base-n-integer"/>
+    <style id="hexadecimal"       name="Hexadecimal number"    map-to="def:base-n-integer"/>
+    <style id="boolean"           name="Boolean value"         map-to="def:boolean"/>
+    <style id="standard-stream"   name="Standard stream"       map-to="def:constant"/>
+    <style id="signal-name"       name="Signal name"           map-to="def:constant"/>
+    <style id="error"             name="Error"                 map-to="def:error"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/cg.lang b/data/language-specs/cg.lang
index d9a2edb..3da7138 100644
--- a/data/language-specs/cg.lang
+++ b/data/language-specs/cg.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cg" _name="CG Shader Language" version="2.0" _section="Source">
+<language id="cg" name="CG Shader Language" version="2.0" _section="Source">
     <metadata>
       <property name="globs">*.cg</property>
       <property name="line-comment-start">//</property>
@@ -29,23 +29,23 @@
     </metadata>
 
     <styles>
-        <style id="comment"           _name="Comment"             map-to="def:comment"/>
-        <style id="error"             _name="Error"               map-to="def:error"/>
-        <style id="preprocessor"      _name="Preprocessor"        map-to="def:preprocessor"/>
-        <style id="bindings"          _name="Bindings"            map-to="def:special-constant"/>
-        <style id="included-file"     _name="Included File"       map-to="def:string"/>
-        <style id="keyword"           _name="Keyword"             map-to="def:keyword"/>
-        <style id="type"              _name="Data Type"           map-to="def:type"/>
-        <style id="storage-class"     _name="Storage Class"       map-to="def:builtin"/>
-        <style id="escaped-character" _name="Escaped Character"   map-to="def:special-char"/>
-        <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-        <style id="decimal"           _name="Decimal number"      map-to="def:decimal"/>
-        <style id="octal"             _name="Octal number"        map-to="def:base-n-integer"/>
-        <style id="hexadecimal"       _name="Hexadecimal number"  map-to="def:base-n-integer"/>
-        <style id="boolean"           _name="Boolean value"       map-to="def:boolean"/>
-        <style id="swizzle"           _name="Swizzle operator"    map-to="def:operator"/>
-        <style id="function"          _name="Function"            map-to="def:function"/>
-        <style id="builtin"           _name="Builtin"             map-to="def:preprocessor"/>
+        <style id="comment"           name="Comment"             map-to="def:comment"/>
+        <style id="error"             name="Error"               map-to="def:error"/>
+        <style id="preprocessor"      name="Preprocessor"        map-to="def:preprocessor"/>
+        <style id="bindings"          name="Bindings"            map-to="def:special-constant"/>
+        <style id="included-file"     name="Included File"       map-to="def:string"/>
+        <style id="keyword"           name="Keyword"             map-to="def:keyword"/>
+        <style id="type"              name="Data Type"           map-to="def:type"/>
+        <style id="storage-class"     name="Storage Class"       map-to="def:builtin"/>
+        <style id="escaped-character" name="Escaped Character"   map-to="def:special-char"/>
+        <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+        <style id="decimal"           name="Decimal number"      map-to="def:decimal"/>
+        <style id="octal"             name="Octal number"        map-to="def:base-n-integer"/>
+        <style id="hexadecimal"       name="Hexadecimal number"  map-to="def:base-n-integer"/>
+        <style id="boolean"           name="Boolean value"       map-to="def:boolean"/>
+        <style id="swizzle"           name="Swizzle operator"    map-to="def:operator"/>
+        <style id="function"          name="Function"            map-to="def:function"/>
+        <style id="builtin"           name="Builtin"             map-to="def:preprocessor"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/changelog.lang b/data/language-specs/changelog.lang
index 2914ff9..fc21f72 100644
--- a/data/language-specs/changelog.lang
+++ b/data/language-specs/changelog.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="changelog" _name="ChangeLog" version="2.0" _section="Other">
+<language id="changelog" name="ChangeLog" version="2.0" _section="Other">
 
   <metadata>
     <property name="mimetypes">text/x-changelog</property>
@@ -29,14 +29,14 @@
   </metadata>
 
   <styles>
-    <style id="date" _name="Date" map-to="def:number"/>
+    <style id="date" name="Date" map-to="def:number"/>
     <!-- Translators: the name of a person, not an object. -->
-    <style id="name" _name="Name" map-to="def:statement"/>
-    <style id="email" _name="E-mail address" map-to="def:identifier"/>
-    <style id="file" _name="File" map-to="def:comment"/>
-    <style id="bullet" _name="Bullet" map-to="def:type"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="release" _name="Release" map-to="def:statement"/>
+    <style id="name" name="Name" map-to="def:statement"/>
+    <style id="email" name="E-mail address" map-to="def:identifier"/>
+    <style id="file" name="File" map-to="def:comment"/>
+    <style id="bullet" name="Bullet" map-to="def:type"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="release" name="Release" map-to="def:statement"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/chdr.lang b/data/language-specs/chdr.lang
index 1d61174..1c9ec50 100644
--- a/data/language-specs/chdr.lang
+++ b/data/language-specs/chdr.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="chdr" _name="C/ObjC Header" version="2.0" _section="Source">
+<language id="chdr" name="C/ObjC Header" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-chdr</property>
     <property name="globs">*.h</property>
diff --git a/data/language-specs/cmake.lang b/data/language-specs/cmake.lang
index 9b62df7..64aea47 100644
--- a/data/language-specs/cmake.lang
+++ b/data/language-specs/cmake.lang
@@ -20,20 +20,20 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cmake" _name="CMake" version="2.0" _section="Other">
+<language id="cmake" name="CMake" version="2.0" _section="Other">
   <metadata>
     <property name="globs">CMakeLists.txt;*.cmake;*.cmake.in;*.ctest;*.ctest.in</property>
     <property name="line-comment-start">#</property>
   </metadata>
 
   <styles>
-    <style id="builtin-command" _name="Builtin Command" map-to="def:function"/>
-    <style id="deprecated-builtin-command" _name="Deprecated Builtin Command" map-to="def:warning"/>
-    <style id="builtin-variable" _name="Builtin Variable" map-to="def:builtin"/>
-    <style id="constant" _name="Constant" map-to="def:constant"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="control" _name="Control Keyword" map-to="def:keyword"/>
-    <style id="variable" _name="Variable" map-to="makefile:variable"/>
+    <style id="builtin-command" name="Builtin Command" map-to="def:function"/>
+    <style id="deprecated-builtin-command" name="Deprecated Builtin Command" map-to="def:warning"/>
+    <style id="builtin-variable" name="Builtin Variable" map-to="def:builtin"/>
+    <style id="constant" name="Constant" map-to="def:constant"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="control" name="Control Keyword" map-to="def:keyword"/>
+    <style id="variable" name="Variable" map-to="makefile:variable"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/cobol.lang b/data/language-specs/cobol.lang
index a334d17..543545e 100644
--- a/data/language-specs/cobol.lang
+++ b/data/language-specs/cobol.lang
@@ -23,7 +23,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cobol" _name="COBOL" version="2.0" _section="Source">
+<language id="cobol" name="COBOL" version="2.0" _section="Source">
   <metadata>
     <property name="mimetype">text/x-cobol</property>
     <property name="globs">*.cbl;*.cob;*.cbd;*.cdb;*.cdc</property>
@@ -31,15 +31,15 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="statement"         _name="Statement"         map-to="def:statement"/>
-    <style id="variable"          _name="Variable"          map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="constant"          _name="Constant"          map-to="def:constant"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="number"            _name="Number"            map-to="def:decimal"/>
-    <style id="operator"          _name="Operator"          map-to="def:operator"/>
-    <style id="error"             _name="Error"             map-to="def:error"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="statement"         name="Statement"         map-to="def:statement"/>
+    <style id="variable"          name="Variable"          map-to="def:type"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="constant"          name="Constant"          map-to="def:constant"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="number"            name="Number"            map-to="def:decimal"/>
+    <style id="operator"          name="Operator"          map-to="def:operator"/>
+    <style id="error"             name="Error"             map-to="def:error"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/cpp.lang b/data/language-specs/cpp.lang
index 18204c4..2b2ddbc 100644
--- a/data/language-specs/cpp.lang
+++ b/data/language-specs/cpp.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cpp" _name="C++" version="2.0" _section="Source">
+<language id="cpp" name="C++" version="2.0" _section="Source">
     <metadata>
       <property name="mimetypes">text/x-c++;text/x-cpp;text/x-c++src</property>
       <property name="globs">*.cpp;*.cxx;*.cc;*.C;*.c++</property>
@@ -31,9 +31,9 @@
     </metadata>
 
     <styles>
-        <style id="keyword" _name="Keyword" map-to="c:keyword"/>
-        <style id="type" _name="Data Type" map-to="c:type"/>
-        <style id="common-defines" _name="Common Defines" map-to="c:common-defines"/>
+        <style id="keyword" name="Keyword" map-to="c:keyword"/>
+        <style id="type" name="Data Type" map-to="c:type"/>
+        <style id="common-defines" name="Common Defines" map-to="c:common-defines"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/cpphdr.lang b/data/language-specs/cpphdr.lang
index 519846b..3eae55d 100644
--- a/data/language-specs/cpphdr.lang
+++ b/data/language-specs/cpphdr.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cpphdr" _name="C++ Header" version="2.0" _section="Source">
+<language id="cpphdr" name="C++ Header" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-c++hdr</property>
     <property name="globs">*.hh;*.hp;*.hpp;*.h++</property>
diff --git a/data/language-specs/csharp.lang b/data/language-specs/csharp.lang
index 100afd6..1016911 100644
--- a/data/language-specs/csharp.lang
+++ b/data/language-specs/csharp.lang
@@ -23,7 +23,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="c-sharp" _name="C#" version="2.0" _section="Source">
+<language id="c-sharp" name="C#" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-csharpsrc;text/x-csharp</property>
     <property name="globs">*.cs</property>
@@ -33,21 +33,21 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="char" _name="Character" map-to="def:character"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="char" name="Character" map-to="def:character"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
     <!-- Translators: this is a format that appears in the strings -->
-    <style id="format" _name="String Format" map-to="def:special-char"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
-    <style id="real" _name="Real number" map-to="def:floating-point"/>
+    <style id="format" name="String Format" map-to="def:special-char"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="real" name="Real number" map-to="def:floating-point"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/css.lang b/data/language-specs/css.lang
index eff8b86..3ef6415 100644
--- a/data/language-specs/css.lang
+++ b/data/language-specs/css.lang
@@ -35,7 +35,7 @@
 
         Converted to new format with convert.py
 -->
-<language id="css" _name="CSS" version="2.0" _section="Other">
+<language id="css" name="CSS" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/css</property>
     <property name="globs">*.css;*.CSSL</property>
@@ -44,21 +44,21 @@
   </metadata>
 
   <styles>
-    <style id="error"                 _name="Error"                 map-to="def:error"/>
-    <style id="others-2"              _name="Others 2"/>
-    <style id="string"                _name="String"                map-to="def:string"/>
-    <style id="color"                 _name="Color"                 map-to="def:base-n-integer"/>
-    <style id="others-3"              _name="Others 3"/>
-    <style id="function"              _name="Function"              map-to="def:function"/>
+    <style id="error"                 name="Error"                 map-to="def:error"/>
+    <style id="others-2"              name="Others 2"/>
+    <style id="string"                name="String"                map-to="def:string"/>
+    <style id="color"                 name="Color"                 map-to="def:base-n-integer"/>
+    <style id="others-3"              name="Others 3"/>
+    <style id="function"              name="Function"              map-to="def:function"/>
     <!-- Translator: it is a type of number -->
-    <style id="decimal"               _name="Decimal"               map-to="def:decimal"/>
-    <style id="dimension"             _name="Dimension"             map-to="def:floating-point"/>
-    <style id="property-values"       _name="Property Value"        map-to="def:constant"/>
-    <style id="at-rules"              _name="at-rules"              map-to="def:preprocessor"/>
-    <style id="keyword"               _name="Keyword"               map-to="def:keyword"/>
-    <style id="selector-id"           _name="ID Selector"           map-to="def:statement"/>
-    <style id="selector-class"        _name="Class Selector"        map-to="def:identifier"/>
-    <style id="selector-tagname"      _name="Tag Name Selector"     map-to="def:type"/>
+    <style id="decimal"               name="Decimal"               map-to="def:decimal"/>
+    <style id="dimension"             name="Dimension"             map-to="def:floating-point"/>
+    <style id="property-values"       name="Property Value"        map-to="def:constant"/>
+    <style id="at-rules"              name="at-rules"              map-to="def:preprocessor"/>
+    <style id="keyword"               name="Keyword"               map-to="def:keyword"/>
+    <style id="selector-id"           name="ID Selector"           map-to="def:statement"/>
+    <style id="selector-class"        name="Class Selector"        map-to="def:identifier"/>
+    <style id="selector-tagname"      name="Tag Name Selector"     map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/csv.lang b/data/language-specs/csv.lang
index 3f77393..55d0848 100644
--- a/data/language-specs/csv.lang
+++ b/data/language-specs/csv.lang
@@ -20,17 +20,17 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="csv" _name="CSV" version="2.0" _section="Other">
+<language id="csv" name="CSV" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/csv</property>
     <property name="globs">*.csv</property>
   </metadata>
 
   <styles>
-    <style id="decimal"           _name="Decimal number"        map-to="def:decimal"/>
-    <style id="escaped-character" _name="Escaped character"     map-to="def:special-char"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="string"            _name="String"                map-to="def:string"/>
+    <style id="decimal"           name="Decimal number"        map-to="def:decimal"/>
+    <style id="escaped-character" name="Escaped character"     map-to="def:special-char"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="string"            name="String"                map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/cuda.lang b/data/language-specs/cuda.lang
index 8d9858c..88c95e0 100644
--- a/data/language-specs/cuda.lang
+++ b/data/language-specs/cuda.lang
@@ -19,7 +19,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cuda" _name="CUDA" version="2.0" _section="Source">
+<language id="cuda" name="CUDA" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.cu;*.cuh</property>
     <property name="line-comment-start">//</property>
@@ -29,11 +29,11 @@
 
 
   <styles>
-    <style id="keyword"       _name="Keyword"           map-to="def:keyword"/>
-    <style id="data-type"     _name="Data Type"         map-to="def:type"/>
-    <style id="cuda-global"   _name="Global Functions"  map-to="def:function"/>
-    <style id="cuda-device"   _name="Device Functions"  map-to="def:function"/>
-    <style id="global-var"    _name="Global Variables"  map-to="def:identifier"/>
+    <style id="keyword"       name="Keyword"           map-to="def:keyword"/>
+    <style id="data-type"     name="Data Type"         map-to="def:type"/>
+    <style id="cuda-global"   name="Global Functions"  map-to="def:function"/>
+    <style id="cuda-device"   name="Device Functions"  map-to="def:function"/>
+    <style id="global-var"    name="Global Variables"  map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/d.lang b/data/language-specs/d.lang
index e70e958..be7887f 100644
--- a/data/language-specs/d.lang
+++ b/data/language-specs/d.lang
@@ -26,7 +26,7 @@
        Reference:
                http://dlang.org/type.html
 -->
-<language id="d" _name="D" version="2.0" _section="Source">
+<language id="d" name="D" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-dsrc</property>
     <property name="globs">*.d</property>
@@ -36,19 +36,19 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="special-token" _name="Special Token" map-to="def:preprocessor"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean" map-to="def:boolean"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="binary" _name="Binary number" map-to="def:base-n-integer"/>
-    <style id="octal" _name="Octal number" map-to="def:base-n-integer"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="special-token" name="Special Token" map-to="def:preprocessor"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean" map-to="def:boolean"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="binary" name="Binary number" map-to="def:base-n-integer"/>
+    <style id="octal" name="Octal number" map-to="def:base-n-integer"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/def.lang b/data/language-specs/def.lang
index 1f74c80..4bd0c0c 100644
--- a/data/language-specs/def.lang
+++ b/data/language-specs/def.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="def" _name="Defaults" hidden="true" version="2.0">
+<language id="def" name="Defaults" hidden="true" version="2.0">
   <styles>
 
     <!-- styles defined here are all the styles that
@@ -36,85 +36,85 @@
 
     <!-- Comment group -->
     <!-- Any comment -->
-    <style id="comment"             _name="Comment"/>
+    <style id="comment"             name="Comment"/>
     <!-- A shebang: #!/bin/sh -->
-    <style id="shebang"             _name="Shebang"               map-to="def:comment"/>
+    <style id="shebang"             name="Shebang"               map-to="def:comment"/>
     <!-- A special comment containing documentation like in javadoc or
          gtk-doc -->
-    <style id="doc-comment"         _name="Documentation comment" map-to="def:comment"/>
+    <style id="doc-comment"         name="Documentation comment" map-to="def:comment"/>
     <!-- A element inside a documentation comment: @author -->
     <!-- This style doesn't map to anything since it must be used as an additional
          style for text which is already styled as a "doc-comment" -->
-    <style id="doc-comment-element" _name="Documentation comment element" />
+    <style id="doc-comment-element" name="Documentation comment element" />
 
     <!-- Constant group -->
     <!-- Any constant -->
-    <style id="constant"            _name="Constant"/>
+    <style id="constant"            name="Constant"/>
     <!-- A character constant: 'c' -->
-    <style id="character"           _name="Character"             map-to="def:constant"/>
+    <style id="character"           name="Character"             map-to="def:constant"/>
     <!-- A string constant: "this is a string" -->
-    <style id="string"              _name="String"                map-to="def:constant"/>
+    <style id="string"              name="String"                map-to="def:constant"/>
     <!-- Special character in a string constant: "%s", "\t" -->
     <!-- This style doesn't map to anything since it must be used as an additional
          style for text which is already styled as a "string" -->
-    <style id="special-char"        _name="Special character (inside a string)" />
+    <style id="special-char"        name="Special character (inside a string)" />
     <!-- A generic number constant -->
-    <style id="number"              _name="Number"                map-to="def:constant"/>
+    <style id="number"              name="Number"                map-to="def:constant"/>
     <!-- A floating point constant: 2.3e10 -->
-    <style id="floating-point"      _name="Floating point number" map-to="def:number"/>
+    <style id="floating-point"      name="Floating point number" map-to="def:number"/>
     <!-- A decimal number: 1234 -->
-    <style id="decimal"             _name="Decimal number"        map-to="def:number"/>
+    <style id="decimal"             name="Decimal number"        map-to="def:number"/>
     <!-- A base-N number: 0xFFFF -->
-    <style id="base-n-integer"      _name="Base-N number"         map-to="def:number"/>
+    <style id="base-n-integer"      name="Base-N number"         map-to="def:number"/>
     <!-- A complex number -->
-    <style id="complex"             _name="Complex number"        map-to="def:number"/>
+    <style id="complex"             name="Complex number"        map-to="def:number"/>
     <!-- A special constant like NULL in C or null in Java -->
-    <style id="special-constant"    _name="Special constant"      map-to="def:constant"/>
+    <style id="special-constant"    name="Special constant"      map-to="def:constant"/>
     <!-- A boolean constant: TRUE, false -->
-    <style id="boolean"             _name="Boolean value"         map-to="def:special-constant"/>
+    <style id="boolean"             name="Boolean value"         map-to="def:special-constant"/>
 
     <!-- Identifier group -->
     <!-- Any variable name -->
-    <style id="identifier"          _name="Identifier" />
+    <style id="identifier"          name="Identifier" />
     <!-- A function name (also: methods for classes) -->
-    <style id="function"            _name="Function" map-to="def:identifier"/>
+    <style id="function"            name="Function" map-to="def:identifier"/>
     <!-- A builtin name: like __import__, abs in Python
         (see http://docs.python.org/lib/built-in-funcs.html) -->
-    <style id="builtin"             _name="Built-in identifier" map-to="def:identifier"/>
+    <style id="builtin"             name="Built-in identifier" map-to="def:identifier"/>
 
     <!-- Statement group -->
     <!-- Any statement -->
-    <style id="statement"           _name="Statement"/>
+    <style id="statement"           name="Statement"/>
     <!-- Operators: "+", "*", etc. -->
-    <style id="operator"            _name="Operator" map-to="def:statement" />
+    <style id="operator"            name="Operator" map-to="def:statement" />
     <!-- keywords: "if", "for", "while", etc. -->
-    <style id="keyword"             _name="Keyword" map-to="def:statement" />
+    <style id="keyword"             name="Keyword" map-to="def:statement" />
 
     <!-- Type group -->
     <!--A primitive data type: int, long, char, etc. -->
-    <style id="type"                _name="Data type"/>
+    <style id="type"                name="Data type"/>
 
     <!-- Others -->
     <!-- This one is for '#include <foo.h>' and "#pragma blah", or 'use foobar', etc.. -->
-    <style id="preprocessor"        _name="Preprocessor directive"/>
+    <style id="preprocessor"        name="Preprocessor directive"/>
     <!-- Any erroneous construct -->
-    <style id="error"               _name="Error"/>
+    <style id="error"               name="Error"/>
     <!-- to mark possibily errors or unrecommended syntax  -->
-    <style id="warning"             _name="Warning"/>
+    <style id="warning"             name="Warning"/>
     <!--Reserved keywords: like "const" and "goto" in Java -->
-    <style id="reserved"            _name="Reserved keyword" map-to="def:error" />
+    <style id="reserved"            name="Reserved keyword" map-to="def:error" />
     <!-- Anything that needs extra attention; mostly the keywords TODO, FIXME and XXX -->
-    <style id="note"                _name="Note (FIXME, TODO, XXX, etc.)"/>
+    <style id="note"                name="Note (FIXME, TODO, XXX, etc.)"/>
     <!-- Text that stands out, HTML links, e-mail addresses, etc. -->
-    <style id="underlined"          _name="Underlined"/>
+    <style id="underlined"          name="Underlined"/>
     <!-- Text that acts as some kind of heading, such as h1, h2, ... in html. -->
-    <style id="heading0"            _name="Heading 0"/>
-    <style id="heading1"            _name="Heading 1"/>
-    <style id="heading2"            _name="Heading 2"/>
-    <style id="heading3"            _name="Heading 3"/>
-    <style id="heading4"            _name="Heading 4"/>
-    <style id="heading5"            _name="Heading 5"/>
-    <style id="heading6"            _name="Heading 6"/>
+    <style id="heading0"            name="Heading 0"/>
+    <style id="heading1"            name="Heading 1"/>
+    <style id="heading2"            name="Heading 2"/>
+    <style id="heading3"            name="Heading 3"/>
+    <style id="heading4"            name="Heading 4"/>
+    <style id="heading5"            name="Heading 5"/>
+    <style id="heading6"            name="Heading 6"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/desktop.lang b/data/language-specs/desktop.lang
index ec224f2..6933a7a 100644
--- a/data/language-specs/desktop.lang
+++ b/data/language-specs/desktop.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="desktop" _name=".desktop" version="2.0" _section="Other">
+<language id="desktop" name=".desktop" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">application/x-gnome-app-info;application/x-desktop</property>
     <property name="globs">*.desktop;*.kdelnk</property>
@@ -29,18 +29,18 @@
   </metadata>
 
   <styles>
-    <style id="group" _name="Group" map-to="def:keyword"/>
+    <style id="group" name="Group" map-to="def:keyword"/>
     <!-- Translators: "Key" here means key value, that is the left hand
          side in a myoption=something line in a .desktop file -->
-    <style id="key" _name="Key" map-to="def:type"/>
-    <style id="language" _name="Translation" map-to="def:decimal"/>
-    <style id="number" _name="Number" map-to="def:floating-point"/>
-    <style id="boolean" _name="Boolean" map-to="def:floating-point"/>
-    <style id="exec-parameter" _name="Exec parameter" map-to="def:floating-point"/>
-    <style id="encoding" _name="Encoding" map-to="def:floating-point"/>
-    <style id="category-main" _name="Main Category" map-to="def:reserved"/>
-    <style id="category-additional" _name="Additional Category" map-to="def:identifier"/>
-    <style id="category-reserved" _name="Reserved Category" map-to="def:note"/>
+    <style id="key" name="Key" map-to="def:type"/>
+    <style id="language" name="Translation" map-to="def:decimal"/>
+    <style id="number" name="Number" map-to="def:floating-point"/>
+    <style id="boolean" name="Boolean" map-to="def:floating-point"/>
+    <style id="exec-parameter" name="Exec parameter" map-to="def:floating-point"/>
+    <style id="encoding" name="Encoding" map-to="def:floating-point"/>
+    <style id="category-main" name="Main Category" map-to="def:reserved"/>
+    <style id="category-additional" name="Additional Category" map-to="def:identifier"/>
+    <style id="category-reserved" name="Reserved Category" map-to="def:note"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/diff.lang b/data/language-specs/diff.lang
index bf6018f..76717eb 100644
--- a/data/language-specs/diff.lang
+++ b/data/language-specs/diff.lang
@@ -20,20 +20,20 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="diff" _name="Diff" version="2.0" _section="Other">
+<language id="diff" name="Diff" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-diff;text/x-patch;text/x-reject</property>
     <property name="globs">*.diff;*.patch;*.rej</property>
   </metadata>
 
   <styles>
-    <style id="added-line"    _name="Added line"/> <!--Others 2-->
-    <style id="removed-line"  _name="Removed line"/> <!--Others 3-->
-    <style id="changed-line"  _name="Changed line"/> <!--Preprocessor-->
-    <style id="special-case"  _name="Special case"/> <!--String-->
-    <style id="location"      _name="Location"/> <!--Keyword-->
-    <style id="ignore"        _name="Ignore" map-to="def:comment"/>
-    <style id="diff-file"     _name=""/> <!--Data Type-->
+    <style id="added-line"    name="Added line"/> <!--Others 2-->
+    <style id="removed-line"  name="Removed line"/> <!--Others 3-->
+    <style id="changed-line"  name="Changed line"/> <!--Preprocessor-->
+    <style id="special-case"  name="Special case"/> <!--String-->
+    <style id="location"      name="Location"/> <!--Keyword-->
+    <style id="ignore"        name="Ignore" map-to="def:comment"/>
+    <style id="diff-file"     name=""/> <!--Data Type-->
   </styles>
 
   <definitions>
diff --git a/data/language-specs/docbook.lang b/data/language-specs/docbook.lang
index d0a441d..390722d 100644
--- a/data/language-specs/docbook.lang
+++ b/data/language-specs/docbook.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="docbook" _name="DocBook" version="2.0" _section="Markup">
+<language id="docbook" name="DocBook" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">application/docbook+xml</property>
     <property name="globs">*.docbook</property>
@@ -29,10 +29,10 @@
   </metadata>
 
   <styles>
-    <style id="header-elements" _name="Header Elements" map-to="def:keyword"/>
-    <style id="formatting-elements" _name="Formatting Elements" map-to="def:keyword"/>
-    <style id="gui-elements" _name="GUI Elements" map-to="def:keyword"/>
-    <style id="structural-elements" _name="Structural Elements" map-to="def:keyword"/>
+    <style id="header-elements" name="Header Elements" map-to="def:keyword"/>
+    <style id="formatting-elements" name="Formatting Elements" map-to="def:keyword"/>
+    <style id="gui-elements" name="GUI Elements" map-to="def:keyword"/>
+    <style id="structural-elements" name="Structural Elements" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/dosbatch.lang b/data/language-specs/dosbatch.lang
index ca412e3..e61d431 100644
--- a/data/language-specs/dosbatch.lang
+++ b/data/language-specs/dosbatch.lang
@@ -20,17 +20,17 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="dosbatch" _name="DOS Batch" version="2.0" _section="Script">
+<language id="dosbatch" name="DOS Batch" version="2.0" _section="Script">
   <metadata>
     <property name="globs">*.bat;*.cmd;*.sys</property>
     <property name="line-comment-start">rem</property>
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="commands" _name="Command" map-to="def:keyword"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="commands" name="Command" map-to="def:keyword"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/dot.lang b/data/language-specs/dot.lang
index 2755b62..a56d63b 100644
--- a/data/language-specs/dot.lang
+++ b/data/language-specs/dot.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="dot" _name="Graphviz Dot" version="2.0" _section="Other">
+<language id="dot" name="Graphviz Dot" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/vnd.graphviz</property>
     <property name="globs">*.dot;*.gv</property>
@@ -30,10 +30,10 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="attribute" _name="Attribute name" map-to="def:type"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="attribute" name="Attribute name" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/dpatch.lang b/data/language-specs/dpatch.lang
index 45e552a..49afbd6 100644
--- a/data/language-specs/dpatch.lang
+++ b/data/language-specs/dpatch.lang
@@ -20,14 +20,14 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="dpatch" _name="DPatch" version="2.0" _section="Other">
+<language id="dpatch" name="DPatch" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-dpatch</property>
     <property name="globs">*.dpatch</property>
   </metadata>
 
   <styles>
-    <style id="patch-start" _name="Patch Start" map-to="def:keyword"/>
+    <style id="patch-start" name="Patch Start" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/dtd.lang b/data/language-specs/dtd.lang
index 0cb2578..039e4d6 100644
--- a/data/language-specs/dtd.lang
+++ b/data/language-specs/dtd.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="dtd" _name="DTD" version="2.0" _section="Markup">
+<language id="dtd" name="DTD" version="2.0" _section="Markup">
     <metadata>
       <property name="mimetypes">text/x-dtd</property>
       <property name="globs">*.dtd</property>
@@ -29,10 +29,10 @@
     </metadata>
 
     <styles>
-      <style id="entity" _name="entity" map-to="xml:entity"/>
-      <style id="decl" _name="decl" map-to="xml:doctype"/>
-      <style id="error" _name="error" map-to="xml:error"/>
-      <style id="quoted-value" _name="Quoted Value" map-to="xml:attribute-value"/>
+      <style id="entity" name="entity" map-to="xml:entity"/>
+      <style id="decl" name="decl" map-to="xml:doctype"/>
+      <style id="error" name="error" map-to="xml:error"/>
+      <style id="quoted-value" name="Quoted Value" map-to="xml:attribute-value"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/dtl.lang b/data/language-specs/dtl.lang
index c94df8d..a020d18 100644
--- a/data/language-specs/dtl.lang
+++ b/data/language-specs/dtl.lang
@@ -22,7 +22,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 -->
-<language id="dtl" _name="Django Template" version="2.0" _section="Markup">
+<language id="dtl" name="Django Template" version="2.0" _section="Markup">
   <metadata>
     <property name="globs">*.dtl</property>
     <property name="line-comment-start">**</property>
@@ -31,17 +31,17 @@
   </metadata>
 
   <styles>
-    <style id="comment"         _name="Comment" map-to="def:comment"/>
-    <style id="error"           _name="Error" map-to="def:error"/>
-    <style id="escape"          _name="Escaped Character" map-to="def:special-char"/>
-    <style id="string"          _name="String" map-to="def:string"/>
-    <style id="keyword"         _name="Keyword" map-to="def:keyword"/>
-    <style id="filters"         _name="Null Value" map-to="def:function"/>
-    <style id="boolean"         _name="Boolean value" map-to="def:boolean"/>
-    <style id="floating-point"  _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"         _name="Decimal number" map-to="def:decimal"/>
-    <style id="octal"           _name="Octal number" map-to="def:base-n-integer"/>
-    <style id="hexadecimal"     _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="comment"         name="Comment" map-to="def:comment"/>
+    <style id="error"           name="Error" map-to="def:error"/>
+    <style id="escape"          name="Escaped Character" map-to="def:special-char"/>
+    <style id="string"          name="String" map-to="def:string"/>
+    <style id="keyword"         name="Keyword" map-to="def:keyword"/>
+    <style id="filters"         name="Null Value" map-to="def:function"/>
+    <style id="boolean"         name="Boolean value" map-to="def:boolean"/>
+    <style id="floating-point"  name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"         name="Decimal number" map-to="def:decimal"/>
+    <style id="octal"           name="Octal number" map-to="def:base-n-integer"/>
+    <style id="hexadecimal"     name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/eiffel.lang b/data/language-specs/eiffel.lang
index 2cbab82..f5b26f9 100644
--- a/data/language-specs/eiffel.lang
+++ b/data/language-specs/eiffel.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="eiffel" _name="Eiffel" version="2.0" _section="Source">
+<language id="eiffel" name="Eiffel" version="2.0" _section="Source">
 
   <metadata>
     <property name="mimetypes">text/x-eiffel</property>
@@ -29,20 +29,20 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="debug" _name="Debug" map-to="def:preprocessor"/>
-    <style id="assertion" _name="Assertion" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="design-by-contract" _name="Design by Contract" map-to="def:keyword"/>
-    <style id="exception-handling" _name="Exception Handling" map-to="def:keyword"/>
-    <style id="predefined-variable" _name="Predefined Variable" map-to="def:builtin"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="void" _name="Void Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean Value" map-to="def:boolean"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="debug" name="Debug" map-to="def:preprocessor"/>
+    <style id="assertion" name="Assertion" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="design-by-contract" name="Design by Contract" map-to="def:keyword"/>
+    <style id="exception-handling" name="Exception Handling" map-to="def:keyword"/>
+    <style id="predefined-variable" name="Predefined Variable" map-to="def:builtin"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="void" name="Void Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean Value" map-to="def:boolean"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <default-regex-options case-sensitive="true"/>
diff --git a/data/language-specs/erlang.lang b/data/language-specs/erlang.lang
index e8646af..fe9a7d7 100644
--- a/data/language-specs/erlang.lang
+++ b/data/language-specs/erlang.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="erlang" _name="Erlang" version="2.0" _section="Source">
+<language id="erlang" name="Erlang" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-erlang</property>
     <property name="globs">*.erl;*.hrl</property>
@@ -28,17 +28,17 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="atom" _name="Atom" map-to="def:type"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="builtin" _name="Builtin" map-to="def:builtin"/>
-    <style id="compiler-directive" _name="Compiler Directive" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="atom" name="Atom" map-to="def:type"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="builtin" name="Builtin" map-to="def:builtin"/>
+    <style id="compiler-directive" name="Compiler Directive" map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/fcl.lang b/data/language-specs/fcl.lang
index afaa188..1aa20db 100644
--- a/data/language-specs/fcl.lang
+++ b/data/language-specs/fcl.lang
@@ -20,19 +20,19 @@
  License along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="fcl" _name="FCL" version="2.0" _section="Scientific">
+<language id="fcl" name="FCL" version="2.0" _section="Scientific">
   <metadata>
     <property name="globs">*.fcl</property>
     <property name="line-comment-start">//</property>
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="floating-point"    _name="Floating Point"    map-to="def:floating-point"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="block"             _name="Block"             map-to="def:function"/>
-    <style id="decimal"           _name="Decimal"           map-to="def:decimal"/>
-    <style id="reserved-constant" _name="Reserved Constant" map-to="def:special-constant"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="floating-point"    name="Floating Point"    map-to="def:floating-point"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="block"             name="Block"             map-to="def:function"/>
+    <style id="decimal"           name="Decimal"           map-to="def:decimal"/>
+    <style id="reserved-constant" name="Reserved Constant" map-to="def:special-constant"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/forth.lang b/data/language-specs/forth.lang
index bc06298..64ed716 100644
--- a/data/language-specs/forth.lang
+++ b/data/language-specs/forth.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="forth" _name="Forth" version="2.0" _section="Source">
+<language id="forth" name="Forth" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-forth</property>
     <property name="globs">*.frt;*.fs</property>
@@ -30,15 +30,15 @@
   </metadata>
 
   <styles>
-    <style id="comment"       _name="Comment"            map-to="def:comment"/>
-    <style id="string"        _name="String"             map-to="def:string"/>
-    <style id="preprocessor"  _name="Preprocessor"       map-to="def:preprocessor"/>
-    <style id="keyword"       _name="Keyword"            map-to="def:statement"/>
-    <style id="type"          _name="Data Type"          map-to="def:type"/>
-    <style id="number"        _name="Number"             map-to="def:decimal"/>
-    <style id="debugs"        _name="Debug Code"         map-to="def:comment"/>
-    <style id="error"         _name="Error Text"         map-to="def:error"/>
-    <style id="compiler"      _name="Compiler Directive" map-to="def:identifier"/>
+    <style id="comment"       name="Comment"            map-to="def:comment"/>
+    <style id="string"        name="String"             map-to="def:string"/>
+    <style id="preprocessor"  name="Preprocessor"       map-to="def:preprocessor"/>
+    <style id="keyword"       name="Keyword"            map-to="def:statement"/>
+    <style id="type"          name="Data Type"          map-to="def:type"/>
+    <style id="number"        name="Number"             map-to="def:decimal"/>
+    <style id="debugs"        name="Debug Code"         map-to="def:comment"/>
+    <style id="error"         name="Error Text"         map-to="def:error"/>
+    <style id="compiler"      name="Compiler Directive" map-to="def:identifier"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/fortran.lang b/data/language-specs/fortran.lang
index 628bc85..0b540c6 100644
--- a/data/language-specs/fortran.lang
+++ b/data/language-specs/fortran.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="fortran" _name="Fortran 95" version="2.0" _section="Source">
+<language id="fortran" name="Fortran 95" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-fortran</property>
     <property name="globs">*.f;*.f90;*.f95;*.for;*.F;*.F90</property>
@@ -29,18 +29,18 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="floating-point" _name="Floating Point" map-to="def:floating-point"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="intrinsic" _name="Intrinsic function" map-to="def:builtin"/>
-    <style id="boz-literal" _name="BOZ Literal" map-to="def:base-n-integer"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="openmp-directives" _name="OpenMP directives" map-to="def:preprocessor"/>
-    <style id="included-file" _name="Included File" map-to="def:string"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="floating-point" name="Floating Point" map-to="def:floating-point"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="intrinsic" name="Intrinsic function" map-to="def:builtin"/>
+    <style id="boz-literal" name="BOZ Literal" map-to="def:base-n-integer"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="openmp-directives" name="OpenMP directives" map-to="def:preprocessor"/>
+    <style id="included-file" name="Included File" map-to="def:string"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/fsharp.lang b/data/language-specs/fsharp.lang
index e4279fb..c2effdd 100644
--- a/data/language-specs/fsharp.lang
+++ b/data/language-specs/fsharp.lang
@@ -21,7 +21,7 @@
 
 -->
 
-<language id="fsharp" _name="F#" version="2.0" _section="Source">
+<language id="fsharp" name="F#" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-fsharp</property>
     <property name="globs">*.fs;</property>
@@ -30,25 +30,25 @@
     <property name="block-comment-end">*)</property>
   </metadata>
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="floating-point" _name="Floating Point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="meta-keyword" _name="Type, module or object keyword" map-to="def:keyword"/>
-    <style id="fun-keyword" _name="Builtin-function keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="label" _name="Labeled argument" map-to="def:type"/>
-    <style id="poly-variant" _name="Polymorphic Variant" map-to="def:type"/>
-    <style id="variant" _name="Variant Constructor" map-to="def:type"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="floating-point" name="Floating Point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="meta-keyword" name="Type, module or object keyword" map-to="def:keyword"/>
+    <style id="fun-keyword" name="Builtin-function keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="label" name="Labeled argument" map-to="def:type"/>
+    <style id="poly-variant" name="Polymorphic Variant" map-to="def:type"/>
+    <style id="variant" name="Variant Constructor" map-to="def:type"/>
     <!-- Translators: this is a specific variable called Type -->
-    <style id="type-var" _name="Type Variable" map-to="def:type"/>
-    <style id="module" _name="Module Path" map-to="def:type"/>
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
+    <style id="type-var" name="Type Variable" map-to="def:type"/>
+    <style id="module" name="Module Path" map-to="def:type"/>
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/gap.lang b/data/language-specs/gap.lang
index b8d5a9f..8bd2c59 100644
--- a/data/language-specs/gap.lang
+++ b/data/language-specs/gap.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="gap" _name="GAP" version="2.0" _section="Scientific">
+<language id="gap" name="GAP" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-gap</property>
     <property name="globs">*.g;*.gd;*.gi;*.gap</property>
@@ -28,11 +28,11 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="character" _name="Character" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="character" name="Character" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/gdb-log.lang b/data/language-specs/gdb-log.lang
index 06725e7..afc1dcf 100644
--- a/data/language-specs/gdb-log.lang
+++ b/data/language-specs/gdb-log.lang
@@ -15,22 +15,22 @@
   You should have received a copy of the GNU Lesser General Public License
   along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
-<language id="gdb-log" _name="GDB Log" version="2.0" _section="Other">
+<language id="gdb-log" name="GDB Log" version="2.0" _section="Other">
   <metadata>
     <property name="globs">*.gdb</property>
   </metadata>
 
   <styles>
-    <style id="thread-action" _name="Thread Action" map-to="def:comment"/>
-    <style id="thread-header" _name="Thread Header" map-to="def:statement"/>
-    <style id="frame-number" _name="Frame Number" map-to="def:keyword"/>
-    <style id="address" _name="Address" map-to="def:number"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="filename" _name="Filename" map-to="def:statement"/>
-    <style id="optimized-out" _name="Optimized Out" map-to="def:special-constant"/>
-    <style id="incomplete-sequence" _name="Incomplete Sequence" map-to="def:special-constant"/>
-    <style id="prompt" _name="Prompt" map-to="def:comment"/>
+    <style id="thread-action" name="Thread Action" map-to="def:comment"/>
+    <style id="thread-header" name="Thread Header" map-to="def:statement"/>
+    <style id="frame-number" name="Frame Number" map-to="def:keyword"/>
+    <style id="address" name="Address" map-to="def:number"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="filename" name="Filename" map-to="def:statement"/>
+    <style id="optimized-out" name="Optimized Out" map-to="def:special-constant"/>
+    <style id="incomplete-sequence" name="Incomplete Sequence" map-to="def:special-constant"/>
+    <style id="prompt" name="Prompt" map-to="def:comment"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/genie.lang b/data/language-specs/genie.lang
index fdcab1d..de94d75 100644
--- a/data/language-specs/genie.lang
+++ b/data/language-specs/genie.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="genie" _name="Genie" version="2.0" _section="Source">
+<language id="genie" name="Genie" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-genie</property>
     <property name="globs">*.gs</property>
@@ -30,20 +30,20 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="multiline-string" _name="Multiline string" map-to="def:string"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="regex" _name="Regular Expression" map-to="def:string"/>
-    <style id="namespace" _name="Namespace" map-to="def:preprocessor"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="definition" _name="Definition" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="special-variable" _name="Special Variable" map-to="def:identifier"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean" map-to="def:boolean"/>
-    <style id="number" _name="Number" map-to="def:number"/>
-    <style id="builtin" _name="Builtin Function" map-to="def:builtin"/>
-    <style id="printf" _name="printf Conversion" map-to="def:special-char"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="multiline-string" name="Multiline string" map-to="def:string"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="regex" name="Regular Expression" map-to="def:string"/>
+    <style id="namespace" name="Namespace" map-to="def:preprocessor"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="definition" name="Definition" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="special-variable" name="Special Variable" map-to="def:identifier"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean" map-to="def:boolean"/>
+    <style id="number" name="Number" map-to="def:number"/>
+    <style id="builtin" name="Builtin Function" map-to="def:builtin"/>
+    <style id="printf" name="printf Conversion" map-to="def:special-char"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/glsl.lang b/data/language-specs/glsl.lang
index dcff7e6..f3513a3 100644
--- a/data/language-specs/glsl.lang
+++ b/data/language-specs/glsl.lang
@@ -27,7 +27,7 @@
  Specification (February 12, 2010):
 http://www.opengl.org/registry/doc/GLSLangSpec.4.00.7.pdf
 -->
-<language id="glsl" _name="OpenGL Shading Language" version="2.0" _section="Source">
+<language id="glsl" name="OpenGL Shading Language" version="2.0" _section="Source">
 
   <metadata>
     <property name="globs">*.glslv;*.glslf</property>
@@ -37,13 +37,13 @@ http://www.opengl.org/registry/doc/GLSLangSpec.4.00.7.pdf
   </metadata>
 
   <styles>
-    <style id="preprocessor"      _name="Preprocessor"          map-to="def:preprocessor"/>
-    <style id="type"              _name="Data Type"             map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"               map-to="def:keyword"/>
-    <style id="builtin-function"  _name="Builtin Function"      map-to="def:builtin"/>
-    <style id="builtin-constant"  _name="Builtin Constant"      map-to="def:constant"/>
-    <style id="builtin-variable"  _name="Builtin Variable"      map-to="def:identifier"/>
-    <style id="future-use"        _name="Reserved Keywords"/>
+    <style id="preprocessor"      name="Preprocessor"          map-to="def:preprocessor"/>
+    <style id="type"              name="Data Type"             map-to="def:type"/>
+    <style id="keyword"           name="Keyword"               map-to="def:keyword"/>
+    <style id="builtin-function"  name="Builtin Function"      map-to="def:builtin"/>
+    <style id="builtin-constant"  name="Builtin Constant"      map-to="def:constant"/>
+    <style id="builtin-variable"  name="Builtin Variable"      map-to="def:identifier"/>
+    <style id="future-use"        name="Reserved Keywords"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/go.lang b/data/language-specs/go.lang
index e8142fc..bfe31ed 100644
--- a/data/language-specs/go.lang
+++ b/data/language-specs/go.lang
@@ -21,7 +21,7 @@
 
   See: http://code.google.com/p/go/source/browse/misc/vim/syntax/go.vim
 -->
-<language id="go" _name="Go" version="2.0" _section="Source">
+<language id="go" name="Go" version="2.0" _section="Source">
   <metadata>
     <property name="mimetype">text/x-go</property>
     <property name="globs">*.go</property>
@@ -31,22 +31,22 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"             map-to="def:comment"/>
-    <style id="error"             _name="Error"               map-to="def:error"/>
-    <style id="string"            _name="String"              map-to="def:string"/>
-    <style id="char"              _name="Character"           map-to="def:character"/>
-    <style id="keyword"           _name="Keyword"             map-to="def:keyword"/>
-    <style id="type"              _name="Data Type"           map-to="def:type"/>
-    <style id="printf"            _name="printf Conversion"   map-to="def:special-char"/>
-    <style id="escaped-character" _name="Escaped Character"   map-to="def:special-char"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="imaginary"         _name="Imaginary number"    map-to="def:number"/>
-    <style id="decimal"           _name="Decimal number"      map-to="def:decimal"/>
-    <style id="octal"             _name="Octal number"        map-to="def:base-n-integer"/>
-    <style id="hexadecimal"       _name="Hexadecimal number"  map-to="def:base-n-integer"/>
-    <style id="boolean"           _name="Boolean value"       map-to="def:boolean"/>
-    <style id="builtin-constant"  _name="Builtin Constant"    map-to="def:special-constant"/>
-    <style id="builtin-function"  _name="Builtin Function"    map-to="def:builtin"/>
+    <style id="comment"           name="Comment"             map-to="def:comment"/>
+    <style id="error"             name="Error"               map-to="def:error"/>
+    <style id="string"            name="String"              map-to="def:string"/>
+    <style id="char"              name="Character"           map-to="def:character"/>
+    <style id="keyword"           name="Keyword"             map-to="def:keyword"/>
+    <style id="type"              name="Data Type"           map-to="def:type"/>
+    <style id="printf"            name="printf Conversion"   map-to="def:special-char"/>
+    <style id="escaped-character" name="Escaped Character"   map-to="def:special-char"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="imaginary"         name="Imaginary number"    map-to="def:number"/>
+    <style id="decimal"           name="Decimal number"      map-to="def:decimal"/>
+    <style id="octal"             name="Octal number"        map-to="def:base-n-integer"/>
+    <style id="hexadecimal"       name="Hexadecimal number"  map-to="def:base-n-integer"/>
+    <style id="boolean"           name="Boolean value"       map-to="def:boolean"/>
+    <style id="builtin-constant"  name="Builtin Constant"    map-to="def:special-constant"/>
+    <style id="builtin-function"  name="Builtin Function"    map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/gtk-doc.lang b/data/language-specs/gtk-doc.lang
index eafc289..fa48255 100644
--- a/data/language-specs/gtk-doc.lang
+++ b/data/language-specs/gtk-doc.lang
@@ -21,19 +21,19 @@
 
 -->
 <!-- Copyright (C) 2006-2007 - Yevgen Muntyan <muntyan tamu edu> -->
-<language id="gtk-doc" _name="gtk-doc" version="2.0" _section="Markup" hidden="true">
+<language id="gtk-doc" name="gtk-doc" version="2.0" _section="Markup" hidden="true">
     <styles>
-        <style id="inline-docs-section" _name="Inline Documentation Section" map-to="def:doc-comment"/>
-        <style id="function-name" _name="Function Name" map-to="def:doc-comment-element"/>
-        <style id="signal-name" _name="Signal Name" map-to="def:doc-comment-element"/>
-        <style id="property-name" _name="Property Name" map-to="def:doc-comment-element"/>
-        <style id="parameter" _name="Parameter" map-to="def:doc-comment-element"/>
-        <style id="constant" _name="Constant" map-to="def:doc-comment-element"/>
-        <style id="type" _name="Type" map-to="def:doc-comment-element"/>
-        <style id="function" _name="Function" map-to="def:doc-comment-element"/>
-        <style id="return" _name="Return" map-to="def:doc-comment-element"/>
-        <style id="since" _name="Since" map-to="def:doc-comment-element"/>
-        <style id="deprecated" _name="Deprecated" map-to="def:doc-comment-element"/>
+        <style id="inline-docs-section" name="Inline Documentation Section" map-to="def:doc-comment"/>
+        <style id="function-name" name="Function Name" map-to="def:doc-comment-element"/>
+        <style id="signal-name" name="Signal Name" map-to="def:doc-comment-element"/>
+        <style id="property-name" name="Property Name" map-to="def:doc-comment-element"/>
+        <style id="parameter" name="Parameter" map-to="def:doc-comment-element"/>
+        <style id="constant" name="Constant" map-to="def:doc-comment-element"/>
+        <style id="type" name="Type" map-to="def:doc-comment-element"/>
+        <style id="function" name="Function" map-to="def:doc-comment-element"/>
+        <style id="return" name="Return" map-to="def:doc-comment-element"/>
+        <style id="since" name="Since" map-to="def:doc-comment-element"/>
+        <style id="deprecated" name="Deprecated" map-to="def:doc-comment-element"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/gtkrc.lang b/data/language-specs/gtkrc.lang
index 44f9a9e..dce7043 100644
--- a/data/language-specs/gtkrc.lang
+++ b/data/language-specs/gtkrc.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="gtkrc" _name="GtkRC" version="2.0" _section="Other">
+<language id="gtkrc" name="GtkRC" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-gtkrc</property>
     <property name="globs">gtkrc;.gtkrc;gtkrc-*;.gtkrc-*</property>
@@ -29,14 +29,14 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="variable" _name="Data Type" map-to="def:type"/>
-    <style id="state" _name="Widget State" map-to="def:special-constant"/>
-    <style id="include-directive" _name="Include directive" map-to="def:preprocessor"/>
-    <style id="boolean-value" _name="Boolean value" map-to="def:boolean"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="variable" name="Data Type" map-to="def:type"/>
+    <style id="state" name="Widget State" map-to="def:special-constant"/>
+    <style id="include-directive" name="Include directive" map-to="def:preprocessor"/>
+    <style id="boolean-value" name="Boolean value" map-to="def:boolean"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/haddock.lang b/data/language-specs/haddock.lang
index 79e5e8e..fb901d0 100644
--- a/data/language-specs/haddock.lang
+++ b/data/language-specs/haddock.lang
@@ -20,23 +20,23 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="haddock" _name="Haddock" version="2.0" _section="Markup" hidden="true">
+<language id="haddock" name="Haddock" version="2.0" _section="Markup" hidden="true">
 
   <styles>
-    <style id="markup"     _name="Inline Haddock Section" map-to="def:doc-comment"/>
-    <style id="directive"  _name="Haddock Directive" map-to="def:doc-comment-element"/>
-    <style id="identifier" _name="Hyperlinked Identifier" map-to="def:doc-comment-element"/>
-    <style id="module"     _name="Hyperlinked Module Name" map-to="def:doc-comment-element"/>
-    <style id="escape"     _name="Escape" map-to="def:special-char"/>
-    <style id="emphasis"   _name="Emphasis" map-to="def:doc-comment-element"/>
-    <style id="monospace"  _name="Monospace" />
-    <style id="codeblock"  _name="Code Block" />
-    <style id="property"   _name="Header Property" map-to="def:doc-comment-element"/>
-    <style id="itemized"   _name="Itemized list" map-to="def:doc-comment-element"/>
-    <style id="enumerated" _name="Enumerated list" map-to="def:doc-comment-element"/>
-    <style id="definition" _name="Definition list" map-to="def:doc-comment-element"/>
-    <style id="url"        _name="URL" map-to="def:underlined"/>
-    <style id="anchor"     _name="Anchor" map-to="def:doc-comment-element"/>
+    <style id="markup"     name="Inline Haddock Section" map-to="def:doc-comment"/>
+    <style id="directive"  name="Haddock Directive" map-to="def:doc-comment-element"/>
+    <style id="identifier" name="Hyperlinked Identifier" map-to="def:doc-comment-element"/>
+    <style id="module"     name="Hyperlinked Module Name" map-to="def:doc-comment-element"/>
+    <style id="escape"     name="Escape" map-to="def:special-char"/>
+    <style id="emphasis"   name="Emphasis" map-to="def:doc-comment-element"/>
+    <style id="monospace"  name="Monospace" />
+    <style id="codeblock"  name="Code Block" />
+    <style id="property"   name="Header Property" map-to="def:doc-comment-element"/>
+    <style id="itemized"   name="Itemized list" map-to="def:doc-comment-element"/>
+    <style id="enumerated" name="Enumerated list" map-to="def:doc-comment-element"/>
+    <style id="definition" name="Definition list" map-to="def:doc-comment-element"/>
+    <style id="url"        name="URL" map-to="def:underlined"/>
+    <style id="anchor"     name="Anchor" map-to="def:doc-comment-element"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/haskell-literate.lang b/data/language-specs/haskell-literate.lang
index 6bc1e79..6cd5660 100644
--- a/data/language-specs/haskell-literate.lang
+++ b/data/language-specs/haskell-literate.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="haskell-literate" _name="Literate Haskell" version="2.0" _section="Source">
+<language id="haskell-literate" name="Literate Haskell" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-literate-haskell</property>
     <property name="globs">*.lhs</property>
diff --git a/data/language-specs/haskell.lang b/data/language-specs/haskell.lang
index f638efc..3dffbc0 100644
--- a/data/language-specs/haskell.lang
+++ b/data/language-specs/haskell.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="haskell" _name="Haskell" version="2.0" _section="Source">
+<language id="haskell" name="Haskell" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-haskell</property>
     <property name="globs">*.hs</property>
@@ -29,19 +29,19 @@
   </metadata>
 
   <styles>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="comment"      _name="Comment"      map-to="def:comment"/>
-    <style id="variable"     _name="Variable"                         />
-    <style id="symbol"       _name="Symbol"                           />
-    <style id="keyword"      _name="Keyword"      map-to="def:keyword"/>
-    <style id="type"         _name="Data Type"    map-to="def:type"/>
-    <style id="string"       _name="String"       map-to="def:string"/>
-    <style id="character"    _name="Character"    map-to="def:character"/>
-    <style id="char-escape"  _name="Escaped Character" map-to="def:special-char"/>
-    <style id="float"        _name="Float"        map-to="def:floating-point"/>
-    <style id="decimal"      _name="Decimal"      map-to="def:decimal"/>
-    <style id="octal"        _name="Octal"        map-to="def:base-n-integer"/>
-    <style id="hexadecimal"  _name="Hex"          map-to="def:base-n-integer"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="comment"      name="Comment"      map-to="def:comment"/>
+    <style id="variable"     name="Variable"                         />
+    <style id="symbol"       name="Symbol"                           />
+    <style id="keyword"      name="Keyword"      map-to="def:keyword"/>
+    <style id="type"         name="Data Type"    map-to="def:type"/>
+    <style id="string"       name="String"       map-to="def:string"/>
+    <style id="character"    name="Character"    map-to="def:character"/>
+    <style id="char-escape"  name="Escaped Character" map-to="def:special-char"/>
+    <style id="float"        name="Float"        map-to="def:floating-point"/>
+    <style id="decimal"      name="Decimal"      map-to="def:decimal"/>
+    <style id="octal"        name="Octal"        map-to="def:base-n-integer"/>
+    <style id="hexadecimal"  name="Hex"          map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/haxe.lang b/data/language-specs/haxe.lang
index c0ae236..c59e3c8 100644
--- a/data/language-specs/haxe.lang
+++ b/data/language-specs/haxe.lang
@@ -31,7 +31,7 @@ References:
   https://haxe.org/manual/expression.html
 -->
 
-<language id="haxe" _name="Haxe" version="2.0" _section="Source">
+<language id="haxe" name="Haxe" version="2.0" _section="Source">
 
   <metadata>
 
@@ -44,23 +44,23 @@ References:
 
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment" />
-    <style id="external"          _name="External"          map-to="def:preprocessor" />
-    <style id="preprocessor"      _name="Preprocessor"      map-to="def:preprocessor" />
-    <style id="declaration"       _name="Declaration"       map-to="def:type" />
-    <style id="storage-class"     _name="Storage Class"     map-to="def:type" />
-    <style id="scope"             _name="Scope"             map-to="def:type" />
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword" />
-    <style id="string"            _name="String"            map-to="def:string" />
-    <style id="number"            _name="Number"            map-to="def:decimal" />
-    <style id="boolean"           _name="Boolean value"     map-to="def:boolean" />
-    <style id="null-value"        _name="Null Value"        map-to="def:special-constant" />
-    <style id="type"              _name="Data Type"         map-to="def:identifier" />
-    <style id="metadata"          _name="Metadata"          map-to="def:constant" />
-    <style id="macro"             _name="Macro"             map-to="def:preprocessor" />
-    <style id="error"             _name="Error"             map-to="def:error" />
-    <style id="escaped-char"      _name="Escaped Character" map-to="def:special-char" />
-    <style id="identifier-prefix" _name="Identifier Prefix" map-to="def:warning" />
+    <style id="comment"           name="Comment"           map-to="def:comment" />
+    <style id="external"          name="External"          map-to="def:preprocessor" />
+    <style id="preprocessor"      name="Preprocessor"      map-to="def:preprocessor" />
+    <style id="declaration"       name="Declaration"       map-to="def:type" />
+    <style id="storage-class"     name="Storage Class"     map-to="def:type" />
+    <style id="scope"             name="Scope"             map-to="def:type" />
+    <style id="keyword"           name="Keyword"           map-to="def:keyword" />
+    <style id="string"            name="String"            map-to="def:string" />
+    <style id="number"            name="Number"            map-to="def:decimal" />
+    <style id="boolean"           name="Boolean value"     map-to="def:boolean" />
+    <style id="null-value"        name="Null Value"        map-to="def:special-constant" />
+    <style id="type"              name="Data Type"         map-to="def:identifier" />
+    <style id="metadata"          name="Metadata"          map-to="def:constant" />
+    <style id="macro"             name="Macro"             map-to="def:preprocessor" />
+    <style id="error"             name="Error"             map-to="def:error" />
+    <style id="escaped-char"      name="Escaped Character" map-to="def:special-char" />
+    <style id="identifier-prefix" name="Identifier Prefix" map-to="def:warning" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/html.lang b/data/language-specs/html.lang
index 1a79d34..5db6baa 100644
--- a/data/language-specs/html.lang
+++ b/data/language-specs/html.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="html" _name="HTML" version="2.0" _section="Markup">
+<language id="html" name="HTML" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/html</property>
     <property name="globs">*.html;*.htm</property>
@@ -30,18 +30,18 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="xml:comment"/>
-    <style id="tag" _name="Tag" map-to="xml:element-name"/>
-    <style id="attrib-name" _name="Attribute Name" map-to="xml:attribute-name"/>
-    <style id="attrib-value" _name="Attribute Value" map-to="xml:attribute-value"/>
-    <style id="dtd" _name="DTD" map-to="xml:doctype"/>
-    <style id="error" _name="Error" map-to="xml:error"/>
-    <style id="title" _name="Page title" map-to="def:heading0"/>
-    <style id="h1" _name="Heading level 1" map-to="def:heading1"/>
-    <style id="h2" _name="Heading level 2" map-to="def:heading2"/>
-    <style id="h3" _name="Heading level 3" map-to="def:heading3"/>
-    <style id="h4" _name="Heading level 4" map-to="def:heading4"/>
-    <style id="h5" _name="Heading level 5" map-to="def:heading5"/>
+    <style id="comment" name="Comment" map-to="xml:comment"/>
+    <style id="tag" name="Tag" map-to="xml:element-name"/>
+    <style id="attrib-name" name="Attribute Name" map-to="xml:attribute-name"/>
+    <style id="attrib-value" name="Attribute Value" map-to="xml:attribute-value"/>
+    <style id="dtd" name="DTD" map-to="xml:doctype"/>
+    <style id="error" name="Error" map-to="xml:error"/>
+    <style id="title" name="Page title" map-to="def:heading0"/>
+    <style id="h1" name="Heading level 1" map-to="def:heading1"/>
+    <style id="h2" name="Heading level 2" map-to="def:heading2"/>
+    <style id="h3" name="Heading level 3" map-to="def:heading3"/>
+    <style id="h4" name="Heading level 4" map-to="def:heading4"/>
+    <style id="h5" name="Heading level 5" map-to="def:heading5"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/idl-exelis.lang b/data/language-specs/idl-exelis.lang
index b3e76d6..33ff8f6 100644
--- a/data/language-specs/idl-exelis.lang
+++ b/data/language-specs/idl-exelis.lang
@@ -17,21 +17,21 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="idl-exelis" _name="IDL-Exelis" version="2.0" _section="Scientific">
+<language id="idl-exelis" name="IDL-Exelis" version="2.0" _section="Scientific">
   <metadata>
     <property name="globs">*.pro</property>
     <property name="line-comment-start">;</property>
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="function" _name="Function" map-to="def:function"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="function" name="Function" map-to="def:function"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/idl.lang b/data/language-specs/idl.lang
index a45e166..c1f3a93 100644
--- a/data/language-specs/idl.lang
+++ b/data/language-specs/idl.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="idl" _name="IDL" version="2.0" _section="Source">
+<language id="idl" name="IDL" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-idl</property>
     <property name="globs">*.idl</property>
@@ -28,11 +28,11 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="string" _name="String" map-to="def:string"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="string" name="String" map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/imagej.lang b/data/language-specs/imagej.lang
index fa5cf9c..a7a5791 100644
--- a/data/language-specs/imagej.lang
+++ b/data/language-specs/imagej.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="imagej" _name="ImageJ" version="2.0" _section="Scientific">
+<language id="imagej" name="ImageJ" version="2.0" _section="Scientific">
   <metadata>
     <property name="globs">*.ijm</property>
     <property name="line-comment-start">//</property>
@@ -29,14 +29,14 @@
   </metadata>
 
   <styles>
-    <style id="builtin"           _name="Builtin"             map-to="def:builtin"/>
-    <style id="boolean"           _name="Boolean"             map-to="def:boolean"/>
-    <style id="command"           _name="Commands"            map-to="def:function"/>
-    <style id="storage-type"      _name="Storage Type"        map-to="def:type"/>
-    <style id="escape"            _name="Escaped Character"   map-to="def:special-char"/>
-    <style id="keyword"           _name="Keyword"             map-to="def:keyword"/>
-    <style id="operator"          _name="Operator"            map-to="def:operator"/>
-    <style id="string"            _name="String"              map-to="def:string"/>
+    <style id="builtin"           name="Builtin"             map-to="def:builtin"/>
+    <style id="boolean"           name="Boolean"             map-to="def:boolean"/>
+    <style id="command"           name="Commands"            map-to="def:function"/>
+    <style id="storage-type"      name="Storage Type"        map-to="def:type"/>
+    <style id="escape"            name="Escaped Character"   map-to="def:special-char"/>
+    <style id="keyword"           name="Keyword"             map-to="def:keyword"/>
+    <style id="operator"          name="Operator"            map-to="def:operator"/>
+    <style id="string"            name="String"              map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ini.lang b/data/language-specs/ini.lang
index 3e2ae64..ad28ef4 100644
--- a/data/language-specs/ini.lang
+++ b/data/language-specs/ini.lang
@@ -19,7 +19,7 @@
  You should have received a copy of the GNU Lesser General Public License
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
-<language id="ini" _name=".ini" version="2.0" _section="Other">
+<language id="ini" name=".ini" version="2.0" _section="Other">
   <metadata>
     <property 
name="mimetypes">text/x-ini-file;application/x-ini-file;text/x-systemd-unit;text/x-dbus-service</property>
     <property name="globs">*.ini</property>
@@ -27,14 +27,14 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="floating-point" _name="Floating Point" map-to="def:floating-point"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="variable" _name="Variable" map-to="def:type"/>
-    <style id="non-standard-key" _name="Data Type" map-to="def:type"/>
-    <style id="boolean-value" _name="Boolean value" map-to="def:boolean"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="floating-point" name="Floating Point" map-to="def:floating-point"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="variable" name="Variable" map-to="def:type"/>
+    <style id="non-standard-key" name="Data Type" map-to="def:type"/>
+    <style id="boolean-value" name="Boolean value" map-to="def:boolean"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/j.lang b/data/language-specs/j.lang
index 705d123..44d3b5e 100644
--- a/data/language-specs/j.lang
+++ b/data/language-specs/j.lang
@@ -20,29 +20,29 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="j" _name="J" version="2.0" _section="Source">
+<language id="j" name="J" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.ijs</property>
     <property name="line-comment-start">NB\.</property>
   </metadata>
 
   <styles>
-    <style id="adverb" _name="Adverb" map-to="def:identifier" />
-    <style id="comment" _name="Comment" map-to="def:comment" />
-    <style id="conjunction" _name="Conjunction" map-to="def:identifier" />
-    <style id="control" _name="Control" map-to="def:keyword" />
-    <style id="error" _name="Error" map-to="def:error" />
-    <style id="exparg" _name="Explicit Argument" map-to="def:special-char" />
-    <style id="global" _name="Global" map-to="def:type" />
-    <style id="labtext" _name="Lab Text" map-to="def:preprocessor" />
-    <style id="local" _name="Local" map-to="def:type" />
-    <style id="noun" _name="Noun" map-to="def:special-constant" />
-    <style id="noundef" _name="Explicit Noun Definition" map-to="def:string" />
-    <style id="number" _name="Number" map-to="def:decimal" />
-    <style id="parens" _name="Parens" map-to="def:statement" />
-    <style id="primitive" _name="Primitive" map-to="def:identifier" />
-    <style id="string" _name="String" map-to="def:string" />
-    <style id="verb"  _name="Verb" map-to="def:identifier" />
+    <style id="adverb" name="Adverb" map-to="def:identifier" />
+    <style id="comment" name="Comment" map-to="def:comment" />
+    <style id="conjunction" name="Conjunction" map-to="def:identifier" />
+    <style id="control" name="Control" map-to="def:keyword" />
+    <style id="error" name="Error" map-to="def:error" />
+    <style id="exparg" name="Explicit Argument" map-to="def:special-char" />
+    <style id="global" name="Global" map-to="def:type" />
+    <style id="labtext" name="Lab Text" map-to="def:preprocessor" />
+    <style id="local" name="Local" map-to="def:type" />
+    <style id="noun" name="Noun" map-to="def:special-constant" />
+    <style id="noundef" name="Explicit Noun Definition" map-to="def:string" />
+    <style id="number" name="Number" map-to="def:decimal" />
+    <style id="parens" name="Parens" map-to="def:statement" />
+    <style id="primitive" name="Primitive" map-to="def:identifier" />
+    <style id="string" name="String" map-to="def:string" />
+    <style id="verb"  name="Verb" map-to="def:identifier" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/jade.lang b/data/language-specs/jade.lang
index 300f66d..1598f56 100644
--- a/data/language-specs/jade.lang
+++ b/data/language-specs/jade.lang
@@ -21,22 +21,22 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="jade" _name="Jade" version="2.0" _section="Markup">
+<language id="jade" name="Jade" version="2.0" _section="Markup">
   <metadata>
     <property name="globs">*.jade;*.pug</property>
     <property name="line-comment-start">//</property>
   </metadata>
 
   <styles>
-    <style id="comment"                 _name="Comment"                 map-to="def:comment"/>
-    <style id="doctype"                 _name="DOCTYPE"                 map-to="def:preprocessor"/>
-    <style id="processing-instruction"  _name="Processing instruction"  map-to="def:preprocessor"/>
-    <style id="element-name"            _name="Element name"            map-to="def:identifier"/>
-    <style id="attribute-name"          _name="Attribute name"          map-to="def:type"/>
-    <style id="attribute-value"         _name="Attribute value"         map-to="def:string"/>
-    <style id="tags"                    _name="Tags"                    map-to="def:keyword"/>
-    <style id="entity"                  _name="Entity"                  map-to="def:preprocessor"/>
-    <style id="error"                   _name="Error"                   map-to="def:error"/>
+    <style id="comment"                 name="Comment"                 map-to="def:comment"/>
+    <style id="doctype"                 name="DOCTYPE"                 map-to="def:preprocessor"/>
+    <style id="processing-instruction"  name="Processing instruction"  map-to="def:preprocessor"/>
+    <style id="element-name"            name="Element name"            map-to="def:identifier"/>
+    <style id="attribute-name"          name="Attribute name"          map-to="def:type"/>
+    <style id="attribute-value"         name="Attribute value"         map-to="def:string"/>
+    <style id="tags"                    name="Tags"                    map-to="def:keyword"/>
+    <style id="entity"                  name="Entity"                  map-to="def:preprocessor"/>
+    <style id="error"                   name="Error"                   map-to="def:error"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/java.lang b/data/language-specs/java.lang
index c1a43ac..081b65d 100644
--- a/data/language-specs/java.lang
+++ b/data/language-specs/java.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="java" _name="Java" version="2.0" _section="Source">
+<language id="java" name="Java" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-java</property>
     <property name="globs">*.java</property>
@@ -31,22 +31,22 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"                   map-to="def:comment"/>
-    <style id="escaped-character" _name="Escaped Character"         map-to="def:special-char"/>
-    <style id="string"            _name="String"                    map-to="def:string"/>
-    <style id="char"              _name="Character"                 map-to="def:character"/>
+    <style id="comment"           name="Comment"                   map-to="def:comment"/>
+    <style id="escaped-character" name="Escaped Character"         map-to="def:special-char"/>
+    <style id="string"            name="String"                    map-to="def:string"/>
+    <style id="char"              name="Character"                 map-to="def:character"/>
     <!-- Translators: refered to some specific keywords of the language that
          allow to get external functionalities -->
-    <style id="external"          _name="External"                  map-to="def:preprocessor"/>
-    <style id="declaration"       _name="Declaration"               map-to="def:type"/>
-    <style id="storage-class"     _name="Storage Class"             map-to="def:type"/>
-    <style id="scope-declaration" _name="Scope Declaration"         map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"                   map-to="def:keyword"/>
-    <style id="null-value"        _name="Null Value"                map-to="def:special-constant"/>
-    <style id="boolean"           _name="Boolean value"             map-to="def:boolean"/>
-    <style id="number"            _name="Number"                    map-to="def:decimal"/>
-    <style id="reserved"          _name="Future Reserved Keywords"  map-to="def:reserved"/>
-    <style id="type"              _name="Data Type"                 map-to="def:type"/>
+    <style id="external"          name="External"                  map-to="def:preprocessor"/>
+    <style id="declaration"       name="Declaration"               map-to="def:type"/>
+    <style id="storage-class"     name="Storage Class"             map-to="def:type"/>
+    <style id="scope-declaration" name="Scope Declaration"         map-to="def:type"/>
+    <style id="keyword"           name="Keyword"                   map-to="def:keyword"/>
+    <style id="null-value"        name="Null Value"                map-to="def:special-constant"/>
+    <style id="boolean"           name="Boolean value"             map-to="def:boolean"/>
+    <style id="number"            name="Number"                    map-to="def:decimal"/>
+    <style id="reserved"          name="Future Reserved Keywords"  map-to="def:reserved"/>
+    <style id="type"              name="Data Type"                 map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/javascript.lang b/data/language-specs/javascript.lang
index d1f8ca8..2d08149 100644
--- a/data/language-specs/javascript.lang
+++ b/data/language-specs/javascript.lang
@@ -23,7 +23,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="js" _name="JavaScript" version="2.0" _section="Script">
+<language id="js" name="JavaScript" version="2.0" _section="Script">
   <metadata>
     <property 
name="mimetypes">application/javascript;application/x-javascript;text/x-javascript;text/javascript;text/x-js</property>
     <property name="globs">*.js;*.node</property>
@@ -33,18 +33,18 @@
   </metadata>
 
   <styles>
-    <style id="escape"          _name="Escaped Character"        map-to="def:special-char"/>
-    <style id="null-value"      _name="Null Value"               map-to="def:special-constant"/>
-    <style id="undefined-value" _name="Undefined Value"          map-to="def:special-constant"/>
-    <style id="boolean"         _name="Boolean Value"            map-to="def:boolean"/>
-    <style id="keyword"         _name="Keyword"                  map-to="def:keyword"/>
-    <style id="type"            _name="Data Type"                map-to="def:type"/>
-    <style id="function"        _name="Function"                 map-to="def:builtin"/>
-    <style id="properties"      _name="Properties"               map-to="def:statement"/>
-    <style id="constructors"    _name="Constructors"             map-to="def:type"/>
-    <style id="future-words"    _name="Future Reserved Keywords" map-to="def:error"/>
-    <style id="string"          _name="String"                   map-to="def:string"/>
-    <style id="regex"           _name="Regular Expression"       map-to="def:string"/>
+    <style id="escape"          name="Escaped Character"        map-to="def:special-char"/>
+    <style id="null-value"      name="Null Value"               map-to="def:special-constant"/>
+    <style id="undefined-value" name="Undefined Value"          map-to="def:special-constant"/>
+    <style id="boolean"         name="Boolean Value"            map-to="def:boolean"/>
+    <style id="keyword"         name="Keyword"                  map-to="def:keyword"/>
+    <style id="type"            name="Data Type"                map-to="def:type"/>
+    <style id="function"        name="Function"                 map-to="def:builtin"/>
+    <style id="properties"      name="Properties"               map-to="def:statement"/>
+    <style id="constructors"    name="Constructors"             map-to="def:type"/>
+    <style id="future-words"    name="Future Reserved Keywords" map-to="def:error"/>
+    <style id="string"          name="String"                   map-to="def:string"/>
+    <style id="regex"           name="Regular Expression"       map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/json.lang b/data/language-specs/json.lang
index 6e9b077..aebb8f5 100644
--- a/data/language-specs/json.lang
+++ b/data/language-specs/json.lang
@@ -33,14 +33,14 @@
   </metadata>
 
   <styles>
-    <style id="keyname"       _name="Key"                   map-to="def:constant"/>
-    <style id="special-char"  _name="Escaped Character"     map-to="js:escape"/>
-    <style id="string"        _name="String"                map-to="js:string"/>
-    <style id="null-value"    _name="Null Value"            map-to="js:null-value"/>
-    <style id="boolean"       _name="Boolean Value"         map-to="js:boolean"/>
-    <style id="error"         _name="Error"                 map-to="def:error"/>
-    <style id="decimal"       _name="Decimal"               map-to="def:decimal"/>
-    <style id="float"         _name="Floating point number" map-to="def:floating-point"/>
+    <style id="keyname"       name="Key"                   map-to="def:constant"/>
+    <style id="special-char"  name="Escaped Character"     map-to="js:escape"/>
+    <style id="string"        name="String"                map-to="js:string"/>
+    <style id="null-value"    name="Null Value"            map-to="js:null-value"/>
+    <style id="boolean"       name="Boolean Value"         map-to="js:boolean"/>
+    <style id="error"         name="Error"                 map-to="def:error"/>
+    <style id="decimal"       name="Decimal"               map-to="def:decimal"/>
+    <style id="float"         name="Floating point number" map-to="def:floating-point"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/julia.lang b/data/language-specs/julia.lang
index 19aa728..5c88b6f 100644
--- a/data/language-specs/julia.lang
+++ b/data/language-specs/julia.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="julia" _name="Julia" version="2.0" _section="Scientific" >
+<language id="julia" name="Julia" version="2.0" _section="Scientific" >
 
   <metadata>
     <property name="globs" >*.jl</property>
@@ -33,19 +33,19 @@
   https://git.gnome.org/browse/gtksourceview/tree/data/language-specs/def.lang
   -->
   <styles>
-    <style id="string"           _name="String"            map-to="def:string" />
-    <style id="character"        _name="Character"         map-to="def:character" />
-    <style id="number"           _name="Number"            map-to="def:number" />
-    <style id="boolean"          _name="Boolean"           map-to="def:boolean" />
-    <style id="math-constant"    _name="Math Constant"     map-to="def:constant" />
-    <style id="special-constant" _name="Special Constant"  map-to="def:special-constant" />
-    <style id="operator"         _name="Operator"          map-to="def:operator" />
-    <style id="keyword"          _name="Keyword"           map-to="def:keyword" />
-    <style id="macro"            _name="Macro"             map-to="def:keyword" />
-    <style id="external-command" _name="External Command"  map-to="def:constant" />
-    <style id="builtin-function" _name="Built-in Function" map-to="def:builtin" />
-    <style id="module"           _name="Module"            map-to="def:builtin" />
-    <style id="type"             _name="Type"              map-to="def:type" />
+    <style id="string"           name="String"            map-to="def:string" />
+    <style id="character"        name="Character"         map-to="def:character" />
+    <style id="number"           name="Number"            map-to="def:number" />
+    <style id="boolean"          name="Boolean"           map-to="def:boolean" />
+    <style id="math-constant"    name="Math Constant"     map-to="def:constant" />
+    <style id="special-constant" name="Special Constant"  map-to="def:special-constant" />
+    <style id="operator"         name="Operator"          map-to="def:operator" />
+    <style id="keyword"          name="Keyword"           map-to="def:keyword" />
+    <style id="macro"            name="Macro"             map-to="def:keyword" />
+    <style id="external-command" name="External Command"  map-to="def:constant" />
+    <style id="builtin-function" name="Built-in Function" map-to="def:builtin" />
+    <style id="module"           name="Module"            map-to="def:builtin" />
+    <style id="type"             name="Type"              map-to="def:type" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/latex.lang b/data/language-specs/latex.lang
index 73e8d77..593e4d6 100644
--- a/data/language-specs/latex.lang
+++ b/data/language-specs/latex.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="latex" _name="LaTeX" version="2.0" _section="Markup">
+<language id="latex" name="LaTeX" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-tex</property>
     <property name="globs">*.tex;*.ltx;*.sty;*.cls;*.dtx;*.ins;*.bbl</property>
@@ -29,23 +29,23 @@
   </metadata>
 
   <styles>
-    <style id="comment"            _name="Comment"              map-to="def:comment"/>
-    <style id="display-math"       _name="Math Mode"            map-to="def:string"/>
-    <style id="inline-math"        _name="Inline Math Mode"     map-to="latex:display-math"/>
-    <style id="math"               _name="Math Mode"            map-to="latex:display-math"/>
-    <style id="math-boundary"      _name="Math Boundary"        map-to="latex:display-math"/>
-    <style id="include"            _name="Include"              map-to="def:keyword"/>
-    <style id="common-commands"    _name="Command"              map-to="def:keyword"/>
-    <style id="command"            _name="Command"              map-to="def:keyword"/>
-    <style id="verbatim"           _name="Verbatim"             map-to="def:comment"/>
-    <style id="special-char"       _name="Special Character"    map-to="def:special-char"/>
-    <style id="part"               _name="Part Heading"          map-to="def:heading0"/>
-    <style id="chapter"            _name="Chapter Heading"       map-to="def:heading1"/>
-    <style id="section"            _name="Section Heading"       map-to="def:heading2"/>
-    <style id="subsection"         _name="SubSection Heading"    map-to="def:heading3"/>
-    <style id="subsubsection"      _name="SubSubSection Heading" map-to="def:heading4"/>
-    <style id="paragraph"          _name="Paragraph Heading"     map-to="def:heading5"/>
-    <style id="subparagraph"       _name="SubParagraph Heading"  map-to="def:heading6"/>
+    <style id="comment"            name="Comment"              map-to="def:comment"/>
+    <style id="display-math"       name="Math Mode"            map-to="def:string"/>
+    <style id="inline-math"        name="Inline Math Mode"     map-to="latex:display-math"/>
+    <style id="math"               name="Math Mode"            map-to="latex:display-math"/>
+    <style id="math-boundary"      name="Math Boundary"        map-to="latex:display-math"/>
+    <style id="include"            name="Include"              map-to="def:keyword"/>
+    <style id="common-commands"    name="Command"              map-to="def:keyword"/>
+    <style id="command"            name="Command"              map-to="def:keyword"/>
+    <style id="verbatim"           name="Verbatim"             map-to="def:comment"/>
+    <style id="special-char"       name="Special Character"    map-to="def:special-char"/>
+    <style id="part"               name="Part Heading"          map-to="def:heading0"/>
+    <style id="chapter"            name="Chapter Heading"       map-to="def:heading1"/>
+    <style id="section"            name="Section Heading"       map-to="def:heading2"/>
+    <style id="subsection"         name="SubSection Heading"    map-to="def:heading3"/>
+    <style id="subsubsection"      name="SubSubSection Heading" map-to="def:heading4"/>
+    <style id="paragraph"          name="Paragraph Heading"     map-to="def:heading5"/>
+    <style id="subparagraph"       name="SubParagraph Heading"  map-to="def:heading6"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/lex.lang b/data/language-specs/lex.lang
index 8958500..0651b34 100644
--- a/data/language-specs/lex.lang
+++ b/data/language-specs/lex.lang
@@ -21,7 +21,7 @@
 
 -->
 
-<language id="lex" _name="Lex" _section="Source" version="2.0">
+<language id="lex" name="Lex" _section="Source" version="2.0">
   <metadata>
     <property name="globs">*.l;*.lex;*.flex</property>
     <property name="line-comment-start">//</property>
@@ -30,10 +30,10 @@
   </metadata>
 
   <styles>
-    <style id="token" _name="Token" map-to="def:keyword" />
-    <style id="keyword" _name="Keyword" map-to="def:keyword" />
-    <style id="regexp" _name="Pattern" map-to="def:identifier" />
-    <style id="expression" _name="Expression" map-to="def:type" />
+    <style id="token" name="Token" map-to="def:keyword" />
+    <style id="keyword" name="Keyword" map-to="def:keyword" />
+    <style id="regexp" name="Pattern" map-to="def:identifier" />
+    <style id="expression" name="Expression" map-to="def:type" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/libtool.lang b/data/language-specs/libtool.lang
index fb3053e..3213c47 100644
--- a/data/language-specs/libtool.lang
+++ b/data/language-specs/libtool.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="libtool" _name="libtool" version="2.0" _section="Other">
+<language id="libtool" name="libtool" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-libtool</property>
     <property name="globs">*.la;*.lai;*.lo</property>
@@ -28,8 +28,8 @@
   </metadata>
 
   <styles>
-    <style id="constant" _name="Constant" map-to="def:constant"/>
-    <style id="boolean" _name="Boolean" map-to="libtool:constant"/>
+    <style id="constant" name="Constant" map-to="def:constant"/>
+    <style id="boolean" name="Boolean" map-to="libtool:constant"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/llvm.lang b/data/language-specs/llvm.lang
index cfe95fd..33e86c6 100644
--- a/data/language-specs/llvm.lang
+++ b/data/language-specs/llvm.lang
@@ -19,23 +19,23 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="llvm" _name="LLVM IR" version="2.0" _section="Source">
+<language id="llvm" name="LLVM IR" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.ll</property>
     <property name="line-comment-start">;</property>
   </metadata>
 
   <styles>
-    <style id="comment"     _name="Comment"       map-to="def:comment"/>
-    <style id="string"      _name="String"        map-to="def:string"/>
-    <style id="keyword"     _name="Keyword"       map-to="def:keyword"/>
-    <style id="function"    _name="Function"      map-to="def:function"/>
-    <style id="constant"    _name="Constants"     map-to="def:constant"/>
-    <style id="variable"    _name="Variable"      map-to="def:variable"/>
-    <style id="identifier"  _name="Identifier"    map-to="def:identifier"/>
-    <style id="type"        _name="Data Type"     map-to="def:type"/>
-    <style id="boolean"     _name="Boolean value" map-to="def:boolean"/>
-    <style id="number"      _name="Number"        map-to="def:decimal"/>
+    <style id="comment"     name="Comment"       map-to="def:comment"/>
+    <style id="string"      name="String"        map-to="def:string"/>
+    <style id="keyword"     name="Keyword"       map-to="def:keyword"/>
+    <style id="function"    name="Function"      map-to="def:function"/>
+    <style id="constant"    name="Constants"     map-to="def:constant"/>
+    <style id="variable"    name="Variable"      map-to="def:variable"/>
+    <style id="identifier"  name="Identifier"    map-to="def:identifier"/>
+    <style id="type"        name="Data Type"     map-to="def:type"/>
+    <style id="boolean"     name="Boolean value" map-to="def:boolean"/>
+    <style id="number"      name="Number"        map-to="def:decimal"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/lua.lang b/data/language-specs/lua.lang
index c0b62ec..fe81ecc 100644
--- a/data/language-specs/lua.lang
+++ b/data/language-specs/lua.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="lua" _name="Lua" version="2.0" _section="Script">
+<language id="lua" name="Lua" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-lua</property>
     <property name="globs">*.lua</property>
@@ -30,15 +30,15 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="reserved" _name="Reserved Identifier" map-to="def:keyword"/>
-    <style id="label" _name="Label" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="nil-value" _name="Nil Constant" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
+    <style id="reserved" name="Reserved Identifier" map-to="def:keyword"/>
+    <style id="label" name="Label" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="nil-value" name="Nil Constant" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/m4.lang b/data/language-specs/m4.lang
index d6accf0..978cbaf 100644
--- a/data/language-specs/m4.lang
+++ b/data/language-specs/m4.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="m4" _name="m4" _section="Script" version="2.0">
+<language id="m4" name="m4" _section="Script" version="2.0">
   <metadata>
     <property name="mimetypes">application/x-m4</property>
     <property name="globs">*.m4;configure.ac;configure.in</property>
@@ -28,10 +28,10 @@
   </metadata>
 
   <styles>
-    <style id="m4-comment" _name="m4 Comment" map-to="sh:comment"/>
-    <style id="m4-macro" _name="m4 Macro" map-to="def:keyword"/>
-    <style id="ac-macro" _name="Autoconf Macro" map-to="def:keyword"/>
-    <style id="ac-macro-obsolete" _name="Obsolete Autoconf Macro" map-to="def:error"/>
+    <style id="m4-comment" name="m4 Comment" map-to="sh:comment"/>
+    <style id="m4-macro" name="m4 Macro" map-to="def:keyword"/>
+    <style id="ac-macro" name="Autoconf Macro" map-to="def:keyword"/>
+    <style id="ac-macro-obsolete" name="Obsolete Autoconf Macro" map-to="def:error"/>
   </styles>
 
   <!--
diff --git a/data/language-specs/makefile.lang b/data/language-specs/makefile.lang
index 108364a..36ee3d1 100644
--- a/data/language-specs/makefile.lang
+++ b/data/language-specs/makefile.lang
@@ -19,7 +19,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="makefile" _name="Makefile" version="2.0" _section="Source">
+<language id="makefile" name="Makefile" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-makefile</property>
     <property name="globs">[Mm]akefile;GNUmakefile;*.make;*.mak;*.mk</property>
@@ -27,17 +27,17 @@
   </metadata>
 
   <styles>
-    <style id="variable"        _name="Variable" map-to="def:type"/>
-    <style id="assignment-rhs"  _name="Assignment Right Hand Side"/>
-    <style id="assignment-lhs"  _name="Assignment Left Hand Side"/>
-    <style id="targets"         _name="targets" map-to="def:function"/>
-    <style id="prereq"          _name="prereq"/>
-    <style id="command"         _name="command"/>
+    <style id="variable"        name="Variable" map-to="def:type"/>
+    <style id="assignment-rhs"  name="Assignment Right Hand Side"/>
+    <style id="assignment-lhs"  name="Assignment Left Hand Side"/>
+    <style id="targets"         name="targets" map-to="def:function"/>
+    <style id="prereq"          name="prereq"/>
+    <style id="command"         name="command"/>
     <!-- Translators: Trailing Tabs refers to tabulation characters present at
          the end of the line -->
-    <style id="trailing-tab"    _name="Trailing Tab"/>
-    <style id="function"        _name="function" map-to="def:function"/>
-    <style id="keyword"         _name="keyword" map-to="def:keyword"/>
+    <style id="trailing-tab"    name="Trailing Tab"/>
+    <style id="function"        name="function" map-to="def:function"/>
+    <style id="keyword"         name="keyword" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/mallard.lang b/data/language-specs/mallard.lang
index 5196575..d8bd914 100644
--- a/data/language-specs/mallard.lang
+++ b/data/language-specs/mallard.lang
@@ -19,7 +19,7 @@
  You should have received a copy of the GNU Lesser General Public License
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
-<language id="mallard" _name="Mallard" version="2.0" _section="Markup">
+<language id="mallard" name="Mallard" version="2.0" _section="Markup">
 
   <metadata>
     <property name="globs">*.page</property>
@@ -28,10 +28,10 @@
   </metadata>
 
   <styles>
-    <style id="page"    _name="Page Elements"    map-to="def:identifier"/>
-    <style id="section" _name="Section Elements" map-to="def:identifier"/>
-    <style id="block"   _name="Block Elements"   map-to="def:identifier"/>
-    <style id="inline"  _name="Inline Elements"  map-to="def:identifier"/>
+    <style id="page"    name="Page Elements"    map-to="def:identifier"/>
+    <style id="section" name="Section Elements" map-to="def:identifier"/>
+    <style id="block"   name="Block Elements"   map-to="def:identifier"/>
+    <style id="inline"  name="Inline Elements"  map-to="def:identifier"/>
   </styles>
 
 <definitions>
diff --git a/data/language-specs/markdown.lang b/data/language-specs/markdown.lang
index 6293e40..2ee8fbf 100644
--- a/data/language-specs/markdown.lang
+++ b/data/language-specs/markdown.lang
@@ -22,7 +22,7 @@
      described in the following websites:
      * (fr) <http://michelf.com/projets/php-markdown/syntaxe/>
      * (en) <http://daringfireball.net/projects/markdown/syntax> -->
-<language id="markdown" _name="Markdown" version="2.0" _section="Markup">
+<language id="markdown" name="Markdown" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-markdown</property>
     <property name="globs">*.markdown;*.md;*.mkd</property>
@@ -31,20 +31,20 @@
   </metadata>
 
   <styles>
-    <style id="header" _name="Header" map-to="def:type"/>
-    <style id="horizontal-rule" _name="Horizontal Rule" map-to="def:type"/>
-    <style id="list-marker" _name="List Marker" map-to="def:statement"/>
-    <style id="code" _name="Code" map-to="def:identifier"/>
-    <style id="blockquote-marker" _name="Blockquote Marker" map-to="def:shebang"/>
-    <style id="url" _name="URL" map-to="def:underlined"/>
-    <style id="link-text" _name="Link Text" map-to="def:comment"/>
-    <style id="label" _name="Label" map-to="def:preprocessor"/>
-    <style id="attribute-value" _name="Attribute Value" map-to="def:constant"/>
-    <style id="image-marker" _name="Image Marker" map-to="def:shebang"/>
-    <style id="emphasis" _name="Emphasis" map-to="def:doc-comment-element"/>
-    <style id="strong-emphasis" _name="Strong Emphasis" map-to="def:statement"/>
-    <style id="backslash-escape" _name="Backslash Escape" map-to="def:special-char"/>
-    <style id="line-break" _name="Line Break" map-to="def:note"/>
+    <style id="header" name="Header" map-to="def:type"/>
+    <style id="horizontal-rule" name="Horizontal Rule" map-to="def:type"/>
+    <style id="list-marker" name="List Marker" map-to="def:statement"/>
+    <style id="code" name="Code" map-to="def:identifier"/>
+    <style id="blockquote-marker" name="Blockquote Marker" map-to="def:shebang"/>
+    <style id="url" name="URL" map-to="def:underlined"/>
+    <style id="link-text" name="Link Text" map-to="def:comment"/>
+    <style id="label" name="Label" map-to="def:preprocessor"/>
+    <style id="attribute-value" name="Attribute Value" map-to="def:constant"/>
+    <style id="image-marker" name="Image Marker" map-to="def:shebang"/>
+    <style id="emphasis" name="Emphasis" map-to="def:doc-comment-element"/>
+    <style id="strong-emphasis" name="Strong Emphasis" map-to="def:statement"/>
+    <style id="backslash-escape" name="Backslash Escape" map-to="def:special-char"/>
+    <style id="line-break" name="Line Break" map-to="def:note"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/matlab.lang b/data/language-specs/matlab.lang
index 7ac1d94..7125909 100644
--- a/data/language-specs/matlab.lang
+++ b/data/language-specs/matlab.lang
@@ -22,7 +22,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="matlab" _name="Matlab" version="2.0" _section="Scientific">
+<language id="matlab" name="Matlab" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-matlab</property>
     <property name="globs">*.m</property>
@@ -37,9 +37,9 @@
   -->
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="builtin" _name="Builtin" map-to="def:builtin"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="builtin" name="Builtin" map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/mediawiki.lang b/data/language-specs/mediawiki.lang
index dec526f..ae394ab 100644
--- a/data/language-specs/mediawiki.lang
+++ b/data/language-specs/mediawiki.lang
@@ -19,27 +19,27 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="mediawiki" _name="MediaWiki" version="2.0" _section="Markup">
+<language id="mediawiki" name="MediaWiki" version="2.0" _section="Markup">
   <metadata>
     <property name="block-comment-start">&lt;!--</property>
     <property name="block-comment-end">--&gt;</property>
   </metadata>
 
   <styles>
-    <style id="strong-emphasis" _name="Strong Emphasis"   map-to="def:statement"/>
-    <style id="light-emphasis"  _name="Light Emphasis"    map-to="def:doc-comment-element"/>
-    <style id="signature"       _name="Signature"         map-to="def:statement"/>
-    <style id="url"             _name="URL"               map-to="def:underlined"/>
-    <style id="link"            _name="Link"              map-to="def:comment"/>
-    <style id="link-symbol"     _name="Symbol on a Link"  map-to="def:shebang"/>
-    <style id="line"            _name="Line"              map-to="def:type"/>
-    <style id="list"            _name="List"              map-to="def:statement"/>
-    <style id="magic-word"      _name="Magic Word"        map-to="def:statement"/>
-    <style id="table-symbol"    _name="Symbol of a Table" map-to="def:statement"/>
-    <style id="preformatted"    _name="Preformatted"      map-to="def:identifier"/>
-    <style id="redirect"        _name="Redirect"          map-to="def:statement"/>
-    <style id="title"           _name="Title"             map-to="def:type"/>
-    <style id="template"        _name="Template"          map-to="def:statement"/>
+    <style id="strong-emphasis" name="Strong Emphasis"   map-to="def:statement"/>
+    <style id="light-emphasis"  name="Light Emphasis"    map-to="def:doc-comment-element"/>
+    <style id="signature"       name="Signature"         map-to="def:statement"/>
+    <style id="url"             name="URL"               map-to="def:underlined"/>
+    <style id="link"            name="Link"              map-to="def:comment"/>
+    <style id="link-symbol"     name="Symbol on a Link"  map-to="def:shebang"/>
+    <style id="line"            name="Line"              map-to="def:type"/>
+    <style id="list"            name="List"              map-to="def:statement"/>
+    <style id="magic-word"      name="Magic Word"        map-to="def:statement"/>
+    <style id="table-symbol"    name="Symbol of a Table" map-to="def:statement"/>
+    <style id="preformatted"    name="Preformatted"      map-to="def:identifier"/>
+    <style id="redirect"        name="Redirect"          map-to="def:statement"/>
+    <style id="title"           name="Title"             map-to="def:type"/>
+    <style id="template"        name="Template"          map-to="def:statement"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/meson.lang b/data/language-specs/meson.lang
index 993ca35..884cac3 100644
--- a/data/language-specs/meson.lang
+++ b/data/language-specs/meson.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="meson" _name="Meson" version="2.0" _section="Source">
+<language id="meson" name="Meson" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-meson</property>
     <property name="globs">meson.build;meson_options.txt</property>
@@ -28,10 +28,10 @@
   </metadata>
 
   <styles>
-    <style id="builtin-command" _name="Builtin Command" map-to="def:function"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="string" _name="String" map-to="def:string" />
-    <style id="boolean" _name="Boolean" map-to="def:boolean"/>
+    <style id="builtin-command" name="Builtin Command" map-to="def:function"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="string" name="String" map-to="def:string" />
+    <style id="boolean" name="Boolean" map-to="def:boolean"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/modelica.lang b/data/language-specs/modelica.lang
index 39e7fd6..b1f26df 100644
--- a/data/language-specs/modelica.lang
+++ b/data/language-specs/modelica.lang
@@ -22,7 +22,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="modelica" _name="Modelica" version="2.0" _section="Scientific">
+<language id="modelica" name="Modelica" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-modelica</property>
     <property name="globs">*.mo;*.mop</property>
@@ -32,18 +32,18 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="operator"          _name="Operator"          map-to="def:operator"/>
-    <style id="class-type"        _name="Class type"        map-to="def:type"/>
-    <style id="data-type"         _name="Data type"         map-to="def:type"/>
-    <style id="default-attribute" _name="Default Attribute" map-to="def:identifier"/>
-    <style id="boolean"           _name="Boolean"           map-to="def:boolean"/>
-    <style id="decimal"           _name="Decimal"           map-to="def:decimal"/>
-    <style id="floating-point"    _name="Floating Point"    map-to="def:floating-point"/>
-    <style id="base-n-integer"    _name="Base-N Integer"    map-to="def:base-n-integer"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="builtin"           _name="Builtin"           map-to="def:builtin"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="operator"          name="Operator"          map-to="def:operator"/>
+    <style id="class-type"        name="Class type"        map-to="def:type"/>
+    <style id="data-type"         name="Data type"         map-to="def:type"/>
+    <style id="default-attribute" name="Default Attribute" map-to="def:identifier"/>
+    <style id="boolean"           name="Boolean"           map-to="def:boolean"/>
+    <style id="decimal"           name="Decimal"           map-to="def:decimal"/>
+    <style id="floating-point"    name="Floating Point"    map-to="def:floating-point"/>
+    <style id="base-n-integer"    name="Base-N Integer"    map-to="def:base-n-integer"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="builtin"           name="Builtin"           map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/mxml.lang b/data/language-specs/mxml.lang
index 1654ca0..a32ecb8 100644
--- a/data/language-specs/mxml.lang
+++ b/data/language-specs/mxml.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="mxml" _name="MXML" version="2.0" _section="Markup">
+<language id="mxml" name="MXML" version="2.0" _section="Markup">
   <metadata>
     <property name="globs">*.mxml</property>
     <property name="block-comment-start">&lt;!--</property>
@@ -28,8 +28,8 @@
   </metadata>
 
   <styles>
-    <style id="element-name" _name="Element name" map-to="xml:element-name"/>
-    <style id="cdata-delim" _name="CDATA delimiter" map-to="xml:cdata-delim"/>
+    <style id="element-name" name="Element name" map-to="xml:element-name"/>
+    <style id="cdata-delim" name="CDATA delimiter" map-to="xml:cdata-delim"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/nemerle.lang b/data/language-specs/nemerle.lang
index f3ed8fe..dd0e7eb 100644
--- a/data/language-specs/nemerle.lang
+++ b/data/language-specs/nemerle.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="nemerle" _name="Nemerle" version="2.0" _section="Source">
+<language id="nemerle" name="Nemerle" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-nemerle</property>
     <property name="globs">*.n</property>
@@ -30,20 +30,20 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="binary" _name="Binary number" map-to="def:base-n-integer"/>
-    <style id="octal" _name="Octal number" map-to="def:base-n-integer"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="binary" name="Binary number" map-to="def:base-n-integer"/>
+    <style id="octal" name="Octal number" map-to="def:base-n-integer"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/netrexx.lang b/data/language-specs/netrexx.lang
index ce834f1..2f71c4a 100644
--- a/data/language-specs/netrexx.lang
+++ b/data/language-specs/netrexx.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="netrexx" _name="NetRexx" version="2.0" _section="Source">
+<language id="netrexx" name="NetRexx" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-netrexx</property>
     <property name="globs">*.nrx</property>
@@ -31,20 +31,20 @@
   </metadata>
 
   <styles>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char" />
-    <style id="string" _name="String" map-to="def:string" />
-    <style id="char" _name="Character" map-to="def:character" />
-    <style id="line-comment" _name="Comment" map-to="def:comment" />
-    <style id="externals" _name="Externals" map-to="def:preprocessor" />
-    <style id="options" _name="Options" map-to="def:function" />
-    <style id="primitive-types" _name="Data Types" map-to="def:type" />
-    <style id="special" _name="Special" map-to="def:special-constant" />
-    <style id="visibility" _name="Visibility" map-to="def:identifier" />
-    <style id="modifiers" _name="Modifiers" map-to="def:type" />
-    <style id="keywords" _name="Keywords" map-to="def:keyword" />
-    <style id="sub-keywords" _name="Sub Keywords" map-to="def:shebang" />
-    <style id="builtin-function" _name="Builtin Function" map-to="def:builtin" />
-    <style id="numeric" _name="Number" map-to="def:number" />
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char" />
+    <style id="string" name="String" map-to="def:string" />
+    <style id="char" name="Character" map-to="def:character" />
+    <style id="line-comment" name="Comment" map-to="def:comment" />
+    <style id="externals" name="Externals" map-to="def:preprocessor" />
+    <style id="options" name="Options" map-to="def:function" />
+    <style id="primitive-types" name="Data Types" map-to="def:type" />
+    <style id="special" name="Special" map-to="def:special-constant" />
+    <style id="visibility" name="Visibility" map-to="def:identifier" />
+    <style id="modifiers" name="Modifiers" map-to="def:type" />
+    <style id="keywords" name="Keywords" map-to="def:keyword" />
+    <style id="sub-keywords" name="Sub Keywords" map-to="def:shebang" />
+    <style id="builtin-function" name="Builtin Function" map-to="def:builtin" />
+    <style id="numeric" name="Number" map-to="def:number" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/nsis.lang b/data/language-specs/nsis.lang
index b4a88d1..ca866dd 100644
--- a/data/language-specs/nsis.lang
+++ b/data/language-specs/nsis.lang
@@ -20,17 +20,17 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="nsis" _name="NSIS" version="2.0" _section="Other">
+<language id="nsis" name="NSIS" version="2.0" _section="Other">
   <metadata>
     <property name="globs">*.nsi;*.nsh</property>
     <property name="line-comment-start">;</property>
   </metadata>
 
   <styles>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="variable" _name="Variable" map-to="makefile:variable"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="variable" name="Variable" map-to="makefile:variable"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/objc.lang b/data/language-specs/objc.lang
index 03831ab..f323bb9 100644
--- a/data/language-specs/objc.lang
+++ b/data/language-specs/objc.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="objc" _name="Objective-C" version="2.0" _section="Source">
+<language id="objc" name="Objective-C" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-objcsrc</property>
     <property name="globs">*.m</property>
@@ -30,10 +30,10 @@
   </metadata>
 
   <styles>
-    <style id="keyword" _name="Keyword" map-to="c:keyword"/>
-    <style id="type" _name="Data Type" map-to="c:type"/>
-    <style id="common-defines" _name="Common Defines" map-to="c:common-defines"/>
-    <style id="string" _name="String" map-to="c:string"/>
+    <style id="keyword" name="Keyword" map-to="c:keyword"/>
+    <style id="type" name="Data Type" map-to="c:type"/>
+    <style id="common-defines" name="Common Defines" map-to="c:common-defines"/>
+    <style id="string" name="String" map-to="c:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/objj.lang b/data/language-specs/objj.lang
index 9c48f7d..c3bd406 100644
--- a/data/language-specs/objj.lang
+++ b/data/language-specs/objj.lang
@@ -22,7 +22,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="objj" _name="Objective-J" version="2.0" _section="Source">
+<language id="objj" name="Objective-J" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-objective-j</property>
     <property name="globs">*.j</property>
@@ -32,13 +32,13 @@
   </metadata>
 
   <styles>
-    <style id="boolean"       _name="Boolean"       map-to="js:boolean"/>
-    <style id="keyword"       _name="Keyword"       map-to="js:keyword"/>
-    <style id="type"          _name="Data Type"     map-to="js:type"/>
-    <style id="preprocessor"  _name="Preprocessor"  map-to="def:preprocessor"/>
-    <style id="included-file" _name="Included File" map-to="js:string"/>
-    <style id="string"        _name="String"        map-to="js:string"/>
-    <style id="null-value"    _name="Null Value"    map-to="js:null-value"/>
+    <style id="boolean"       name="Boolean"       map-to="js:boolean"/>
+    <style id="keyword"       name="Keyword"       map-to="js:keyword"/>
+    <style id="type"          name="Data Type"     map-to="js:type"/>
+    <style id="preprocessor"  name="Preprocessor"  map-to="def:preprocessor"/>
+    <style id="included-file" name="Included File" map-to="js:string"/>
+    <style id="string"        name="String"        map-to="js:string"/>
+    <style id="null-value"    name="Null Value"    map-to="js:null-value"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ocaml.lang b/data/language-specs/ocaml.lang
index 1a33367..013333a 100644
--- a/data/language-specs/ocaml.lang
+++ b/data/language-specs/ocaml.lang
@@ -23,7 +23,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="ocaml" _name="OCaml" version="2.0" _section="Source">
+<language id="ocaml" name="OCaml" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-ocaml</property>
     <property name="globs">*.ml;*.mli;*.mll;*.mly</property>
@@ -32,25 +32,25 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="ocamldoc" _name="Ocamldoc Comments" map-to="def:note"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="floating-point" _name="Floating Point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="meta-keyword" _name="Type, module or object keyword" map-to="def:keyword"/>
-    <style id="fun-keyword" _name="Builtin-function keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="label" _name="Labeled argument" map-to="def:type"/>
-    <style id="poly-variant" _name="Polymorphic Variant" map-to="def:type"/>
-    <style id="variant" _name="Variant Constructor" map-to="def:type"/>
-    <style id="type-var" _name="Type Variable" map-to="def:type"/>
-    <style id="module" _name="Module Path" map-to="def:type"/>
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="std-modules" _name="Standard Modules" map-to="def:type"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="ocamldoc" name="Ocamldoc Comments" map-to="def:note"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="floating-point" name="Floating Point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="meta-keyword" name="Type, module or object keyword" map-to="def:keyword"/>
+    <style id="fun-keyword" name="Builtin-function keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="label" name="Labeled argument" map-to="def:type"/>
+    <style id="poly-variant" name="Polymorphic Variant" map-to="def:type"/>
+    <style id="variant" name="Variant Constructor" map-to="def:type"/>
+    <style id="type-var" name="Type Variable" map-to="def:type"/>
+    <style id="module" name="Module Path" map-to="def:type"/>
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="std-modules" name="Standard Modules" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ocl.lang b/data/language-specs/ocl.lang
index cb5a970..d6b8674 100644
--- a/data/language-specs/ocl.lang
+++ b/data/language-specs/ocl.lang
@@ -29,7 +29,7 @@
  http://www.omg.org/technology/documents/formal/ocl.htm
 -->
 
-<language id="ocl" _name="OCL" version="2.0" _section="Other">
+<language id="ocl" name="OCL" version="2.0" _section="Other">
     <metadata>
         <property name="mimetypes">text/x-ocl</property>
         <property name="globs">*.ocl</property>
@@ -37,12 +37,12 @@
     </metadata>
 
     <styles>
-        <style id="comment" _name="Comment" map-to="def:comment"/>
-        <style id="string" _name="String" map-to="def:string"/>
-        <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-        <style id="operators" _name="Type Operators" map-to="def:keyword"/>
-        <style id="type" _name="Data Type" map-to="def:type"/>
-        <style id="operation" _name="Operation operator" map-to="def:keyword"/>
+        <style id="comment" name="Comment" map-to="def:comment"/>
+        <style id="string" name="String" map-to="def:string"/>
+        <style id="keyword" name="Keyword" map-to="def:keyword"/>
+        <style id="operators" name="Type Operators" map-to="def:keyword"/>
+        <style id="type" name="Data Type" map-to="def:type"/>
+        <style id="operation" name="Operation operator" map-to="def:keyword"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/octave.lang b/data/language-specs/octave.lang
index 8ef23fa..e1d06fa 100644
--- a/data/language-specs/octave.lang
+++ b/data/language-specs/octave.lang
@@ -22,7 +22,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="octave" _name="Octave" version="2.0" _section="Scientific">
+<language id="octave" name="Octave" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-octave</property>
     <property name="globs">*.m</property>
@@ -37,16 +37,16 @@
   -->
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="operator"          _name="Operator"          map-to="def:operator"/>
-    <style id="data-type"         _name="Data type"         map-to="def:type"/>
-    <style id="storage-type"      _name="Storage Type"      map-to="def:type"/>
-    <style id="boolean"           _name="Boolean"           map-to="def:boolean"/>
-    <style id="package-manager"   _name="Package Manager"   map-to="def:preprocessor"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="reserved-constant" _name="Reserved Constant" map-to="def:special-constant"/>
-    <style id="builtin"           _name="Builtin"           map-to="def:builtin"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="operator"          name="Operator"          map-to="def:operator"/>
+    <style id="data-type"         name="Data type"         map-to="def:type"/>
+    <style id="storage-type"      name="Storage Type"      map-to="def:type"/>
+    <style id="boolean"           name="Boolean"           map-to="def:boolean"/>
+    <style id="package-manager"   name="Package Manager"   map-to="def:preprocessor"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="reserved-constant" name="Reserved Constant" map-to="def:special-constant"/>
+    <style id="builtin"           name="Builtin"           map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ooc.lang b/data/language-specs/ooc.lang
index 33db1ff..6c6b07d 100644
--- a/data/language-specs/ooc.lang
+++ b/data/language-specs/ooc.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="ooc" _name="OOC" version="2.0" _section="Source">
+<language id="ooc" name="OOC" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.ooc</property>
     <property name="line-comment-start">//</property>
@@ -29,23 +29,23 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"                  map-to="def:comment"/>
-    <style id="error"             _name="Error"                    map-to="def:error"/>
-    <style id="escaped-character" _name="Escaped Character"        map-to="def:special-char"/>
-    <style id="string"            _name="String"                   map-to="def:string"/>
-    <style id="external"          _name="External"                 map-to="def:preprocessor"/>
-    <style id="declaration"       _name="Declaration"              map-to="def:type"/>
-    <style id="storage-class"     _name="Storage Class"            map-to="def:type"/>
-    <style id="scope-declaration" _name="Scope Declaration"        map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"                  map-to="def:keyword"/>
-    <style id="null-value"        _name="Null Value"               map-to="def:special-constant"/>
-    <style id="boolean"           _name="Boolean value"            map-to="def:boolean"/>
-    <style id="floating-point"    _name="Floating point number"    map-to="def:floating-point"/>
-    <style id="decimal"           _name="Decimal number"           map-to="def:decimal"/>
-    <style id="octal"             _name="Octal number"             map-to="def:base-n-integer"/>
-    <style id="hexadecimal"       _name="Hexadecimal number"       map-to="def:base-n-integer"/>
-    <style id="reserved"          _name="Future Reserved Keywords" map-to="def:error"/>
-    <style id="type"              _name="Data Type"                map-to="def:type"/>
+    <style id="comment"           name="Comment"                  map-to="def:comment"/>
+    <style id="error"             name="Error"                    map-to="def:error"/>
+    <style id="escaped-character" name="Escaped Character"        map-to="def:special-char"/>
+    <style id="string"            name="String"                   map-to="def:string"/>
+    <style id="external"          name="External"                 map-to="def:preprocessor"/>
+    <style id="declaration"       name="Declaration"              map-to="def:type"/>
+    <style id="storage-class"     name="Storage Class"            map-to="def:type"/>
+    <style id="scope-declaration" name="Scope Declaration"        map-to="def:type"/>
+    <style id="keyword"           name="Keyword"                  map-to="def:keyword"/>
+    <style id="null-value"        name="Null Value"               map-to="def:special-constant"/>
+    <style id="boolean"           name="Boolean value"            map-to="def:boolean"/>
+    <style id="floating-point"    name="Floating point number"    map-to="def:floating-point"/>
+    <style id="decimal"           name="Decimal number"           map-to="def:decimal"/>
+    <style id="octal"             name="Octal number"             map-to="def:base-n-integer"/>
+    <style id="hexadecimal"       name="Hexadecimal number"       map-to="def:base-n-integer"/>
+    <style id="reserved"          name="Future Reserved Keywords" map-to="def:error"/>
+    <style id="type"              name="Data Type"                map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/opal.lang b/data/language-specs/opal.lang
index a6d1cb8..71cc578 100644
--- a/data/language-specs/opal.lang
+++ b/data/language-specs/opal.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="opal" _name="Opal" version="2.0" _section="Source">
+<language id="opal" name="Opal" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.sign;*.impl</property>
     <property name="line-comment-start">-- </property>
@@ -29,16 +29,16 @@
   </metadata>
 
   <styles>
-    <style id="module-handler" _name="Module Handler" map-to="def:preprocessor"/>
-    <style id="comment"        _name="Comment"        map-to="def:comment"/>
-    <style id="common-defines" _name="Common Defines" map-to="def:special-constant"/>
-    <style id="error"          _name="Error"          map-to="def:error"/>
-    <style id="string"         _name="String"         map-to="def:string"/>
-    <style id="keyword"        _name="Keyword"        map-to="def:keyword"/>
-    <style id="boolean"        _name="Boolean value"  map-to="def:boolean"/>
-    <style id="decimal"        _name="Decimal number" map-to="def:decimal"/>
-    <style id="type"           _name="Data Type"      map-to="def:type"/>
-    <style id="keysymbol"      _name="Keysymbol"      map-to="def:keyword"/>
+    <style id="module-handler" name="Module Handler" map-to="def:preprocessor"/>
+    <style id="comment"        name="Comment"        map-to="def:comment"/>
+    <style id="common-defines" name="Common Defines" map-to="def:special-constant"/>
+    <style id="error"          name="Error"          map-to="def:error"/>
+    <style id="string"         name="String"         map-to="def:string"/>
+    <style id="keyword"        name="Keyword"        map-to="def:keyword"/>
+    <style id="boolean"        name="Boolean value"  map-to="def:boolean"/>
+    <style id="decimal"        name="Decimal number" map-to="def:decimal"/>
+    <style id="type"           name="Data Type"      map-to="def:type"/>
+    <style id="keysymbol"      name="Keysymbol"      map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/opencl.lang b/data/language-specs/opencl.lang
index 79ab213..0512c72 100644
--- a/data/language-specs/opencl.lang
+++ b/data/language-specs/opencl.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="opencl" _name="OpenCL" version="2.0" _section="Source">
+<language id="opencl" name="OpenCL" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.cl</property>
     <property name="line-comment-start">//</property>
@@ -29,13 +29,13 @@
   </metadata>
 
   <styles>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="data-type" _name="Data Type" map-to="def:type"/>
-    <style id="global-function" _name="Global Function" map-to="def:function"/>
-    <style id="device-function" _name="Device Function" map-to="def:function"/>
-    <style id="device-cast" _name="Device Cast" map-to="def:function"/>
-    <style id="opencl-const" _name="OpenCL Constant" map-to="def:special-constant"/>
-    <style id="global-var" _name="Global Variable" map-to="def:identifier"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="data-type" name="Data Type" map-to="def:type"/>
+    <style id="global-function" name="Global Function" map-to="def:function"/>
+    <style id="device-function" name="Device Function" map-to="def:function"/>
+    <style id="device-cast" name="Device Cast" map-to="def:function"/>
+    <style id="opencl-const" name="OpenCL Constant" map-to="def:special-constant"/>
+    <style id="global-var" name="Global Variable" map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/pascal.lang b/data/language-specs/pascal.lang
index c99d299..f90d388 100644
--- a/data/language-specs/pascal.lang
+++ b/data/language-specs/pascal.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="pascal" _name="Pascal" version="2.0" _section="Source">
+<language id="pascal" name="Pascal" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-pascal</property>
     <property name="globs">*.p;*.pas</property>
@@ -29,12 +29,12 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/perl.lang b/data/language-specs/perl.lang
index d3ecd70..a1cf91f 100644
--- a/data/language-specs/perl.lang
+++ b/data/language-specs/perl.lang
@@ -22,7 +22,7 @@ TODO: extended regex support
 FIXME: =pod should require an empty line before/after, as written in perlpod
 
 -->
-<language id="perl" _name="Perl" version="2.0" _section="Script">
+<language id="perl" name="Perl" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-perl;application/x-perl</property>
     <property name="globs">*.pl;*.pm;*.al;*.perl;*.t</property>
@@ -30,25 +30,25 @@ FIXME: =pod should require an empty line before/after, as written in perlpod
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"            map-to="def:comment"/>
-    <style id="line-directive"    _name="Line Directive"     map-to="def:preprocessor"/>
-    <style id="include-statement" _name="Include Statement"  map-to="def:preprocessor"/>
-    <style id="string"            _name="String"             map-to="def:string"/>
-    <style id="keyword"           _name="Keyword"            map-to="def:keyword"/>
-    <style id="builtin"           _name="Builtin Function"   map-to="def:builtin"/>
-    <style id="here-doc"          _name="Heredoc"            map-to="def:string" />
-    <style id="here-doc-bound"    _name="Heredoc Bound"      map-to="def:string"/>
-    <style id="system-command"    _name="System Command"     map-to="def:string"/>
-    <style id="operator"          _name="Operator"           map-to="def:keyword"/>
-    <style id="variable"          _name="Variable"           map-to="def:type"/>
-    <style id="file-descriptor"   _name="File Descriptor"    map-to="def:special-constant"/>
-    <style id="control"           _name="Control"            map-to="def:preprocessor"/>
-    <style id="regex"             _name="Regular Expression" map-to="def:string"/>
-    <style id="error"             _name="Error"              map-to="def:error"/>
-    <style id="pod"               _name="POD"                map-to="def:comment"/>
-    <style id="pod-escape"        _name="POD Escape"         map-to="def:special-char"/>
-    <style id="pod-keyword"       _name="POD keyword"        map-to="def:keyword"/>
-    <style id="pod-heading"       _name="POD heading"        map-to="def:doc-comment-element"/>
+    <style id="comment"           name="Comment"            map-to="def:comment"/>
+    <style id="line-directive"    name="Line Directive"     map-to="def:preprocessor"/>
+    <style id="include-statement" name="Include Statement"  map-to="def:preprocessor"/>
+    <style id="string"            name="String"             map-to="def:string"/>
+    <style id="keyword"           name="Keyword"            map-to="def:keyword"/>
+    <style id="builtin"           name="Builtin Function"   map-to="def:builtin"/>
+    <style id="here-doc"          name="Heredoc"            map-to="def:string" />
+    <style id="here-doc-bound"    name="Heredoc Bound"      map-to="def:string"/>
+    <style id="system-command"    name="System Command"     map-to="def:string"/>
+    <style id="operator"          name="Operator"           map-to="def:keyword"/>
+    <style id="variable"          name="Variable"           map-to="def:type"/>
+    <style id="file-descriptor"   name="File Descriptor"    map-to="def:special-constant"/>
+    <style id="control"           name="Control"            map-to="def:preprocessor"/>
+    <style id="regex"             name="Regular Expression" map-to="def:string"/>
+    <style id="error"             name="Error"              map-to="def:error"/>
+    <style id="pod"               name="POD"                map-to="def:comment"/>
+    <style id="pod-escape"        name="POD Escape"         map-to="def:special-char"/>
+    <style id="pod-keyword"       name="POD keyword"        map-to="def:keyword"/>
+    <style id="pod-heading"       name="POD heading"        map-to="def:doc-comment-element"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/php.lang b/data/language-specs/php.lang
index 25f6595..a0cbaf4 100644
--- a/data/language-specs/php.lang
+++ b/data/language-specs/php.lang
@@ -25,7 +25,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="php" _name="PHP" version="2.0" _section="Script">
+<language id="php" name="PHP" version="2.0" _section="Script">
   <metadata>
     <property 
name="mimetypes">text/x-php;application/x-php;text/x-php-source;application/x-php-source</property>
     <property name="globs">*.php;*.php3;*.php4;*.phtml</property>
@@ -35,25 +35,25 @@
   </metadata>
 
   <styles>
-    <style id="preprocessor" _name="Preprocessor tags" map-to="def:preprocessor"/>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="variable" _name="Variable" map-to="def:identifier"/>
-    <style id="identifier" _name="Identifier"/> <!-- map to nothing -->
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="here-doc" _name="Heredoc" map-to="def:string"/>
-    <style id="here-doc-bound" _name="Heredoc Bound" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="common-function" _name="Common Function" map-to="def:keyword"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="octal" _name="Octal number" map-to="def:base-n-integer"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="preprocessor" name="Preprocessor tags" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="variable" name="Variable" map-to="def:identifier"/>
+    <style id="identifier" name="Identifier"/> <!-- map to nothing -->
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="here-doc" name="Heredoc" map-to="def:string"/>
+    <style id="here-doc-bound" name="Heredoc Bound" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="common-function" name="Common Function" map-to="def:keyword"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="octal" name="Octal number" map-to="def:base-n-integer"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/pig.lang b/data/language-specs/pig.lang
index a9c6b14..96c22fb 100644
--- a/data/language-specs/pig.lang
+++ b/data/language-specs/pig.lang
@@ -23,7 +23,7 @@
 
 -->
 
-<language id="pig" _name="Pig" version="2.0" _section="Source">
+<language id="pig" name="Pig" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.pig</property>
     <property name="line-comment-start">--</property>
@@ -32,12 +32,12 @@
   </metadata>
 
   <styles>
-    <style id="datatype" _name="Data Type" map-to="def:type" />
-    <style id="reserved-words" _name="Reserved Words" map-to="def:keyword" />
-    <style id="builtin-functions" _name="Built In Functions" map-to="def:function" />
-    <style id="boolean" _name="Boolean values" map-to="def:boolean" />
-    <style id="null" _name="Null" map-to="def:special-constant" />
-    <style id="comment" _name="Comment" map-to="def:comment" />
+    <style id="datatype" name="Data Type" map-to="def:type" />
+    <style id="reserved-words" name="Reserved Words" map-to="def:keyword" />
+    <style id="builtin-functions" name="Built In Functions" map-to="def:function" />
+    <style id="boolean" name="Boolean values" map-to="def:boolean" />
+    <style id="null" name="Null" map-to="def:special-constant" />
+    <style id="comment" name="Comment" map-to="def:comment" />
   </styles>
 
   <default-regex-options case-sensitive="true" />
diff --git a/data/language-specs/pkgconfig.lang b/data/language-specs/pkgconfig.lang
index 711ee1f..5b67b8b 100644
--- a/data/language-specs/pkgconfig.lang
+++ b/data/language-specs/pkgconfig.lang
@@ -20,15 +20,15 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="pkgconfig" _name="pkg-config" version="2.0" _section="Other">
+<language id="pkgconfig" name="pkg-config" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-pkg-config</property>
     <property name="globs">*.pc</property>
   </metadata>
 
   <styles>
-    <style id="variable" _name="Variable" map-to="def:keyword"/>
-    <style id="info" _name="Package Info" map-to="def:keyword"/>
+    <style id="variable" name="Variable" map-to="def:keyword"/>
+    <style id="info" name="Package Info" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/po.lang b/data/language-specs/po.lang
index 59d4432..a8b8cf3 100644
--- a/data/language-specs/po.lang
+++ b/data/language-specs/po.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="gettext-translation" _name="gettext translation" version="2.0" _section="Other">
+<language id="gettext-translation" name="gettext translation" version="2.0" _section="Other">
   <metadata>
     <property 
name="mimetypes">text/x-po;text/x-pot;text/x-pox;text/x-gettext-translation;text/x-gettext-translation-template</property>
     <property name="globs">*.po;*.pot</property>
@@ -28,12 +28,12 @@
   </metadata>
 
   <styles>
-    <style id="comment"   _name="Comment"       map-to="def:comment"/>
-    <style id="location"  _name="Location"      map-to="def:comment"/>
-    <style id="string"    _name="String"        map-to="def:string"/>
-    <style id="fuzzy"     _name="Fuzzy"         map-to="def:note"/>
-    <style id="keyword"   _name="Keyword"       map-to="def:keyword"/>
-    <style id="format"    _name="String Format" map-to="def:special-char"/>
+    <style id="comment"   name="Comment"       map-to="def:comment"/>
+    <style id="location"  name="Location"      map-to="def:comment"/>
+    <style id="string"    name="String"        map-to="def:string"/>
+    <style id="fuzzy"     name="Fuzzy"         map-to="def:note"/>
+    <style id="keyword"   name="Keyword"       map-to="def:keyword"/>
+    <style id="format"    name="String Format" map-to="def:special-char"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/prolog.lang b/data/language-specs/prolog.lang
index 70395e7..240a197 100644
--- a/data/language-specs/prolog.lang
+++ b/data/language-specs/prolog.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="prolog" _name="Prolog" version="2.0" _section="Source">
+<language id="prolog" name="Prolog" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-prolog</property>
     <property name="globs">*.prolog</property>
@@ -30,14 +30,14 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="variable"          _name="Variable"          map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="number"            _name="Number"            map-to="def:decimal"/>
-    <style id="operator"          _name="Operator"          map-to="def:operator"/>
-    <style id="error"             _name="Error"             map-to="def:error"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="variable"          name="Variable"          map-to="def:type"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="number"            name="Number"            map-to="def:decimal"/>
+    <style id="operator"          name="Operator"          map-to="def:operator"/>
+    <style id="error"             name="Error"             map-to="def:error"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/protobuf.lang b/data/language-specs/protobuf.lang
index 0fa9cdd..29c633b 100644
--- a/data/language-specs/protobuf.lang
+++ b/data/language-specs/protobuf.lang
@@ -28,13 +28,13 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="statement" _name="Statement" map-to="def:preprocessor"/>
-    <style id="variable" _name="Variable" map-to="def:type"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="string" _name="String" map-to="def:string"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="statement" name="Statement" map-to="def:preprocessor"/>
+    <style id="variable" name="Variable" map-to="def:type"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="string" name="String" map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/puppet.lang b/data/language-specs/puppet.lang
index 555d499..9042bb2 100644
--- a/data/language-specs/puppet.lang
+++ b/data/language-specs/puppet.lang
@@ -20,20 +20,20 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="puppet" _name="Puppet" version="2.0" _section="Other">
+<language id="puppet" name="Puppet" version="2.0" _section="Other">
   <metadata>
     <property name="globs">*.pp</property>
     <property name="line-comment-start">#</property>
   </metadata>
 
   <styles>
-    <style id="resources"               _name="Resources"           map-to="def:keyword"/>
-    <style id="parameters"              _name="Parameters"          map-to="def:statement"/>
-    <style id="metaparameters"          _name="Metaparameters"      map-to="def:statement"/>
-    <style id="functions"               _name="Functions"           map-to="def:type"/>
-    <style id="values"                  _name="Values"              map-to="def:type"/>
-    <style id="variables"               _name="Variables"           map-to="def:identifier"/>
-    <style id="class-names"             _name="Class names"         map-to="def:preprocessor"/>
+    <style id="resources"               name="Resources"           map-to="def:keyword"/>
+    <style id="parameters"              name="Parameters"          map-to="def:statement"/>
+    <style id="metaparameters"          name="Metaparameters"      map-to="def:statement"/>
+    <style id="functions"               name="Functions"           map-to="def:type"/>
+    <style id="values"                  name="Values"              map-to="def:type"/>
+    <style id="variables"               name="Variables"           map-to="def:identifier"/>
+    <style id="class-names"             name="Class names"         map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/python.lang b/data/language-specs/python.lang
index 721ce0f..fe7c2d1 100644
--- a/data/language-specs/python.lang
+++ b/data/language-specs/python.lang
@@ -24,7 +24,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="python" _name="Python" version="2.0" _section="Script">
+<language id="python" name="Python" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-python;application/x-python</property>
     <property name="globs">*.py</property>
@@ -32,25 +32,25 @@
   </metadata>
 
   <styles>
-    <style id="module-handler"    _name="Module Handler"        map-to="def:preprocessor"/>
-    <style id="keyword"           _name="Keyword"               map-to="def:keyword"/>
-    <style id="multiline-string"  _name="Multiline string"      map-to="def:string"/>
-    <style id="string"            _name="String"                map-to="def:string"/>
-    <style id="escaped-char"      _name="Escaped Character"     map-to="def:special-char"/>
-    <style id="format"            _name="Format"                map-to="def:character"/>
-    <style id="string-conversion" _name="String Conversion"/>
-    <style id="special-variable"  _name="Special Variable"      map-to="def:identifier"/>
-    <style id="boolean"           _name="Boolean"               map-to="def:boolean"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"           _name="Decimal number"        map-to="def:decimal"/>
-    <style id="base-n-integer"    _name="Base-N number"         map-to="def:base-n-integer"/>
-    <style id="complex"           _name="Complex number"        map-to="def:complex"/>
-    <style id="builtin-constant"  _name="Builtin Constant"      map-to="def:special-constant"/>
-    <style id="builtin-object"    _name="Builtin Object"        map-to="def:type"/>
-    <style id="builtin-function"  _name="Builtin Function"      map-to="def:builtin"/>
-    <style id="function-name"     _name="Function Name"         map-to="def:function"/>
-    <style id="class-name"        _name="Class Name"            map-to="def:function"/>
-    <style id="decorator"         _name="Decorator"             map-to="def:preprocessor"/>
+    <style id="module-handler"    name="Module Handler"        map-to="def:preprocessor"/>
+    <style id="keyword"           name="Keyword"               map-to="def:keyword"/>
+    <style id="multiline-string"  name="Multiline string"      map-to="def:string"/>
+    <style id="string"            name="String"                map-to="def:string"/>
+    <style id="escaped-char"      name="Escaped Character"     map-to="def:special-char"/>
+    <style id="format"            name="Format"                map-to="def:character"/>
+    <style id="string-conversion" name="String Conversion"/>
+    <style id="special-variable"  name="Special Variable"      map-to="def:identifier"/>
+    <style id="boolean"           name="Boolean"               map-to="def:boolean"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"           name="Decimal number"        map-to="def:decimal"/>
+    <style id="base-n-integer"    name="Base-N number"         map-to="def:base-n-integer"/>
+    <style id="complex"           name="Complex number"        map-to="def:complex"/>
+    <style id="builtin-constant"  name="Builtin Constant"      map-to="def:special-constant"/>
+    <style id="builtin-object"    name="Builtin Object"        map-to="def:type"/>
+    <style id="builtin-function"  name="Builtin Function"      map-to="def:builtin"/>
+    <style id="function-name"     name="Function Name"         map-to="def:function"/>
+    <style id="class-name"        name="Class Name"            map-to="def:function"/>
+    <style id="decorator"         name="Decorator"             map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/python3.lang b/data/language-specs/python3.lang
index 7906392..1ab853b 100644
--- a/data/language-specs/python3.lang
+++ b/data/language-specs/python3.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="python3" _name="Python 3" version="2.0" _section="Script">
+<language id="python3" name="Python 3" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-python3</property>
     <property name="globs">*.py3</property>
@@ -28,21 +28,21 @@
   </metadata>
 
   <styles>
-    <style id="module-handler"    _name="Module Handler"        map-to="python:module-handler"/>
-    <style id="keyword"           _name="Keyword"               map-to="python:keyword"/>
-    <style id="multiline-string"  _name="Multiline string"      map-to="python:multiline-string"/>
-    <style id="string"            _name="String"                map-to="python:string"/>
-    <style id="escaped-char"      _name="Escaped Character"     map-to="python:escaped-char"/>
-    <style id="format"            _name="Format"                map-to="python:format"/>
-    <style id="special-variable"  _name="Special Variable"      map-to="python:special-variable"/>
-    <style id="boolean"           _name="Boolean"               map-to="python:boolean"/>
-    <style id="floating-point"    _name="Floating point number" map-to="python:floating-point"/>
-    <style id="decimal"           _name="Decimal number"        map-to="python:decimal"/>
-    <style id="base-n-integer"    _name="Base-N number"         map-to="python:base-n-integer"/>
-    <style id="complex"           _name="Complex number"        map-to="python:complex"/>
-    <style id="builtin-constant"  _name="Builtin Constant"      map-to="python:builtin-constant"/>
-    <style id="builtin-object"    _name="Builtin Object"        map-to="python:builtin-object"/>
-    <style id="builtin-function"  _name="Builtin Function"      map-to="python:builtin-function"/>
+    <style id="module-handler"    name="Module Handler"        map-to="python:module-handler"/>
+    <style id="keyword"           name="Keyword"               map-to="python:keyword"/>
+    <style id="multiline-string"  name="Multiline string"      map-to="python:multiline-string"/>
+    <style id="string"            name="String"                map-to="python:string"/>
+    <style id="escaped-char"      name="Escaped Character"     map-to="python:escaped-char"/>
+    <style id="format"            name="Format"                map-to="python:format"/>
+    <style id="special-variable"  name="Special Variable"      map-to="python:special-variable"/>
+    <style id="boolean"           name="Boolean"               map-to="python:boolean"/>
+    <style id="floating-point"    name="Floating point number" map-to="python:floating-point"/>
+    <style id="decimal"           name="Decimal number"        map-to="python:decimal"/>
+    <style id="base-n-integer"    name="Base-N number"         map-to="python:base-n-integer"/>
+    <style id="complex"           name="Complex number"        map-to="python:complex"/>
+    <style id="builtin-constant"  name="Builtin Constant"      map-to="python:builtin-constant"/>
+    <style id="builtin-object"    name="Builtin Object"        map-to="python:builtin-object"/>
+    <style id="builtin-function"  name="Builtin Function"      map-to="python:builtin-function"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/rpmspec.lang b/data/language-specs/rpmspec.lang
index aaae1f6..6f5229e 100644
--- a/data/language-specs/rpmspec.lang
+++ b/data/language-specs/rpmspec.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="rpmspec" _name="RPM spec" version="2.0" _section="Other">
+<language id="rpmspec" name="RPM spec" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-rpm-spec</property>
     <property name="globs">*.spec</property>
@@ -28,19 +28,19 @@
   </metadata>
 
   <styles>
-    <style id="define" _name="Define" map-to="def:preprocessor"/>
-    <style id="header" _name="Header" map-to="def:keyword"/>
-    <style id="section" _name="Section" map-to="def:type"/>
-    <style id="spec-macro" _name="Spec Macro" map-to="def:preprocessor"/>
-    <style id="directory-macro" _name="Directory Macro" map-to="def:identifier"/>
-    <style id="command-macro" _name="Command Macro" map-to="def:identifier"/>
-    <style id="conditional-macro" _name="Conditional Macro" map-to="def:preprocessor"/>
-    <style id="other-macro" _name="Other Macro" map-to="def:identifier"/>
-    <style id="flow-conditional" _name="Flow Conditional" map-to="def:preprocessor"/>
-    <style id="rpm-var" _name="RPM Variable" map-to="def:identifier"/>
-    <style id="switch" _name="Switch" map-to="def:operator"/>
-    <style id="changelog-date" _name="Date" map-to="changelog:date"/>
-    <style id="changelog-email" _name="Email" map-to="changelog:email"/>
+    <style id="define" name="Define" map-to="def:preprocessor"/>
+    <style id="header" name="Header" map-to="def:keyword"/>
+    <style id="section" name="Section" map-to="def:type"/>
+    <style id="spec-macro" name="Spec Macro" map-to="def:preprocessor"/>
+    <style id="directory-macro" name="Directory Macro" map-to="def:identifier"/>
+    <style id="command-macro" name="Command Macro" map-to="def:identifier"/>
+    <style id="conditional-macro" name="Conditional Macro" map-to="def:preprocessor"/>
+    <style id="other-macro" name="Other Macro" map-to="def:identifier"/>
+    <style id="flow-conditional" name="Flow Conditional" map-to="def:preprocessor"/>
+    <style id="rpm-var" name="RPM Variable" map-to="def:identifier"/>
+    <style id="switch" name="Switch" map-to="def:operator"/>
+    <style id="changelog-date" name="Date" map-to="changelog:date"/>
+    <style id="changelog-email" name="Email" map-to="changelog:email"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/rst.lang b/data/language-specs/rst.lang
index 4e5c229..f6fd216 100644
--- a/data/language-specs/rst.lang
+++ b/data/language-specs/rst.lang
@@ -19,7 +19,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="rst" _name="reStructuredText" version="2.0" _section="Markup">
+<language id="rst" name="reStructuredText" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-rst</property>
     <property name="globs">*.rst</property>
@@ -27,15 +27,15 @@
   </metadata>
 
   <styles>
-    <style id="header" _name="Header" map-to="def:type"/>
-    <style id="emphasis" _name="Emphasis" map-to="def:doc-comment-element"/>
-    <style id="strong-emphasis" _name="Strong Emphasis" map-to="def:statement"/>
-    <style id="bullet" _name="Bullet" map-to="def:preprocessor"/>
-    <style id="directive" _name="Directive" map-to="def:constant"/>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="link" _name="Link" map-to="def:type"/>
-    <style id="substitution" _name="Substitution" map-to="def:type"/>
-    <style id="code" _name="Code" map-to="def:identifier"/>
+    <style id="header" name="Header" map-to="def:type"/>
+    <style id="emphasis" name="Emphasis" map-to="def:doc-comment-element"/>
+    <style id="strong-emphasis" name="Strong Emphasis" map-to="def:statement"/>
+    <style id="bullet" name="Bullet" map-to="def:preprocessor"/>
+    <style id="directive" name="Directive" map-to="def:constant"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="link" name="Link" map-to="def:type"/>
+    <style id="substitution" name="Substitution" map-to="def:type"/>
+    <style id="code" name="Code" map-to="def:identifier"/>
     <style id="url" name="Url" map-to="def:underlined"/>
   </styles>
 
diff --git a/data/language-specs/ruby.lang b/data/language-specs/ruby.lang
index 9c82939..e021cb9 100644
--- a/data/language-specs/ruby.lang
+++ b/data/language-specs/ruby.lang
@@ -23,7 +23,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="ruby" _name="Ruby" version="2.0" _section="Script">
+<language id="ruby" name="Ruby" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">application/x-ruby;text/x-ruby</property>
     <property name="globs">*.rb;*.rake;*.gemspec;Rakefile;Capfile;Gemfile</property>
@@ -31,29 +31,29 @@
   </metadata>
 
   <styles>
-    <style id="escape"               _name="Escaped Character"     map-to="def:special-char"/>
-    <style id="comment"              _name="Comment"               map-to="def:comment"/>
-    <style id="attribute-definition" _name="Attribute Definition"  map-to="def:statement"/>
-    <style id="module-handler"       _name="Module handler"        map-to="def:preprocessor"/>
-    <style id="keyword"              _name="Keyword"               map-to="def:keyword"/>
-    <style id="nil-value"            _name="Nil Constant"          map-to="def:special-constant"/>
-    <style id="boolean"              _name="Boolean value"         map-to="def:boolean"/>
-    <style id="floating-point"       _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"              _name="Decimal number"        map-to="def:decimal"/>
-    <style id="base-n-integer"       _name="Base-N number"         map-to="def:base-n-integer"/>
-    <style id="numeric-literal"      _name="Numeric literal"       map-to="def:base-n-integer"/>
-    <style id="string"               _name="String"                map-to="def:string"/>
-    <style id="literal"              _name="Literal"               map-to="def:special-char"/>
+    <style id="escape"               name="Escaped Character"     map-to="def:special-char"/>
+    <style id="comment"              name="Comment"               map-to="def:comment"/>
+    <style id="attribute-definition" name="Attribute Definition"  map-to="def:statement"/>
+    <style id="module-handler"       name="Module handler"        map-to="def:preprocessor"/>
+    <style id="keyword"              name="Keyword"               map-to="def:keyword"/>
+    <style id="nil-value"            name="Nil Constant"          map-to="def:special-constant"/>
+    <style id="boolean"              name="Boolean value"         map-to="def:boolean"/>
+    <style id="floating-point"       name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"              name="Decimal number"        map-to="def:decimal"/>
+    <style id="base-n-integer"       name="Base-N number"         map-to="def:base-n-integer"/>
+    <style id="numeric-literal"      name="Numeric literal"       map-to="def:base-n-integer"/>
+    <style id="string"               name="String"                map-to="def:string"/>
+    <style id="literal"              name="Literal"               map-to="def:special-char"/>
     <!-- Translators: functions that are provided in the language -->
-    <style id="builtin"              _name="Builtin"               map-to="def:type"/>
-    <style id="constant"             _name="Constant"              map-to="def:type"/>
-    <style id="symbol"               _name="Symbol"                map-to="def:string"/>
-    <style id="special-variable"     _name="Special Variable"      map-to="def:identifier"/>
-    <style id="predefined-variable"  _name="Predefined Variable"   map-to="def:identifier"/>
-    <style id="variable"             _name="Variable"              map-to="def:identifier"/>
-    <style id="here-doc"             _name="Heredoc"               map-to="def:string" />
-    <style id="here-doc-bound"       _name="Heredoc Bound"         map-to="def:string"/>
-    <style id="regex"                _name="Regular Expression"    map-to="def:identifier"/>
+    <style id="builtin"              name="Builtin"               map-to="def:type"/>
+    <style id="constant"             name="Constant"              map-to="def:type"/>
+    <style id="symbol"               name="Symbol"                map-to="def:string"/>
+    <style id="special-variable"     name="Special Variable"      map-to="def:identifier"/>
+    <style id="predefined-variable"  name="Predefined Variable"   map-to="def:identifier"/>
+    <style id="variable"             name="Variable"              map-to="def:identifier"/>
+    <style id="here-doc"             name="Heredoc"               map-to="def:string" />
+    <style id="here-doc-bound"       name="Heredoc Bound"         map-to="def:string"/>
+    <style id="regex"                name="Regular Expression"    map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/rust.lang b/data/language-specs/rust.lang
index 43c810a..570c1aa 100644
--- a/data/language-specs/rust.lang
+++ b/data/language-specs/rust.lang
@@ -32,7 +32,7 @@ option. This file may not be copied, modified, or distributed
 except according to those terms.
 -->
 
-<language id="rust" _name="Rust" version="2.0" _section="Source">
+<language id="rust" name="Rust" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/rust</property>
     <property name="globs">*.rs</property>
@@ -42,18 +42,18 @@ except according to those terms.
   </metadata>
 
   <styles>
-    <style id="comment"    _name="Comment"       map-to="def:comment"/>
-    <style id="string"     _name="String"        map-to="def:string"/>
-    <style id="char"       _name="Character"     map-to="def:character"/>
-    <style id="keyword"    _name="Keyword"       map-to="def:keyword"/>
-    <style id="type"       _name="Data Type"     map-to="def:type"/>
-    <style id="boolean"    _name="Boolean value" map-to="def:boolean"/>
-    <style id="identifier" _name="Identifier"    map-to="def:identifier"/>
-    <style id="number"     _name="Number"        map-to="def:number"/>
-    <style id="scope"      _name="Scope"         map-to="def:preprocessor"/>
-    <style id="attribute"  _name="Attribute"     map-to="def:preprocessor"/>
-    <style id="macro"      _name="Macro"         map-to="def:preprocessor"/>
-    <style id="error"      _name="Error"         map-to="def:error"/>
+    <style id="comment"    name="Comment"       map-to="def:comment"/>
+    <style id="string"     name="String"        map-to="def:string"/>
+    <style id="char"       name="Character"     map-to="def:character"/>
+    <style id="keyword"    name="Keyword"       map-to="def:keyword"/>
+    <style id="type"       name="Data Type"     map-to="def:type"/>
+    <style id="boolean"    name="Boolean value" map-to="def:boolean"/>
+    <style id="identifier" name="Identifier"    map-to="def:identifier"/>
+    <style id="number"     name="Number"        map-to="def:number"/>
+    <style id="scope"      name="Scope"         map-to="def:preprocessor"/>
+    <style id="attribute"  name="Attribute"     map-to="def:preprocessor"/>
+    <style id="macro"      name="Macro"         map-to="def:preprocessor"/>
+    <style id="error"      name="Error"         map-to="def:error"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/scala.lang b/data/language-specs/scala.lang
index a40a383..ce5205d 100644
--- a/data/language-specs/scala.lang
+++ b/data/language-specs/scala.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="scala" _name="Scala" version="2.0" _section="Source">
+<language id="scala" name="Scala" version="2.0" _section="Source">
 
   <metadata>
     <property name="mimetypes">text/x-scala</property>
@@ -32,21 +32,21 @@
   </metadata>
 
   <styles>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="external" _name="External" map-to="def:preprocessor"/>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="declaration" _name="Declaration" map-to="def:type"/>
-    <style id="modifier" _name="Modifier" map-to="def:type"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="special" _name="Special Constant" map-to="def:special-constant"/>
-    <style id="number" _name="Number" map-to="def:decimal"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="type" _name="Data Type" map-to="def:identifier"/>
-    <style id="builtin" _name="Built In" map-to="def:type"/>
-    <style id="other" _name="Other" map-to="def:special-char"/>
-    <style id="xmltag" _name="XML Tag" map-to="def:identifier"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="external" name="External" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="declaration" name="Declaration" map-to="def:type"/>
+    <style id="modifier" name="Modifier" map-to="def:type"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="special" name="Special Constant" map-to="def:special-constant"/>
+    <style id="number" name="Number" map-to="def:decimal"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="type" name="Data Type" map-to="def:identifier"/>
+    <style id="builtin" name="Built In" map-to="def:type"/>
+    <style id="other" name="Other" map-to="def:special-char"/>
+    <style id="xmltag" name="XML Tag" map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/scheme.lang b/data/language-specs/scheme.lang
index c75a537..188c807 100644
--- a/data/language-specs/scheme.lang
+++ b/data/language-specs/scheme.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="scheme" _name="Scheme" version="2.0" _section="Source">
+<language id="scheme" name="Scheme" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-scheme</property>
     <property name="globs">*.scm</property>
@@ -28,11 +28,11 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="boolean" _name="Boolean" map-to="def:boolean"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="boolean" name="Boolean" map-to="def:boolean"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/scilab.lang b/data/language-specs/scilab.lang
index f997ac9..48df3cd 100644
--- a/data/language-specs/scilab.lang
+++ b/data/language-specs/scilab.lang
@@ -20,20 +20,20 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="scilab" _name="Scilab" version="2.0" _section="Scientific">
+<language id="scilab" name="Scilab" version="2.0" _section="Scientific">
   <metadata>
     <property name="globs">*.sce;*.sci</property>
     <property name="line-comment-start">//</property>
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="floating-point"    _name="Floating Point"    map-to="def:floating-point"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="function"          _name="Function"          map-to="def:function"/>
-    <style id="boolean"           _name="Boolean"           map-to="def:boolean"/>
-    <style id="reserved-constant" _name="Reserved Constant" map-to="def:special-constant"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="floating-point"    name="Floating Point"    map-to="def:floating-point"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="function"          name="Function"          map-to="def:function"/>
+    <style id="boolean"           name="Boolean"           map-to="def:boolean"/>
+    <style id="reserved-constant" name="Reserved Constant" map-to="def:special-constant"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/sh.lang b/data/language-specs/sh.lang
index 512e709..b6a8053 100644
--- a/data/language-specs/sh.lang
+++ b/data/language-specs/sh.lang
@@ -21,7 +21,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="sh" _name="sh" version="2.0" _section="Script">
+<language id="sh" name="sh" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-shellscript;application/x-shellscript;text/x-sh</property>
     <property name="globs">*.sh;*bashrc;.profile;.bash_profile</property>
@@ -29,16 +29,16 @@
   </metadata>
 
   <styles>
-    <style id="comment"             _name="Comment"             map-to="def:comment"/>
-    <style id="function"            _name="Function"            map-to="def:function"/>
-    <style id="string"              _name="String"              map-to="def:string"/>
-    <style id="keyword"             _name="Keyword"             map-to="def:keyword"/>
-    <style id="variable"            _name="Variable"            map-to="def:type"/> <!-- FIXME: need to sort 
out proper styles for variables -->
-    <style id="variable-definition" _name="Variable Definition" map-to="sh:variable"/>
-    <style id="others"              _name="Others"              map-to="def:keyword"/>
-    <style id="common-command"      _name="Common Commands"     map-to="def:keyword"/>
-    <style id="here-doc-bound"      _name="Heredoc Bound"       map-to="def:keyword"/>
-    <style id="subshell"            _name="Subshell"            map-to="def:preprocessor"/>
+    <style id="comment"             name="Comment"             map-to="def:comment"/>
+    <style id="function"            name="Function"            map-to="def:function"/>
+    <style id="string"              name="String"              map-to="def:string"/>
+    <style id="keyword"             name="Keyword"             map-to="def:keyword"/>
+    <style id="variable"            name="Variable"            map-to="def:type"/> <!-- FIXME: need to sort 
out proper styles for variables -->
+    <style id="variable-definition" name="Variable Definition" map-to="sh:variable"/>
+    <style id="others"              name="Others"              map-to="def:keyword"/>
+    <style id="common-command"      name="Common Commands"     map-to="def:keyword"/>
+    <style id="here-doc-bound"      name="Heredoc Bound"       map-to="def:keyword"/>
+    <style id="subshell"            name="Subshell"            map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/sml.lang b/data/language-specs/sml.lang
index ca717a9..0557ce3 100644
--- a/data/language-specs/sml.lang
+++ b/data/language-specs/sml.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="sml" _name="Standard ML" version="2.0" _section="Source">
+<language id="sml" name="Standard ML" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.sml;*.sig</property>
     <property name="block-comment-start">(*</property>
@@ -28,17 +28,17 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="floating-point" _name="Floating Point number" map-to="def:floating-point"/>
-    <style id="special-var" _name="Module name, Variant, etc" map-to="def:type"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="floating-point" name="Floating Point number" map-to="def:floating-point"/>
+    <style id="special-var" name="Module name, Variant, etc" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/sparql.lang b/data/language-specs/sparql.lang
index 6cbe115..6b120e5 100644
--- a/data/language-specs/sparql.lang
+++ b/data/language-specs/sparql.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="sparql" _name="SPARQL" version="2.0" _section="Source">
+<language id="sparql" name="SPARQL" version="2.0" _section="Source">
 
   <metadata>
     <property name="mimetypes">application/sparql-query</property>
@@ -29,19 +29,19 @@
   </metadata>
 
   <styles>
-    <style id="class"      _name="Class"      map-to="def:type"/>
-    <style id="datatype"   _name="Data Type"  map-to="def:type"/>
-    <style id="function"   _name="Function"   map-to="def:function"/>
-    <style id="individual" _name="Individual" map-to="def:special-constant"/>
-    <style id="keyword"    _name="Keyword"    map-to="def:keyword"/>
-    <style id="namespace"  _name="Namespace"  map-to="def:builtin"/>
-    <style id="boolean"    _name="Boolean"    map-to="def:boolean"/>
-    <style id="literal"    _name="Literal"    map-to="def:string"/>
-    <style id="predicate"  _name="Predicate"  map-to="def:function"/>
-    <style id="qname"      _name="QName" />
-    <style id="iri"        _name="IRI"        map-to="def:special-constant"/>
-    <style id="var"        _name="Variable"   map-to="def:preprocessor"/>
-    <style id="operator"   _name="Operator"   map-to="def:operator"/>
+    <style id="class"      name="Class"      map-to="def:type"/>
+    <style id="datatype"   name="Data Type"  map-to="def:type"/>
+    <style id="function"   name="Function"   map-to="def:function"/>
+    <style id="individual" name="Individual" map-to="def:special-constant"/>
+    <style id="keyword"    name="Keyword"    map-to="def:keyword"/>
+    <style id="namespace"  name="Namespace"  map-to="def:builtin"/>
+    <style id="boolean"    name="Boolean"    map-to="def:boolean"/>
+    <style id="literal"    name="Literal"    map-to="def:string"/>
+    <style id="predicate"  name="Predicate"  map-to="def:function"/>
+    <style id="qname"      name="QName" />
+    <style id="iri"        name="IRI"        map-to="def:special-constant"/>
+    <style id="var"        name="Variable"   map-to="def:preprocessor"/>
+    <style id="operator"   name="Operator"   map-to="def:operator"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/sql.lang b/data/language-specs/sql.lang
index b573cd0..bd23c2f 100644
--- a/data/language-specs/sql.lang
+++ b/data/language-specs/sql.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="sql" _name="SQL" version="2.0" _section="Source">
+<language id="sql" name="SQL" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-sql</property>
     <property name="globs">*.sql</property>
@@ -28,14 +28,14 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="floating-point" _name="Floating Point" map-to="def:floating-point"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="some-thing" _name="No idea what it is" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="floating-point" name="Floating Point" map-to="def:floating-point"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="some-thing" name="No idea what it is" map-to="def:preprocessor"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/sweave.lang b/data/language-specs/sweave.lang
index b61ba4f..652f21b 100644
--- a/data/language-specs/sweave.lang
+++ b/data/language-specs/sweave.lang
@@ -21,16 +21,16 @@
 
 -->
 
-<language id="sweave" _name="Sweave" version="2.0" _section="Markup">
+<language id="sweave" name="Sweave" version="2.0" _section="Markup">
   <metadata>
     <property name="globs">*.rnw;*.Rnw;*.snw;*.Snw</property>
     <property name="line-comment-start">%</property>
   </metadata>
 
   <styles>
-    <style id="comment"            _name="Comment"    map-to="latex:comment"/>
-    <style id="command"            _name="Command"    map-to="latex:command"/>
-    <style id="verbatim"           _name="Verbatim"   map-to="latex:verbatim"/>
+    <style id="comment"            name="Comment"    map-to="latex:comment"/>
+    <style id="command"            name="Command"    map-to="latex:command"/>
+    <style id="verbatim"           name="Verbatim"   map-to="latex:verbatim"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/systemverilog.lang b/data/language-specs/systemverilog.lang
index a034ff2..15e9085 100644
--- a/data/language-specs/systemverilog.lang
+++ b/data/language-specs/systemverilog.lang
@@ -18,7 +18,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="systemverilog" _name="SystemVerilog" version="2.0" _section="Source">
+<language id="systemverilog" name="SystemVerilog" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.sv;*.svh</property>
     <property name="line-comment-start">//</property>
@@ -27,10 +27,10 @@
   </metadata>
 
   <styles>
-    <style id="compiler-directive" _name="Compiler Directive" map-to="def:preprocessor"/>
-    <style id="system-task" _name="System Task" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Type" map-to="def:type"/>
+    <style id="compiler-directive" name="Compiler Directive" map-to="def:preprocessor"/>
+    <style id="system-task" name="System Task" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Type" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/t2t.lang b/data/language-specs/t2t.lang
index c7229a8..10912b1 100644
--- a/data/language-specs/t2t.lang
+++ b/data/language-specs/t2t.lang
@@ -20,28 +20,28 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="t2t" _name="txt2tags" version="2.0" _section="Markup">
+<language id="t2t" name="txt2tags" version="2.0" _section="Markup">
   <metadata>
     <property name="globs">*.t2t</property>
     <property name="line-comment-start">%</property>
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment"/>
-    <style id="option" _name="Option"/>
-    <style id="option-name" _name="Option Name" map-to="def:keyword"/>
-    <style id="header" _name="Header" map-to="def:keyword"/>
-    <style id="section" _name="Section" map-to="def:keyword"/>
-    <style id="section-1" _name="Section 1" map-to="t2t:section"/>
-    <style id="section-2" _name="Section 2" map-to="t2t:section"/>
-    <style id="section-3" _name="Section 3" map-to="t2t:section"/>
-    <style id="section-4" _name="Section 4" map-to="t2t:section"/>
-    <style id="section-5" _name="Section 5" map-to="t2t:section"/>
-    <style id="anchor" _name="Anchor" map-to="t2t:section"/>
-    <style id="italic" _name="Italic"/>
-    <style id="bold" _name="Bold"/>
-    <style id="verbatim" _name="Verbatim"/>
-    <style id="verbatim-block" _name="Verbatim Block"/>
+    <style id="comment" name="Comment"/>
+    <style id="option" name="Option"/>
+    <style id="option-name" name="Option Name" map-to="def:keyword"/>
+    <style id="header" name="Header" map-to="def:keyword"/>
+    <style id="section" name="Section" map-to="def:keyword"/>
+    <style id="section-1" name="Section 1" map-to="t2t:section"/>
+    <style id="section-2" name="Section 2" map-to="t2t:section"/>
+    <style id="section-3" name="Section 3" map-to="t2t:section"/>
+    <style id="section-4" name="Section 4" map-to="t2t:section"/>
+    <style id="section-5" name="Section 5" map-to="t2t:section"/>
+    <style id="anchor" name="Anchor" map-to="t2t:section"/>
+    <style id="italic" name="Italic"/>
+    <style id="bold" name="Bold"/>
+    <style id="verbatim" name="Verbatim"/>
+    <style id="verbatim-block" name="Verbatim Block"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/tcl.lang b/data/language-specs/tcl.lang
index 160e652..31d2805 100644
--- a/data/language-specs/tcl.lang
+++ b/data/language-specs/tcl.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="tcl" _name="Tcl" version="2.0" _section="Script">
+<language id="tcl" name="Tcl" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-tcl;application/x-tcl</property>
     <property name="globs">*.tcl;*.tk</property>
@@ -28,8 +28,8 @@
   </metadata>
 
   <styles>
-    <style id="variable" _name="Variable" map-to="def:type"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
+    <style id="variable" name="Variable" map-to="def:type"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/texinfo.lang b/data/language-specs/texinfo.lang
index 2b0d2e4..b596c85 100644
--- a/data/language-specs/texinfo.lang
+++ b/data/language-specs/texinfo.lang
@@ -21,7 +21,7 @@
 
 -->
 <!-- converted to new lang file format with convert.py -->
-<language id="texinfo" _name="Texinfo" version="2.0" _section="Markup">
+<language id="texinfo" name="Texinfo" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-texinfo</property>
     <property name="globs">*.texi;*.texinfo</property>
@@ -29,15 +29,15 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="others"            _name="Others"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="macros"            _name="Macros"            map-to="def:keyword"/>
-    <style id="file-attributes"   _name="File Attributes"   map-to="def:keyword"/>
-    <style id="generated-content" _name="Generated Content" map-to="def:keyword"/>
-    <style id="include"           _name="Include"           map-to="def:preprocessor"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="others"            name="Others"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="macros"            name="Macros"            map-to="def:keyword"/>
+    <style id="file-attributes"   name="File Attributes"   map-to="def:keyword"/>
+    <style id="generated-content" name="Generated Content" map-to="def:keyword"/>
+    <style id="include"           name="Include"           map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/thrift.lang b/data/language-specs/thrift.lang
index 9c4a3b0..b37db1d 100644
--- a/data/language-specs/thrift.lang
+++ b/data/language-specs/thrift.lang
@@ -17,7 +17,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="thrift" _name="Thrift" version="2.0" _section="Source">
+<language id="thrift" name="Thrift" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.thrift</property>
     <property name="line-comment-start">//</property>
@@ -26,10 +26,10 @@
   </metadata>
 
   <styles>
-    <style id="comment"     _name="Comment"      map-to="def:comment"/>
-    <style id="type"        _name="Data Type"    map-to="def:type"/>
-    <style id="keyword"     _name="Keyword"      map-to="def:keyword"/>
-    <style id="string"      _name="String"       map-to="def:string"/>
+    <style id="comment"     name="Comment"      map-to="def:comment"/>
+    <style id="type"        name="Data Type"    map-to="def:type"/>
+    <style id="keyword"     name="Keyword"      map-to="def:keyword"/>
+    <style id="string"      name="String"       map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/vala.lang b/data/language-specs/vala.lang
index 4992aa3..a81a20c 100644
--- a/data/language-specs/vala.lang
+++ b/data/language-specs/vala.lang
@@ -24,7 +24,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="vala" _name="Vala" version="2.0" _section="Source">
+<language id="vala" name="Vala" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-vala</property>
     <property name="globs">*.vala;*.vapi</property>
@@ -34,18 +34,18 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
     <style id="directive" name="Directives" map-to="def:preprocessor"/>
     <style id="attributes" name="Vala Attributes" map-to="def:function"/>
     <style id="string-template" name="Vala String template" map-to="def:function"/>
-    <style id="regex" _name="Regular Expression" map-to="def:string"/>
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="regex" name="Regular Expression" map-to="def:string"/>
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/vbnet.lang b/data/language-specs/vbnet.lang
index 1199be4..1a3113d 100644
--- a/data/language-specs/vbnet.lang
+++ b/data/language-specs/vbnet.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="vbnet" _name="VB.NET" version="2.0" _section="Source">
+<language id="vbnet" name="VB.NET" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-vbnet;text/x-vb</property>
     <property name="globs">*.vb</property>
@@ -28,13 +28,13 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="special-constant" _name="Special constant" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="special-constant" name="Special constant" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/verilog.lang b/data/language-specs/verilog.lang
index 584b7b8..2e4df9e 100644
--- a/data/language-specs/verilog.lang
+++ b/data/language-specs/verilog.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="verilog" _name="Verilog" version="2.0" _section="Source">
+<language id="verilog" name="Verilog" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-verilog-src</property>
     <property name="globs">*.v</property>
@@ -30,20 +30,20 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="printf" _name="printf Conversion" map-to="def:special-char"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="compiler-directive" _name="Compiler Directive" map-to="def:preprocessor"/>
-    <style id="ieee-system-task" _name="IEEE System Task" map-to="def:keyword"/>
-    <style id="lrm-additional-system-task" _name="LRM Additional System Task" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="gate" _name="Gate" map-to="def:keyword"/>
-    <style id="type" _name="Type" map-to="def:type"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="real-number" _name="Real number" map-to="def:floating-point"/>
-    <style id="integer-number" _name="Integer Number" map-to="def:number"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="printf" name="printf Conversion" map-to="def:special-char"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="compiler-directive" name="Compiler Directive" map-to="def:preprocessor"/>
+    <style id="ieee-system-task" name="IEEE System Task" map-to="def:keyword"/>
+    <style id="lrm-additional-system-task" name="LRM Additional System Task" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="gate" name="Gate" map-to="def:keyword"/>
+    <style id="type" name="Type" map-to="def:type"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="real-number" name="Real number" map-to="def:floating-point"/>
+    <style id="integer-number" name="Integer Number" map-to="def:number"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/vhdl.lang b/data/language-specs/vhdl.lang
index d4cf26b..5583d0c 100644
--- a/data/language-specs/vhdl.lang
+++ b/data/language-specs/vhdl.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="vhdl" _name="VHDL" version="2.0" _section="Source">
+<language id="vhdl" name="VHDL" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-vhdl</property>
     <property name="globs">*.vhd</property>
@@ -28,15 +28,15 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Type" map-to="def:type"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="base-n-number" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="real" _name="Real number" map-to="def:floating-point"/>
-    <style id="number" _name="Number" map-to="def:number"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Type" map-to="def:type"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="base-n-number" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="real" name="Real number" map-to="def:floating-point"/>
+    <style id="number" name="Number" map-to="def:number"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/xml.lang b/data/language-specs/xml.lang
index 83a71cd..8fd7d3e 100644
--- a/data/language-specs/xml.lang
+++ b/data/language-specs/xml.lang
@@ -22,7 +22,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="xml" _name="XML" version="2.0" _section="Markup">
+<language id="xml" name="XML" version="2.0" _section="Markup">
     <metadata>
         <property name="mimetypes">application/xml;text/xml</property>
         <property 
name="globs">*.xml;*.xspf;*.siv;*.smil;*.smi;*.sml;*.kino;*.xul;*.xbel;*.abw;*.zabw;*.glade;*.jnlp;*.xhtml;*.svg;*.mml;*.rdf;*.rss;*.wml;*.xmi;*.fo;*.xslfo</property>
@@ -31,17 +31,17 @@
     </metadata>
 
     <styles>
-        <style id="comment"                 _name="Comment"                 map-to="def:comment"/>
-        <style id="doctype"                 _name="DOCTYPE"                 map-to="def:preprocessor"/>
-        <style id="cdata-delim"             _name="CDATA delimiter"         map-to="def:preprocessor"/>
-        <style id="processing-instruction"  _name="Processing instruction"  map-to="def:preprocessor"/>
-        <style id="element-name"            _name="Element name"            map-to="def:identifier"/>
-        <style id="attribute-name"          _name="Attribute name"          map-to="def:type"/>
-        <style id="attribute-value"         _name="Attribute value"         map-to="def:string"/>
-        <style id="entity"                  _name="Entity"                  map-to="def:preprocessor"/>
-        <style id="tag"                     _name="Tag"/>
-        <style id="namespace"               _name="Namespace"               map-to="xml:element-name"/>
-        <style id="error"                   _name="Error"                   map-to="def:error"/>
+        <style id="comment"                 name="Comment"                 map-to="def:comment"/>
+        <style id="doctype"                 name="DOCTYPE"                 map-to="def:preprocessor"/>
+        <style id="cdata-delim"             name="CDATA delimiter"         map-to="def:preprocessor"/>
+        <style id="processing-instruction"  name="Processing instruction"  map-to="def:preprocessor"/>
+        <style id="element-name"            name="Element name"            map-to="def:identifier"/>
+        <style id="attribute-name"          name="Attribute name"          map-to="def:type"/>
+        <style id="attribute-value"         name="Attribute value"         map-to="def:string"/>
+        <style id="entity"                  name="Entity"                  map-to="def:preprocessor"/>
+        <style id="tag"                     name="Tag"/>
+        <style id="namespace"               name="Namespace"               map-to="xml:element-name"/>
+        <style id="error"                   name="Error"                   map-to="def:error"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/xslt.lang b/data/language-specs/xslt.lang
index e36762a..4179310 100644
--- a/data/language-specs/xslt.lang
+++ b/data/language-specs/xslt.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="xslt" _name="XSLT" version="2.0" _section="Markup">
+<language id="xslt" name="XSLT" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">application/xslt+xml</property>
     <property name="globs">*.xslt;*.xsl</property>
@@ -29,8 +29,8 @@
   </metadata>
 
   <styles>
-    <style id="element" _name="Element" map-to="def:keyword"/>
-    <style id="namespace" _name="Namespace" map-to="xslt:element"/>
+    <style id="element" name="Element" map-to="def:keyword"/>
+    <style id="namespace" name="Namespace" map-to="xslt:element"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/yacc.lang b/data/language-specs/yacc.lang
index 565fddf..3eacc37 100644
--- a/data/language-specs/yacc.lang
+++ b/data/language-specs/yacc.lang
@@ -20,7 +20,7 @@
  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="yacc" _name="Yacc" _section="Other" version="2.0">
+<language id="yacc" name="Yacc" _section="Other" version="2.0">
   <metadata>
     <property name="mimetypes">text/x-yacc;text/x-bison</property>
     <property name="globs">*.y;*.yacc</property>
@@ -31,9 +31,9 @@
 
   <styles>
     <!--FIXME make it better names, and make them translatable -->
-    <style id="keyword" _name="keyword" map-to="def:keyword"/>
-    <style id="token-type" _name="token type" map-to="def:type"/>
-    <style id="rule" _name="rule" map-to="def:identifier"/>
+    <style id="keyword" name="keyword" map-to="def:keyword"/>
+    <style id="token-type" name="token type" map-to="def:type"/>
+    <style id="rule" name="rule" map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/yaml.lang b/data/language-specs/yaml.lang
index 2246702..99db2ca 100644
--- a/data/language-specs/yaml.lang
+++ b/data/language-specs/yaml.lang
@@ -18,7 +18,7 @@
   You should have received a copy of the GNU Lesser General Public License
   along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
-<language id="yaml" _name="YAML" _section="Other" version="2.0">
+<language id="yaml" name="YAML" _section="Other" version="2.0">
   <metadata>
     <property name="mimetypes">application/x-yaml</property>
     <property name="globs">*.yaml;*.yml;</property>
@@ -26,18 +26,18 @@
   </metadata>
 
   <styles>
-    <style id="scalar"    _name="Block literal"   map-to="def:string"/>
-    <style id="comment"   _name="Comment"         map-to="def:comment"/>
-    <style id="string"    _name="String"          map-to="def:string"/>
-    <style id="anchor"    _name="Anchor"          map-to="def:identifier"/>
-    <style id="tag"       _name="Tag"             map-to="def:preprocessor"/>
-    <style id="alias"     _name="Alias"           map-to="def:type"/>
-    <style id="map-key"   _name="Map key"         map-to="def:keyword"/>
-    <style id="directive" _name="Directive"       map-to="def:shebang"/>
-    <style id="null"      _name="Null"            map-to="def:special-constant"/>
-    <style id="bool"      _name="Boolean"         map-to="def:boolean"/>
-    <style id="int"       _name="Integer"         map-to="def:decimal"/>
-    <style id="float"     _name="Floating point"  map-to="def:floating-point"/>
+    <style id="scalar"    name="Block literal"   map-to="def:string"/>
+    <style id="comment"   name="Comment"         map-to="def:comment"/>
+    <style id="string"    name="String"          map-to="def:string"/>
+    <style id="anchor"    name="Anchor"          map-to="def:identifier"/>
+    <style id="tag"       name="Tag"             map-to="def:preprocessor"/>
+    <style id="alias"     name="Alias"           map-to="def:type"/>
+    <style id="map-key"   name="Map key"         map-to="def:keyword"/>
+    <style id="directive" name="Directive"       map-to="def:shebang"/>
+    <style id="null"      name="Null"            map-to="def:special-constant"/>
+    <style id="bool"      name="Boolean"         map-to="def:boolean"/>
+    <style id="int"       name="Integer"         map-to="def:decimal"/>
+    <style id="float"     name="Floating point"  map-to="def:floating-point"/>
   </styles>
 
   <definitions>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]