-<!ENTITY quinn "<firstname>Sebastian </firstname><surname>Hammer</surname>">
-<!ENTITY sondberg "<firstname>Anders </firstname><surname>Sønderberg</surname>">
+<!ENTITY sebastian "<firstname>Sebastian </firstname><surname>Hammer</surname>">
+<!ENTITY anders "<firstname>Anders </firstname><surname>Sønderberg</surname>">
-<!ENTITY metaproxy "<productname>Metaproxy</productname>">
-<!ENTITY yaz "<productname>YAZ</productname>">
-<!ENTITY yazpp "<productname>YazPP</productname>">
-<!ENTITY yazproxy "<productname>Yazproxy</productname>">
-<!ENTITY zebra "<productname>Zebra</productname>">
-<!ENTITY zebra13 "<productname>Zebra</productname> <productnumber>1.3</productnumber>">
-<!ENTITY zebra20 "<productname>Zebra</productname> <productnumber>2.0</productnumber>">
+<!ENTITY metaproxy "<application>Metaproxy</application>">
+<!ENTITY yaz "<application>YAZ</application>">
+<!ENTITY yazpp "<application>YazPP</application>">
+<!ENTITY yazproxy "<application>Yazproxy</application>">
+<!ENTITY zebra "<application>Zebra</application>">
+<!ENTITY zebra13 "<application>Zebra</application> <productnumber>1.3</productnumber>">
+<!ENTITY zebra20 "<application>Zebra</application> <productnumber>2.0</productnumber>">
<!-- ACRONYMES -->
<!ENTITY z3950 "<acronym>Z39.50</acronym>">
<!ENTITY sru "<acronym>SRU </acronym>">
<!ENTITY sru_gps "<acronym>SRU GET/POST/SOAP</acronym>">
<!ENTITY srw "<acronym>SRW</acronym>">
<!-- ACRONYMES -->
<!ENTITY z3950 "<acronym>Z39.50</acronym>">
<!ENTITY sru "<acronym>SRU </acronym>">
<!ENTITY sru_gps "<acronym>SRU GET/POST/SOAP</acronym>">
<!ENTITY srw "<acronym>SRW</acronym>">
<!ENTITY pqf "<acronym>PQF</acronym>">
<!ENTITY rpn "<acronym>RPN</acronym>">
<!ENTITY cql "<acronym>CQL</acronym>">
<!ENTITY pqf "<acronym>PQF</acronym>">
<!ENTITY rpn "<acronym>RPN</acronym>">
<!ENTITY cql "<acronym>CQL</acronym>">