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

[virt-tools-list] [PATCH libosinfo 02/10] Standardize OS family names as all lowercase



From: "Daniel P. Berrange" <berrange redhat com>

The OS family names effectively refer to the kernel used.
Switch them all to lowercase, and correct a few mistakes,

  MacOS -> darwin
  Windows -> win9x or winnt
  Other -> msdos or netware

    <family>darwin</family>
    <family>freebsd</family>
    <family>linux</family>
    <family>msdos</family>
    <family>netbsd</family>
    <family>netware</family>
    <family>openbsd</family>
    <family>solaris</family>
    <family>win9x</family>
    <family>winnt</family>
---
 data/oses/Makefile.am       |    3 +-
 data/oses/centos.xml        |    4 +-
 data/oses/debian.xml        |   24 ++++++------
 data/oses/dos.xml           |    9 +++++
 data/oses/fedora.xml        |   32 ++++++++--------
 data/oses/freebsd.xml       |   80 +++++++++++++++++++++---------------------
 data/oses/generic-linux.xml |   10 +++---
 data/oses/macos.xml         |   16 ++++----
 data/oses/mandrake.xml      |   34 +++++++++---------
 data/oses/mandriva.xml      |   26 +++++++-------
 data/oses/netbsd.xml        |   28 +++++++-------
 data/oses/netware.xml       |   26 ++++++++++++++
 data/oses/openbsd.xml       |   14 ++++----
 data/oses/opensuse.xml      |   16 ++++----
 data/oses/others.xml        |   35 -------------------
 data/oses/rhel.xml          |   80 +++++++++++++++++++++---------------------
 data/oses/rhl.xml           |   40 +++++++++++-----------
 data/oses/solaris.xml       |    6 ++--
 data/oses/suse.xml          |   12 +++---
 data/oses/ubuntu.xml        |   30 ++++++++--------
 data/oses/windows.xml       |   24 ++++++------
 21 files changed, 275 insertions(+), 274 deletions(-)
 create mode 100644 data/oses/dos.xml
 create mode 100644 data/oses/netware.xml
 delete mode 100644 data/oses/others.xml

diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 889f515..343119f 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -3,15 +3,16 @@ databasedir = $(pkgdatadir)/db/oses/
 database_DATA =     \
   centos.xml        \
   debian.xml        \
+  dos.xml           \
   fedora.xml        \
   freebsd.xml	    \
   generic-linux.xml \
   mandriva.xml      \
   mandrake.xml      \
   netbsd.xml	    \
+  netware.xml	    \
   openbsd.xml	    \
   opensuse.xml      \
-  others.xml	    \
   rhl.xml           \
   rhel.xml          \
   solaris.xml	    \
diff --git a/data/oses/centos.xml b/data/oses/centos.xml
index 42c5753..21ea5ad 100644
--- a/data/oses/centos.xml
+++ b/data/oses/centos.xml
@@ -5,7 +5,7 @@
     <name>CentOS 6.0</name>
     <version>6.0</version>
     <vendor>CentOS</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>centos</distro>
     <clones id="http://redhat.com/rhel/6.0"/>
 
@@ -30,7 +30,7 @@
     <name>CentOS 6.1</name>
     <version>6.1</version>
     <vendor>CentOS</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>centos</distro>
     <upgrades id="http://centos.org/centos/6.0"/>
     <clones id="http://redhat.com/rhel/6.1"/>
diff --git a/data/oses/debian.xml b/data/oses/debian.xml
index d25a3c0..fde58bc 100644
--- a/data/oses/debian.xml
+++ b/data/oses/debian.xml
@@ -5,7 +5,7 @@
     <name>Debian Buzz</name>
     <version>1.1</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
   </os>
 
@@ -14,7 +14,7 @@
     <name>Debian Rex</name>
     <version>1.2</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/buzz"/>
     <derives-from id="http://debian.org/buzz"/>
@@ -25,7 +25,7 @@
     <name>Debian Bo</name>
     <version>1.3</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/rex"/>
     <derives-from id="http://debian.org/rex"/>
@@ -36,7 +36,7 @@
     <name>Debian Hamm</name>
     <version>2.0</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/bo"/>
     <derives-from id="http://debian.org/bo"/>
@@ -47,7 +47,7 @@
     <name>Debian Silnk</name>
     <version>2.1</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/hamm"/>
     <derives-from id="http://debian.org/hamm"/>
@@ -58,7 +58,7 @@
     <name>Debian Potato</name>
     <version>2.2</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/silnk"/>
     <derives-from id="http://debian.org/silnk"/>
@@ -69,7 +69,7 @@
     <name>Debian Woody</name>
     <version>3</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/potato"/>
     <derives-from id="http://debian.org/potato"/>
@@ -81,7 +81,7 @@
     <name>Debian Sarge</name>
     <version>3.1</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/woody"/>
     <derives-from id="http://debian.org/woody"/>
@@ -92,7 +92,7 @@
     <name>Debian Etch</name>
     <version>4</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/sarge"/>
     <derives-from id="http://debian.org/sarge"/>
@@ -103,7 +103,7 @@
     <name>Debian Lenny</name>
     <version>5</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/etch"/>
     <derives-from id="http://debian.org/etch"/>
@@ -133,7 +133,7 @@
     <name>Debian Squeeze</name>
     <version>6</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>debian</distro>
     <upgrades id="http://debian.org/lenny"/>
     <derives-from id="http://debian.org/lenny"/>
@@ -193,7 +193,7 @@
     <name>Debian Wheezy</name>
     <version>7</version>
     <vendor>Debian Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <upgrades id="http://debian.org/squeeze"/>
   </os>
 -->
diff --git a/data/oses/dos.xml b/data/oses/dos.xml
new file mode 100644
index 0000000..788325b
--- /dev/null
+++ b/data/oses/dos.xml
@@ -0,0 +1,9 @@
+<libosinfo version="0.0.1">
+  <os id="http://microsoft.com/msdos";>
+    <short-id>msdos</short-id>
+    <name>Microsoft MS-DOS</name>
+    <vendor>Microsoft</vendor>
+    <family>msdos</family>
+    <distro>msdos</distro>
+  </os>
+</libosinfo>
diff --git a/data/oses/fedora.xml b/data/oses/fedora.xml
index 79581bd..ca7a8d6 100644
--- a/data/oses/fedora.xml
+++ b/data/oses/fedora.xml
@@ -5,7 +5,7 @@
     <name>Fedora Core 1</name>
     <version>1</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Yarrow</codename>
     <upgrades id="http://redhat.com/rhl/9"/>
@@ -59,7 +59,7 @@
     <name>Fedora Core 2</name>
     <version>2</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Tettnang</codename>
     <upgrades id="http://fedoraproject.org/fedora/1"/>
@@ -106,7 +106,7 @@
     <name>Fedora Core 3</name>
     <version>3</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Heidelberg</codename>
     <upgrades id="http://fedoraproject.org/fedora/2"/>
@@ -153,7 +153,7 @@
     <name>Fedora Core 4</name>
     <version>4</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Stentz</codename>
     <upgrades id="http://fedoraproject.org/fedora/3"/>
@@ -209,7 +209,7 @@
     <name>Fedora Core 5</name>
     <version>5</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Bordeaux</codename>
     <upgrades id="http://fedoraproject.org/fedora/4"/>
@@ -265,7 +265,7 @@
     <name>Fedora Core 6</name>
     <version>6</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Zod</codename>
     <upgrades id="http://fedoraproject.org/fedora/5"/>
@@ -321,7 +321,7 @@
     <name>Fedora 7</name>
     <version>7</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Moonshine</codename>
     <upgrades id="http://fedoraproject.org/fedora/6"/>
@@ -400,7 +400,7 @@
     <name>Fedora 8</name>
     <version>8</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Werewolf</codename>
     <upgrades id="http://fedoraproject.org/fedora/7"/>
@@ -488,7 +488,7 @@
     <name>Fedora 9</name>
     <version>9</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Sulphur</codename>
     <upgrades id="http://fedoraproject.org/fedora/8"/>
@@ -575,7 +575,7 @@
     <name>Fedora 10</name>
     <version>10</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Cambridge</codename>
     <upgrades id="http://fedoraproject.org/fedora/9"/>
@@ -659,7 +659,7 @@
     <name>Fedora 11</name>
     <version>11</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Leonidas</codename>
     <upgrades id="http://fedoraproject.org/fedora/10"/>
@@ -743,7 +743,7 @@
     <name>Fedora 12</name>
     <version>12</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Constantine</codename>
     <upgrades id="http://fedoraproject.org/fedora/11"/>
@@ -822,7 +822,7 @@
     <name>Fedora 13</name>
     <version>13</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Goddard</codename>
     <upgrades id="http://fedoraproject.org/fedora/12"/>
@@ -893,7 +893,7 @@
     <name>Fedora 14</name>
     <version>14</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Laughlin</codename>
     <upgrades id="http://fedoraproject.org/fedora/13"/>
@@ -977,7 +977,7 @@
     <name>Fedora 15</name>
     <version>15</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Lovelock</codename>
     <upgrades id="http://fedoraproject.org/fedora/14"/>
@@ -1060,7 +1060,7 @@
     <name>Fedora 16</name>
     <version>16</version>
     <vendor>Fedora Project</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>fedora</distro>
     <codename>Verne</codename>
     <upgrades id="http://fedoraproject.org/fedora/15"/>
diff --git a/data/oses/freebsd.xml b/data/oses/freebsd.xml
index 78ffe23..3711127 100644
--- a/data/oses/freebsd.xml
+++ b/data/oses/freebsd.xml
@@ -5,7 +5,7 @@
     <name>FreeBSD 1.0</name>
     <version>1.0</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <release-date>1993-11-00</release-date>
@@ -17,7 +17,7 @@
     <name>FreeBSD 2.0</name>
     <version>2.0</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <release-date>1994-11-22</release-date>
@@ -32,7 +32,7 @@
     <name>FreeBSD 2.0.5</name>
     <version>2.0.5</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/2.0"/>
@@ -45,7 +45,7 @@
     <name>FreeBSD 2.2.8</name>
     <version>2.2.8</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/2.0.5"/>
     <derives-from id="http://freebsd.org/freebsd/2.0.5"/>
@@ -57,7 +57,7 @@
     <name>FreeBSD 2.2.9</name>
     <version>2.2.9</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/2.2.8"/>
     <derives-from id="http://freebsd.org/freebsd/2.2.8"/>
@@ -69,7 +69,7 @@
     <name>FreeBSD 3.0</name>
     <version>3.0</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <release-date>1998-10-16</release-date>
@@ -84,7 +84,7 @@
     <name>FreeBSD 3.2</name>
     <version>3.2</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/3.0"/>
     <derives-from id="http://freebsd.org/freebsd/3.0"/>
@@ -96,7 +96,7 @@
     <name>FreeBSD 4.0</name>
     <version>4.0</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <release-date>2000-03-00</release-date>
@@ -111,7 +111,7 @@
     <name>FreeBSD 4.1</name>
     <version>4.1</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.0"/>
@@ -124,7 +124,7 @@
     <name>FreeBSD 4.2</name>
     <version>4.2</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.1"/>
@@ -137,7 +137,7 @@
     <name>FreeBSD 4.3</name>
     <version>4.3</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.2"/>
@@ -150,7 +150,7 @@
     <name>FreeBSD 4.4</name>
     <version>4.4</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.3"/>
@@ -163,7 +163,7 @@
     <name>FreeBSD 4.5</name>
     <version>4.5</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.4"/>
@@ -176,7 +176,7 @@
     <name>FreeBSD 4.6</name>
     <version>4.6</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.5"/>
@@ -189,7 +189,7 @@
     <name>FreeBSD 4.7</name>
     <version>4.7</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.6"/>
@@ -202,7 +202,7 @@
     <name>FreeBSD 4.8</name>
     <version>4.8</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.7"/>
@@ -215,7 +215,7 @@
     <name>FreeBSD 4.9</name>
     <version>4.9</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.8"/>
@@ -228,7 +228,7 @@
     <name>FreeBSD 4.10</name>
     <version>4.10</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/4.9"/>
@@ -241,7 +241,7 @@
     <name>FreeBSD 4.11</name>
     <version>4.11</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <release-date>2000-06-24</release-date>
@@ -257,7 +257,7 @@
     <name>FreeBSD 5.0</name>
     <version>5.0</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <release-date>2003-01-00</release-date>
@@ -272,7 +272,7 @@
     <name>FreeBSD 5.1</name>
     <version>5.1</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/5.0"/>
@@ -285,7 +285,7 @@
     <name>FreeBSD 5.2</name>
     <version>5.2</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/5.1"/>
@@ -298,7 +298,7 @@
     <name>FreeBSD 5.2.1</name>
     <version>5.2.1</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/5.2"/>
@@ -311,7 +311,7 @@
     <name>FreeBSD 5.3</name>
     <version>5.3</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/5.2.1"/>
@@ -324,7 +324,7 @@
     <name>FreeBSD 5.4</name>
     <version>5.4</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <upgrades id="http://freebsd.org/freebsd/5.3"/>
@@ -337,7 +337,7 @@
     <name>FreeBSD 5.5</name>
     <version>5.5</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
 
     <release-date>2006-05-00</release-date>
@@ -352,7 +352,7 @@
     <name>FreeBSD 6.0</name>
     <version>6.0</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/5.5"/>
     <derives-from id="http://freebsd.org/freebsd/5.5"/>
@@ -369,7 +369,7 @@
     <name>FreeBSD 6.1</name>
     <version>6.1</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.0"/>
     <derives-from id="http://freebsd.org/freebsd/6.0"/>
@@ -380,7 +380,7 @@
     <name>FreeBSD 6.2</name>
     <version>6.2</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.1"/>
     <derives-from id="http://freebsd.org/freebsd/6.1"/>
@@ -391,7 +391,7 @@
     <name>FreeBSD 6.3</name>
     <version>6.3</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.2"/>
     <derives-from id="http://freebsd.org/freebsd/6.2"/>
@@ -402,7 +402,7 @@
     <name>FreeBSD 6.4</name>
     <version>6.4</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.3"/>
     <derives-from id="http://freebsd.org/freebsd/6.3"/>
@@ -415,7 +415,7 @@
     <name>FreeBSD 7.0</name>
     <version>7.0</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/6.4"/>
     <derives-from id="http://freebsd.org/freebsd/6.4"/>
@@ -426,7 +426,7 @@
     <name>FreeBSD 7.1</name>
     <version>7.1</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.0"/>
     <derives-from id="http://freebsd.org/freebsd/7.0"/>
@@ -437,7 +437,7 @@
     <name>FreeBSD 7.2</name>
     <version>7.2</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.1"/>
     <derives-from id="http://freebsd.org/freebsd/7.1"/>
@@ -448,7 +448,7 @@
     <name>FreeBSD 7.3</name>
     <version>7.3</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.2"/>
     <derives-from id="http://freebsd.org/freebsd/7.2"/>
@@ -459,7 +459,7 @@
     <name>FreeBSD 7.4</name>
     <version>7.4</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.3"/>
     <derives-from id="http://freebsd.org/freebsd/7.3"/>
@@ -470,7 +470,7 @@
     <name>FreeBSD 8.0</name>
     <version>8.0</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/7.4"/>
     <derives-from id="http://freebsd.org/freebsd/7.4"/>
@@ -487,7 +487,7 @@
     <name>FreeBSD 8.1</name>
     <version>8.1</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/8.0"/>
     <derives-from id="http://freebsd.org/freebsd/8.0"/>
@@ -498,7 +498,7 @@
     <name>FreeBSD 8.2</name>
     <version>8.2</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/8.1"/>
     <derives-from id="http://freebsd.org/freebsd/8.1"/>
@@ -509,7 +509,7 @@
     <name>FreeBSD 9.0</name>
     <version>9.0</version>
     <vendor>FreeBSD Project</vendor>
-    <family>FreeBSD</family>
+    <family>freebsd</family>
     <distro>freebsd</distro>
     <upgrades id="http://freebsd.org/freebsd/8.2"/>
     <derives-from id="http://freebsd.org/freebsd/8.2"/>
diff --git a/data/oses/generic-linux.xml b/data/oses/generic-linux.xml
index 4d9fcfb..48b92b3 100644
--- a/data/oses/generic-linux.xml
+++ b/data/oses/generic-linux.xml
@@ -5,7 +5,7 @@
     <name>Generic 2.4.x kernel</name>
     <version>2.4</version>
     <vendor>Linux Kernel Developers</vendor>
-    <family>Linux</family>
+    <family>linux</family>
   </os>
 
   <os id="http://kernel.org/linux/26";>
@@ -20,7 +20,7 @@
     <name>Generic 2.6.25 or later kernel with virtio</name>
     <version>2.6</version>
     <vendor>Linux Kernel Developers</vendor>
-    <family>Linux</family>
+    <family>linux</family>
 
     <devices>
       <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
@@ -35,7 +35,7 @@
     <name>Generic 2.4.x kernel</name>
     <version>2.4</version>
     <vendor>Linux Kernel Developers</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <clones id="http://kernel.org/linux/24"/>
   </os>
 
@@ -44,7 +44,7 @@
     <name>Generic 2.6.x kernel</name>
     <version>2.6</version>
     <vendor>Linux Kernel Developers</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <clones id="http://kernel.org/linux/26"/>
   </os>
 
@@ -53,7 +53,7 @@
     <name>Generic 2.6.25 or later kernel with virtio</name>
     <version>2.6</version>
     <vendor>Linux Kernel Developers</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <clones id="http://kernel.org/linux/virtio/26"/>
   </os>
 
diff --git a/data/oses/macos.xml b/data/oses/macos.xml
index cae5aed..b2a5799 100644
--- a/data/oses/macos.xml
+++ b/data/oses/macos.xml
@@ -5,7 +5,7 @@
     <name>MacOS X Cheetah</name>
     <version>10.0</version>
     <vendor>Apple Inc.</vendor>
-    <family>MacOS</family>
+    <family>darwin</family>
     <distro>osx</distro>
   </os>
 
@@ -14,7 +14,7 @@
     <name>MacOS X Puma</name>
     <version>10.1</version>
     <vendor>Apple Inc.</vendor>
-    <family>MacOS</family>
+    <family>darwin</family>
     <upgrades id="http://apple.com/macosx/10.0"; />
     <distro>osx</distro>
   </os>
@@ -24,7 +24,7 @@
     <name>MacOS X Jaghuar</name>
     <version>10.2</version>
     <vendor>Apple Inc.</vendor>
-    <family>MacOS</family>
+    <family>darwin</family>
     <upgrades id="http://apple.com/macosx/10.1"; />
     <distro>osx</distro>
   </os>
@@ -34,7 +34,7 @@
     <name>MacOS X Panther</name>
     <version>10.3</version>
     <vendor>Apple Inc.</vendor>
-    <family>MacOS</family>
+    <family>darwin</family>
     <upgrades id="http://apple.com/macosx/10.2"; />
     <distro>osx</distro>
   </os>
@@ -44,7 +44,7 @@
     <name>MacOS X Tiger</name>
     <version>10.4</version>
     <vendor>Apple Inc.</vendor>
-    <family>MacOS</family>
+    <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.3"; />
   </os>
@@ -54,7 +54,7 @@
     <name>MacOS X Leopard</name>
     <version>10.5</version>
     <vendor>Apple Inc.</vendor>
-    <family>MacOS</family>
+    <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.4"; />
   </os>
@@ -64,7 +64,7 @@
     <name>MacOS X Snow Leopard</name>
     <version>10.6</version>
     <vendor>Apple Inc.</vendor>
-    <family>MacOS</family>
+    <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.5"; />
 
@@ -84,7 +84,7 @@
     <name>MacOS X Lion</name>
     <version>10.7</version>
     <vendor>Apple Inc.</vendor>
-    <family>MacOS</family>
+    <family>darwin</family>
     <distro>osx</distro>
     <upgrades id="http://apple.com/macosx/10.6"; />
 
diff --git a/data/oses/mandrake.xml b/data/oses/mandrake.xml
index 164f8e7..e0bb48c 100644
--- a/data/oses/mandrake.xml
+++ b/data/oses/mandrake.xml
@@ -4,7 +4,7 @@
     <short-id>mandrake5.1</short-id>
     <name>Mandrake Linux 5.1</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Venice</codename>
 
@@ -14,7 +14,7 @@
     <short-id>mandrake5.2</short-id>
     <name>Mandrake Linux 5.2</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Leeloo</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/5.1"/>
@@ -26,7 +26,7 @@
     <short-id>mandrake5.3</short-id>
     <name>Mandrake Linux 5.3</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Festen</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/5.2"/>
@@ -38,7 +38,7 @@
     <short-id>mandrake6.0</short-id>
     <name>Mandrake Linux 6.0</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Venus</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/5.2"/>
@@ -50,7 +50,7 @@
     <short-id>mandrake6.1</short-id>
     <name>Mandrake Linux 6.1</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Helios</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/6.0"/>
@@ -62,7 +62,7 @@
     <short-id>mandrake7.0</short-id>
     <name>Mandrake Linux 7.0</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Air</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/6.1"/>
@@ -74,7 +74,7 @@
     <short-id>mandrake7.1</short-id>
     <name>Mandrake Linux 7.1</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Helium</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/7.0"/>
@@ -86,7 +86,7 @@
     <short-id>mandrake7.2</short-id>
     <name>Mandrake Linux 7.2</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Odyssey</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/7.1"/>
@@ -98,7 +98,7 @@
     <short-id>mandrake8.0</short-id>
     <name>Mandrake Linux 8.0</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Traktopel</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/7.2"/>
@@ -110,7 +110,7 @@
     <short-id>mandrake8.1</short-id>
     <name>Mandrake Linux 8.1</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Vitamin</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/8.0"/>
@@ -122,7 +122,7 @@
     <short-id>mandrake8.2</short-id>
     <name>Mandrake Linux 8.2</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Bluebird</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/8.1"/>
@@ -134,7 +134,7 @@
     <short-id>mandrake9.0</short-id>
     <name>Mandrake Linux 9.0</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Dolphin</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/8.2"/>
@@ -146,7 +146,7 @@
     <short-id>mandrake9.1</short-id>
     <name>Mandrake Linux 9.1</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Bamboo</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/9.0"/>
@@ -158,7 +158,7 @@
     <short-id>mandrake9.2</short-id>
     <name>Mandrake Linux 9.2</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>FiveStar</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/9.1"/>
@@ -170,7 +170,7 @@
     <short-id>mandrake10.0</short-id>
     <name>Mandrake Linux 10.0</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <upgrades id="http://mandriva.com/linux/mandrake/9.2"/>
     <derives-from id="http://mandriva.com/linux/mandrake/9.2"/>
@@ -181,7 +181,7 @@
     <short-id>mandrake10.1</short-id>
     <name>Mandrake Linux 10.1</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <upgrades id="http://mandriva.com/linux/mandrake/10.0"/>
     <derives-from id="http://mandriva.com/linux/mandrake/10.0"/>
@@ -192,7 +192,7 @@
     <short-id>mandrake10.2</short-id>
     <name>Mandrake Linux 10.2</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandrake</distro>
     <codename>Leeloo</codename>
     <upgrades id="http://mandriva.com/linux/mandrake/10.1"/>
diff --git a/data/oses/mandriva.xml b/data/oses/mandriva.xml
index 0f6179a..73de583 100644
--- a/data/oses/mandriva.xml
+++ b/data/oses/mandriva.xml
@@ -4,7 +4,7 @@
     <short-id>mandriva2006</short-id>
     <name>Mandriva Linux 2006</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/mandrake/10.2"/>
     <derives-from id="http://mandriva.com/linux/mandrake/10.2"/>
@@ -15,7 +15,7 @@
     <short-id>mandriva2007</short-id>
     <name>Mandriva Linux 2007</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/2006.0"/>
     <derives-from id="http://mandriva.com/linux/2006.0"/>
@@ -26,7 +26,7 @@
     <short-id>mandriva2007.1</short-id>
     <name>Mandriva Linux 2007 Spring</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/2007"/>
     <derives-from id="http://mandriva.com/linux/2007"/>
@@ -37,7 +37,7 @@
     <short-id>mandriva2008</short-id>
     <name>Mandriva Linux 2008</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/2007.1"/>
     <derives-from id="http://mandriva.com/linux/2007.1"/>
@@ -48,7 +48,7 @@
     <short-id>mandriva2008.1</short-id>
     <name>Mandriva Linux 2008 Spring</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/2008.0"/>
     <derives-from id="http://mandriva.com/linux/2008.0"/>
@@ -59,7 +59,7 @@
     <short-id>mandriva2009.0</short-id>
     <name>Mandriva Linux 2009</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/2008.1"/>
     <derives-from id="http://mandriva.com/linux/2008.1"/>
@@ -70,7 +70,7 @@
     <short-id>mandriva2009.1</short-id>
     <name>Mandriva Linux 2009 Spring</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/2009.0"/>
     <derives-from id="http://mandriva.com/linux/2009.0"/>
@@ -81,7 +81,7 @@
     <short-id>mandriva2010.0</short-id>
     <name>Mandriva Linux 2010</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/2009.1"/>
     <derives-from id="http://mandriva.com/linux/2009.1"/>
@@ -96,7 +96,7 @@
     <short-id>mandriva2010.1</short-id>
     <name>Mandriva Linux 2010 Spring</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/2010.0"/>
     <derives-from id="http://mandriva.com/linux/2010.0"/>
@@ -107,7 +107,7 @@
     <short-id>mandriva2010.2</short-id>
     <name>Mandriva Linux 2010.2</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <upgrades id="http://mandriva.com/linux/2010.1"/>
     <derives-from id="http://mandriva.com/linux/2010.1"/>
@@ -118,7 +118,7 @@
     <short-id>mandriva2011</short-id>
     <name>Mandriva Linux 2011</name>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mandriva</distro>
     <codename>Hydrogen</codename>
     <upgrades id="http://mandriva.com/linux/2010.2"/>
@@ -131,7 +131,7 @@
     <name>Mandriva Enterprise Server 5.0</name>
     <version>5.0</version>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mes</distro>
 
   </os>
@@ -141,7 +141,7 @@
     <name>Mandriva Enterprise Server 5.1</name>
     <version>5.1</version>
     <vendor>Mandriva</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>mes</distro>
     <upgrades id="http://mandriva.com/linux/server/5.0"/>
     <derives-from id="http://mandriva.com/linux/server/5.0"/>
diff --git a/data/oses/netbsd.xml b/data/oses/netbsd.xml
index 7f79309..0baa2ce 100644
--- a/data/oses/netbsd.xml
+++ b/data/oses/netbsd.xml
@@ -5,7 +5,7 @@
     <name>NetBSD 0.8</name>
     <version>0.8</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
 
     <release-date>1993-04-20</release-date>
@@ -16,7 +16,7 @@
     <name>NetBSD 0.9</name>
     <version>0.9</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/0.8"/>
     <derives-from id="http://netbsd.org/netbsd/0.8"/>
@@ -29,7 +29,7 @@
     <name>NetBSD 1.0</name>
     <version>1.0</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/0.9"/>
     <derives-from id="http://netbsd.org/netbsd/0.9"/>
@@ -42,7 +42,7 @@
     <name>NetBSD 1.1</name>
     <version>1.1</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.0"/>
     <derives-from id="http://netbsd.org/netbsd/1.0"/>
@@ -55,7 +55,7 @@
     <name>NetBSD 1.2</name>
     <version>1.2</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.1"/>
     <derives-from id="http://netbsd.org/netbsd/1.1"/>
@@ -68,7 +68,7 @@
     <name>NetBSD 1.3</name>
     <version>1.3</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.2"/>
     <derives-from id="http://netbsd.org/netbsd/1.2"/>
@@ -81,7 +81,7 @@
     <name>NetBSD 1.4</name>
     <version>1.4</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.3"/>
     <derives-from id="http://netbsd.org/netbsd/1.3"/>
@@ -94,7 +94,7 @@
     <name>NetBSD 1.5</name>
     <version>1.5</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.4"/>
     <derives-from id="http://netbsd.org/netbsd/1.4"/>
@@ -107,7 +107,7 @@
     <name>NetBSD 1.6</name>
     <version>1.6</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.5"/>
     <derives-from id="http://netbsd.org/netbsd/1.5"/>
@@ -120,7 +120,7 @@
     <name>NetBSD 2.0</name>
     <version>2.0</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/1.6"/>
     <derives-from id="http://netbsd.org/netbsd/1.6"/>
@@ -133,7 +133,7 @@
     <name>NetBSD 3.0</name>
     <version>3.0</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/2.0"/>
     <derives-from id="http://netbsd.org/netbsd/2.0"/>
@@ -146,7 +146,7 @@
     <name>NetBSD 4.0</name>
     <version>4.0</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/3.0"/>
     <derives-from id="http://netbsd.org/netbsd/3.0"/>
@@ -159,7 +159,7 @@
     <name>NetBSD 5.0</name>
     <version>5.0</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/4.0"/>
     <derives-from id="http://netbsd.org/netbsd/4.0"/>
@@ -172,7 +172,7 @@
     <name>NetBSD 5.1</name>
     <version>5.1</version>
     <vendor>NetBSD Project</vendor>
-    <family>NetBSD</family>
+    <family>netbsd</family>
     <distro>netbsd</distro>
     <upgrades id="http://netbsd.org/netbsd/5.0"/>
     <derives-from id="http://netbsd.org/netbsd/5.0"/>
diff --git a/data/oses/netware.xml b/data/oses/netware.xml
new file mode 100644
index 0000000..50e20fe
--- /dev/null
+++ b/data/oses/netware.xml
@@ -0,0 +1,26 @@
+<libosinfo version="0.0.1">
+  <os id="http://novell.com/netware4";>
+    <short-id>netware4</short-id>
+    <name>Novell Netware 4</name>
+    <vendor>Novell</vendor>
+    <family>netware</family>
+    <distro>netware</distro>
+  </os>
+
+  <os id="http://novell.com/netware5";>
+    <short-id>netware5</short-id>
+    <name>Novell Netware 5</name>
+    <vendor>Novell</vendor>
+    <family>netware</family>
+    <distro>netware</distro>
+  </os>
+
+  <os id="http://novell.com/netware6";>
+    <short-id>netware6</short-id>
+    <name>Novell Netware 6</name>
+    <vendor>Novell</vendor>
+    <family>netware</family>
+    <distro>netware</distro>
+  </os>
+
+</libosinfo>
diff --git a/data/oses/openbsd.xml b/data/oses/openbsd.xml
index 9e8e5d1..5c585be 100644
--- a/data/oses/openbsd.xml
+++ b/data/oses/openbsd.xml
@@ -4,7 +4,7 @@
     <short-id>openbsd4.2</short-id>
     <name>OpenBSD 4.2</name>
     <version>4.2</version>
-    <family>OpenBSD</family>
+    <family>openbsd</family>
     <distro>openbsd</distro>
     <vendor>OpenBSD Project</vendor>
 
@@ -31,7 +31,7 @@
     <short-id>openbsd4.3</short-id>
     <name>OpenBSD 4.3</name>
     <version>4.3</version>
-    <family>OpenBSD</family>
+    <family>openbsd</family>
     <distro>openbsd</distro>
     <vendor>OpenBSD Project</vendor>
     <upgrades id='http://openbsd.org/openbsd/4.2'/>
@@ -60,7 +60,7 @@
     <short-id>openbsd4.4</short-id>
     <name>OpenBSD 4.4</name>
     <version>4.4</version>
-    <family>OpenBSD</family>
+    <family>openbsd</family>
     <distro>openbsd</distro>
     <vendor>OpenBSD Project</vendor>
     <upgrades id='http://openbsd.org/openbsd/4.3'/>
@@ -89,7 +89,7 @@
     <short-id>openbsd4.5</short-id>
     <name>OpenBSD 4.5</name>
     <version>4.5</version>
-    <family>OpenBSD</family>
+    <family>openbsd</family>
     <distro>openbsd</distro>
     <vendor>OpenBSD Project</vendor>
     <upgrades id='http://openbsd.org/openbsd/4.4'/>
@@ -118,7 +118,7 @@
     <short-id>openbsd4.8</short-id>
     <name>OpenBSD 4.8</name>
     <version>4.8</version>
-    <family>OpenBSD</family>
+    <family>openbsd</family>
     <distro>openbsd</distro>
     <vendor>OpenBSD Project</vendor>
     <upgrades id='http://openbsd.org/openbsd/4.5'/>
@@ -147,7 +147,7 @@
     <short-id>openbsd4.9</short-id>
     <name>OpenBSD 4.9</name>
     <version>4.9</version>
-    <family>OpenBSD</family>
+    <family>openbsd</family>
     <distro>openbsd</distro>
     <vendor>OpenBSD Project</vendor>
     <upgrades id='http://openbsd.org/openbsd/4.8'/>
@@ -181,7 +181,7 @@
     <short-id>openbsd5.0</short-id>
     <name>OpenBSD 5.0</name>
     <version>5.0</version>
-    <family>OpenBSD</family>
+    <family>openbsd</family>
     <distro>openbsd</distro>
     <vendor>OpenBSD Project</vendor>
     <upgrades id='http://openbsd.org/openbsd/4.9'/>
diff --git a/data/oses/opensuse.xml b/data/oses/opensuse.xml
index 9bf5be8..52d8882 100644
--- a/data/oses/opensuse.xml
+++ b/data/oses/opensuse.xml
@@ -5,7 +5,7 @@
     <name>openSUSE 10.2</name>
     <version>10.2</version>
     <vendor>openSUSE</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>opensuse</distro>
   </os>
 
@@ -14,7 +14,7 @@
     <name>openSUSE 10.3</name>
     <version>10.3</version>
     <vendor>openSUSE</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/linux/10.2"; />
     <derives-from id="http://opensuse.org/linux/10.2"; />
@@ -25,7 +25,7 @@
     <name>openSUSE 11.0</name>
     <version>11.0</version>
     <vendor>openSUSE</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/linux/10.3"; />
     <derives-from id="http://opensuse.org/linux/10.3"; />
@@ -36,7 +36,7 @@
     <name>openSUSE 11.1</name>
     <version>11.1</version>
     <vendor>openSUSE</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/linux/11.0"; />
     <derives-from id="http://opensuse.org/linux/11.0"; />
@@ -47,7 +47,7 @@
     <name>openSUSE 11.2</name>
     <version>11.2</version>
     <vendor>openSUSE</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/linux/11.1"; />
     <derives-from id="http://opensuse.org/linux/11.1"; />
@@ -58,7 +58,7 @@
     <name>openSUSE 11.3</name>
     <version>11.3</version>
     <vendor>openSUSE</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/linux/11.2"; />
     <derives-from id="http://opensuse.org/linux/11.2"; />
@@ -124,7 +124,7 @@
     <name>openSUSE 11.4</name>
     <version>11.4</version>
     <vendor>openSUSE</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/linux/11.3"; />
     <derives-from id="http://opensuse.org/linux/11.3"; />
@@ -182,7 +182,7 @@
     <name>openSUSE 12.1</name>
     <version>12.1</version>
     <vendor>openSUSE</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>opensuse</distro>
     <upgrades id="http://opensuse.org/linux/11.4"; />
     <derives-from id="http://opensuse.org/linux/11.4"; />
diff --git a/data/oses/others.xml b/data/oses/others.xml
deleted file mode 100644
index 698e1f9..0000000
--- a/data/oses/others.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://microsoft.com/msdos";>
-    <short-id>msdos</short-id>
-    <name>Microsoft MS-DOS</name>
-    <vendor>Microsoft</vendor>
-    <family>Other</family>
-    <distro>msdos</distro>
-  </os>
-
-  <os id="http://novell.com/netware4";>
-    <short-id>netware4</short-id>
-    <name>Novell Netware 4</name>
-    <vendor>Novell</vendor>
-    <family>Other</family>
-    <distro>netware</distro>
-  </os>
-
-  <os id="http://novell.com/netware5";>
-    <short-id>netware5</short-id>
-    <name>Novell Netware 5</name>
-    <vendor>Novell</vendor>
-    <family>Other</family>
-    <distro>netware</distro>
-  </os>
-
-  <os id="http://novell.com/netware6";>
-    <short-id>netware6</short-id>
-    <name>Novell Netware 6</name>
-    <vendor>Novell</vendor>
-    <family>Other</family>
-    <distro>netware</distro>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/rhel.xml b/data/oses/rhel.xml
index 7715a64..f03c152 100644
--- a/data/oses/rhel.xml
+++ b/data/oses/rhel.xml
@@ -7,7 +7,7 @@
     <name>Red Hat Enterprise Linux 2.1</name>
     <version>2.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
 
@@ -20,7 +20,7 @@
     <name>Red Hat Enterprise Linux 2.1 Update 1</name>
     <version>2.1.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
     <upgrades id="http://redhat.com/rhel/2.1"/>
@@ -35,7 +35,7 @@
     <name>Red Hat Enterprise Linux 2.1 Update 2</name>
     <version>2.1.2</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
     <upgrades id="http://redhat.com/rhel/2.1/u1"/>
@@ -50,7 +50,7 @@
     <name>Red Hat Enterprise Linux 2.1 Update 3</name>
     <version>2.1.3</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
     <upgrades id="http://redhat.com/rhel/2.1/u2"/>
@@ -65,7 +65,7 @@
     <name>Red Hat Enterprise Linux 2.1 Update 4</name>
     <version>2.1.4</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
     <upgrades id="http://redhat.com/rhel/2.1/u3"/>
@@ -80,7 +80,7 @@
     <name>Red Hat Enterprise Linux 2.1 Update 5</name>
     <version>2.1.5</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
     <upgrades id="http://redhat.com/rhel/2.1/u4"/>
@@ -95,7 +95,7 @@
     <name>Red Hat Enterprise Linux 2.1 Update 6</name>
     <version>2.1.6</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
     <upgrades id="http://redhat.com/rhel/2.1/u5"/>
@@ -110,7 +110,7 @@
     <name>Red Hat Enterprise Linux 2.1 Update 7</name>
     <version>2.1.7</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Pensacola</codename>
     <upgrades id="http://redhat.com/rhel/2.1/u6"/>
@@ -129,7 +129,7 @@
     <name>Red Hat Enterprise Linux 3</name>
     <version>3</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -142,7 +142,7 @@
     <name>Red Hat Enterprise Linux 3 Update 1</name>
     <version>3.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -157,7 +157,7 @@
     <name>Red Hat Enterprise Linux 3 Update 2</name>
     <version>3.2</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -172,7 +172,7 @@
     <name>Red Hat Enterprise Linux 3 Update 3</name>
     <version>3.3</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -187,7 +187,7 @@
     <name>Red Hat Enterprise Linux 3 Update 4</name>
     <version>3.4</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -202,7 +202,7 @@
     <name>Red Hat Enterprise Linux 3 Update 5</name>
     <version>3.5</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -217,7 +217,7 @@
     <name>Red Hat Enterprise Linux 3 Update 6</name>
     <version>3.6</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -232,7 +232,7 @@
     <name>Red Hat Enterprise Linux 3 Update 7</name>
     <version>3.7</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -247,7 +247,7 @@
     <name>Red Hat Enterprise Linux 3 Update 8</name>
     <version>3.8</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -262,7 +262,7 @@
     <name>Red Hat Enterprise Linux 3 Update 9</name>
     <version>3.9</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Taroon</codename>
 
@@ -281,7 +281,7 @@
     <name>Red Hat Enterprise Linux 4.0</name>
     <version>4.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
 
@@ -294,7 +294,7 @@
     <name>Red Hat Enterprise Linux 4.1</name>
     <version>4.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
     <upgrades id="http://redhat.com/rhel/4.0"/>
@@ -309,7 +309,7 @@
     <name>Red Hat Enterprise Linux 4.2</name>
     <version>4.2</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
     <upgrades id="http://redhat.com/rhel/4.1"/>
@@ -324,7 +324,7 @@
     <name>Red Hat Enterprise Linux 4.3</name>
     <version>4.3</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
     <upgrades id="http://redhat.com/rhel/4.2"/>
@@ -339,7 +339,7 @@
     <name>Red Hat Enterprise Linux 4.4</name>
     <version>4.4</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
     <upgrades id="http://redhat.com/rhel/4.3"/>
@@ -354,7 +354,7 @@
     <name>Red Hat Enterprise Linux 4.5</name>
     <version>4.5</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
     <upgrades id="http://redhat.com/rhel/4.4"/>
@@ -369,7 +369,7 @@
     <name>Red Hat Enterprise Linux 4.6</name>
     <version>4.6</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
     <upgrades id="http://redhat.com/rhel/4.5"/>
@@ -384,7 +384,7 @@
     <name>Red Hat Enterprise Linux 4.7</name>
     <version>4.7</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
     <upgrades id="http://redhat.com/rhel/4.6"/>
@@ -399,7 +399,7 @@
     <name>Red Hat Enterprise Linux 4.8</name>
     <version>4.8</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
     <upgrades id="http://redhat.com/rhel/4.7"/>
@@ -427,7 +427,7 @@
     <name>Red Hat Enterprise Linux 4.9</name>
     <version>4.9</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Nahant</codename>
     <upgrades id="http://redhat.com/rhel/4.8"/>
@@ -459,7 +459,7 @@
     <name>Red Hat Enterprise Linux 5.0</name>
     <version>5.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
 
@@ -473,7 +473,7 @@
     <name>Red Hat Enterprise Linux 5.1</name>
     <version>5.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
     <upgrades id="http://redhat.com/rhel/5.0"/>
@@ -488,7 +488,7 @@
     <name>Red Hat Enterprise Linux 5.2</name>
     <version>5.2</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
     <upgrades id="http://redhat.com/rhel/5.1"/>
@@ -503,7 +503,7 @@
     <name>Red Hat Enterprise Linux 5.3</name>
     <version>5.3</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
     <upgrades id="http://redhat.com/rhel/5.2"/>
@@ -518,7 +518,7 @@
     <name>Red Hat Enterprise Linux 5.4</name>
     <version>5.4</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
     <upgrades id="http://redhat.com/rhel/5.3"/>
@@ -546,7 +546,7 @@
     <name>Red Hat Enterprise Linux 5.5</name>
     <version>5.5</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
     <upgrades id="http://redhat.com/rhel/5.4"/>
@@ -561,7 +561,7 @@
     <name>Red Hat Enterprise Linux 5.6</name>
     <version>5.6</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
     <upgrades id="http://redhat.com/rhel/5.5"/>
@@ -594,7 +594,7 @@
     <name>Red Hat Enterprise Linux 5.7</name>
     <version>5.7</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
     <upgrades id="http://redhat.com/rhel/5.6"/>
@@ -622,7 +622,7 @@
     <name>Red Hat Enterprise Linux 5.8</name>
     <version>5.8</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Tikanga</codename>
     <upgrades id="http://redhat.com/rhel/5.8"/>
@@ -641,7 +641,7 @@
     <name>Red Hat Enterprise Linux 6.0</name>
     <version>6.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Santiago</codename>
 
@@ -673,7 +673,7 @@
     <name>Red Hat Enterprise Linux 6.1</name>
     <version>6.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Santiago</codename>
     <upgrades id="http://redhat.com/rhel/6.0"/>
@@ -701,7 +701,7 @@
     <name>Red Hat Enterprise Linux 6.2</name>
     <version>6.2</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhel</distro>
     <codename>Santiago</codename>
     <upgrades id="http://redhat.com/rhel/6.1"/>
diff --git a/data/oses/rhl.xml b/data/oses/rhl.xml
index 13732a4..af531fd 100644
--- a/data/oses/rhl.xml
+++ b/data/oses/rhl.xml
@@ -5,7 +5,7 @@
     <name>Red Hat Linux 1.0</name>
     <version>1.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Mother's Day</codename>
 
@@ -17,7 +17,7 @@
     <name>Red Hat Linux 1.1</name>
     <version>1.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Mother's Day + 0.1</codename>
     <upgrades id="http://redhat.com/rhl/1.0"/>
@@ -31,7 +31,7 @@
     <name>Red Hat Linux 2.0</name>
     <version>2.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <upgrades id="http://redhat.com/rhl/1.1"/>
     <derives-from id="http://redhat.com/rhl/1.1"/>
@@ -44,7 +44,7 @@
     <name>Red Hat Linux 2.1</name>
     <version>2.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <upgrades id="http://redhat.com/rhl/2.0"/>
     <derives-from id="http://redhat.com/rhl/2.0"/>
@@ -57,7 +57,7 @@
     <name>Red Hat Linux 3.0.3</name>
     <version>3.0.3</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Picasso</codename>
     <upgrades id="http://redhat.com/rhl/2.1"/>
@@ -71,7 +71,7 @@
     <name>Red Hat Linux 4.0</name>
     <version>4.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Colgate</codename>
     <upgrades id="http://redhat.com/rhl/3.0.3"/>
@@ -85,7 +85,7 @@
     <name>Red Hat Linux 4.1</name>
     <version>4.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Vanderbilt</codename>
     <upgrades id="http://redhat.com/rhl/4.0"/>
@@ -99,7 +99,7 @@
     <name>Red Hat Linux 4.2</name>
     <version>4.2</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Biltmore</codename>
     <upgrades id="http://redhat.com/rhl/4.1"/>
@@ -113,7 +113,7 @@
     <name>Red Hat Linux 5.0</name>
     <version>5.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Hurricane</codename>
     <upgrades id="http://redhat.com/rhl/4.2"/>
@@ -127,7 +127,7 @@
     <name>Red Hat Linux 5.1</name>
     <version>5.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Manhattan</codename>
     <upgrades id="http://redhat.com/rhl/5.0"/>
@@ -141,7 +141,7 @@
     <name>Red Hat Linux 5.2</name>
     <version>5.2</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Apollo</codename>
     <upgrades id="http://redhat.com/rhl/5.1"/>
@@ -155,7 +155,7 @@
     <name>Red Hat Linux 6.0</name>
     <version>6.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Hedwig</codename>
     <upgrades id="http://redhat.com/rhl/5.1"/>
@@ -169,7 +169,7 @@
     <name>Red Hat Linux 6.1</name>
     <version>6.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Cartman</codename>
     <upgrades id="http://redhat.com/rhl/6.0"/>
@@ -183,7 +183,7 @@
     <name>Red Hat Linux 6.2</name>
     <version>6.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Zoot</codename>
     <upgrades id="http://redhat.com/rhl/6.1"/>
@@ -197,7 +197,7 @@
     <name>Red Hat Linux 7</name>
     <version>7</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Guinness</codename>
     <upgrades id="http://redhat.com/rhl/6.1"/>
@@ -211,7 +211,7 @@
     <name>Red Hat Linux 7.1</name>
     <version>7.1</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Seawolf</codename>
     <upgrades id="http://redhat.com/rhl/7"/>
@@ -226,7 +226,7 @@
     <name>Red Hat Linux 7.2</name>
     <version>7.2</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Enigma</codename>
     <upgrades id="http://redhat.com/rhl/7.1"/>
@@ -241,7 +241,7 @@
     <name>Red Hat Linux 7.3</name>
     <version>7.3</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Valhalla</codename>
     <upgrades id="http://redhat.com/rhl/7.2"/>
@@ -256,7 +256,7 @@
     <name>Red Hat Linux 8.0</name>
     <version>8.0</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Psyche</codename>
     <upgrades id="http://redhat.com/rhl/7.3"/>
@@ -271,7 +271,7 @@
     <name>Red Hat Linux 9</name>
     <version>9</version>
     <vendor>Red Hat, Inc</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>rhl</distro>
     <codename>Shrike</codename>
     <upgrades id="http://redhat.com/rhl/8.0"/>
diff --git a/data/oses/solaris.xml b/data/oses/solaris.xml
index 6774feb..11e8a0e 100644
--- a/data/oses/solaris.xml
+++ b/data/oses/solaris.xml
@@ -5,7 +5,7 @@
     <name>Sun Solaris 9</name>
     <version>9</version>
     <vendor>Sun</vendor>
-    <family>Solaris</family>
+    <family>solaris</family>
     <distro>solaris</distro>
   </os>
 
@@ -14,7 +14,7 @@
     <name>Sun Solaris 10</name>
     <version>10</version>
     <vendor>Sun</vendor>
-    <family>Solaris</family>
+    <family>solaris</family>
     <distro>solaris</distro>
     <upgrades id="http://sun.com/solaris9"/>
 
@@ -28,7 +28,7 @@
     <name>Sun OpenSolaris</name>
     <version>2009.06</version>
     <vendor>Sun</vendor>
-    <family>Solaris</family>
+    <family>solaris</family>
     <distro>opensolaris</distro>
 
     <devices>
diff --git a/data/oses/suse.xml b/data/oses/suse.xml
index a4b788c..4062581 100644
--- a/data/oses/suse.xml
+++ b/data/oses/suse.xml
@@ -5,7 +5,7 @@
     <name>Suse Linux Enterprise Server 9</name>
     <version>9</version>
     <vendor>Novell</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>sles</distro>
   </os>
 
@@ -14,7 +14,7 @@
     <name>Suse Linux Enterprise Server 10</name>
     <version>10</version>
     <vendor>Novell</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>sles</distro>
     <upgrades id="http://suse.com/linux/sles9"/>
   </os>
@@ -24,7 +24,7 @@
     <name>Suse Linux Enterprise Server 11</name>
     <version>11</version>
     <vendor>Novell</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>sles</distro>
     <upgrades id="http://suse.com/linux/sles10"/>
 
@@ -39,7 +39,7 @@
     <name>Suse Linux Enterprise Desktop 9</name>
     <version>9</version>
     <vendor>Novell</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>sled</distro>
   </os>
 
@@ -48,7 +48,7 @@
     <name>Suse Linux Enterprise Desktop 10</name>
     <version>10</version>
     <vendor>Novell</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>sled</distro>
     <upgrades id="http://suse.com/linux/sled9"/>
 
@@ -69,7 +69,7 @@
     <name>Suse Linux Enterprise Desktop 11</name>
     <version>11</version>
     <vendor>Novell</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>sled</distro>
     <upgrades id="http://suse.com/linux/sled10"/>
 
diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml
index 0934b01..1eb6540 100644
--- a/data/oses/ubuntu.xml
+++ b/data/oses/ubuntu.xml
@@ -5,7 +5,7 @@
     <name>Ubuntu Warty Warthog</name>
     <version>4.10</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Warty Warthog</codename>
 
@@ -47,7 +47,7 @@
     <name>Ubuntu Hoary Hedgehog</name>
     <version>5.04</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Hoary Hedgehog</codename>
     <upgrades id="http://ubuntu.com/warty"/>
@@ -119,7 +119,7 @@
     <name>Ubuntu Breezy Badger</name>
     <version>5.10</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Breezy Badger</codename>
     <upgrades id="http://ubuntu.com/hoary"/>
@@ -219,7 +219,7 @@
     <name>Ubuntu Dapper Drake LTS</name>
     <version>6.06</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Dapper Drake</codename>
     <upgrades id="http://ubuntu.com/breezy"/>
@@ -346,7 +346,7 @@
     <name>Ubuntu Edgy Eft</name>
     <version>6.10</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Edgy Eft</codename>
     <upgrades id="http://ubuntu.com/dapper"/>
@@ -426,7 +426,7 @@
     <name>Ubuntu Feisty Fawn</name>
     <version>7.04</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Feisty Fawn</codename>
     <upgrades id="http://ubuntu.com/edgy"/>
@@ -488,7 +488,7 @@
     <name>Ubuntu Gutsy Gibbon</name>
     <version>7.10</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Gutsy Gibbon</codename>
     <upgrades id="http://ubuntu.com/feisty"/>
@@ -550,7 +550,7 @@
     <name>Ubuntu Hardy Heron LTS</name>
     <version>8.04</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Hardy Heron</codename>
     <upgrades id="http://ubuntu.com/gutsy"/>
@@ -625,7 +625,7 @@
     <name>Ubuntu Intrepid Ibex</name>
     <version>8.10</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Intrepid Ibex</codename>
     <upgrades id="http://ubuntu.com/hardy"/>
@@ -678,7 +678,7 @@
     <name>Ubuntu Jaunty Jackalope</name>
     <version>9.04</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Jaunty Jackalope</codename>
     <upgrades id="http://ubuntu.com/intrepid"/>
@@ -735,7 +735,7 @@
     <name>Ubuntu Karmic Koala</name>
     <version>9.10</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Karmic Koala</codename>
     <upgrades id="http://ubuntu.com/jaunty"/>
@@ -788,7 +788,7 @@
     <name>Ubuntu Lucid Lynx LTS</name>
     <version>10.04</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Lucid Lynx</codename>
     <upgrades id="http://ubuntu.com/karmic"/>
@@ -834,7 +834,7 @@
     <name>Ubuntu Maverick Meerkat</name>
     <version>10.10</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Maverick Meerkat</codename>
     <upgrades id="http://ubuntu.com/lucid"/>
@@ -900,7 +900,7 @@
     <name>Ubuntu Natty Narwhal</name>
     <version>11.04</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Natty Narwhal</codename>
     <upgrades id="http://ubuntu.com/maverick"/>
@@ -966,7 +966,7 @@
     <name>Ubuntu Oneiric Ocelot</name>
     <version>11.10</version>
     <vendor>Canonical Ltd</vendor>
-    <family>Linux</family>
+    <family>linux</family>
     <distro>ubuntu</distro>
     <codename>Oneiric Ocelot</codename>
     <upgrades id="http://ubuntu.com/natty"/>
diff --git a/data/oses/windows.xml b/data/oses/windows.xml
index 8e71ddf..521e531 100644
--- a/data/oses/windows.xml
+++ b/data/oses/windows.xml
@@ -4,7 +4,7 @@
     <short-id>windows</short-id>
     <name>Microsoft Windows</name>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>win9x</family>
     <distro>windows</distro>
 
     <devices>
@@ -38,7 +38,7 @@
     <name>Microsoft Windows 98</name>
     <version>4.1</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>win9x</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
     <upgrades id="http://microsoft.com/win95"/>
@@ -62,7 +62,7 @@
     <name>Microsoft Windows Millennium Edition</name>
     <version>4.9</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>win9x</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
     <upgrades id="http://microsoft.com/win98"/>
@@ -87,7 +87,7 @@
     <name>Microsoft Windows 2000</name>
     <version>5.0</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>winnt</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
 
@@ -120,7 +120,7 @@
     <name>Microsoft Windows XP</name>
     <version>5.1</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>winnt</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
     <upgrades id="http://microsoft.com/win2k"/>
@@ -168,7 +168,7 @@
     <name>Microsoft Windows Server 2003</name>
     <version>5.2</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>winnt</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
 
@@ -225,7 +225,7 @@
     <name>Microsoft Windows Server 2003 R2</name>
     <version>5.2</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>winnt</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
     <upgrades id="http://microsoft.com/win2k3"/>
@@ -277,7 +277,7 @@
     <name>Microsoft Windows Server 2008</name>
     <version>6.0</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>winnt</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
     <upgrades id="http://microsoft.com/win2k3r2"/>
@@ -331,7 +331,7 @@
     <name>Microsoft Windows Server 2008 R2</name>
     <version>6.1</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>winnt</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
     <upgrades id="http://microsoft.com/win2k8"/>
@@ -370,7 +370,7 @@
     <name>Microsoft Windows Vista</name>
     <version>6.0</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>winnt</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
     <upgrades id="http://microsoft.com/winxp"/>
@@ -409,7 +409,7 @@
     <name>Microsoft Windows 7</name>
     <version>6.1</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>winnt</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
     <upgrades id="http://microsoft.com/vista"/>
@@ -455,7 +455,7 @@
     <name>Microsoft Windows 8</name>
     <version>6.2</version>
     <vendor>Microsoft Corporation</vendor>
-    <family>Windows</family>
+    <family>winnt</family>
     <distro>windows</distro>
     <derives-from id="http://microsoft.com/windows"/>
     <upgrades id="http://microsoft.com/win7"/>
-- 
1.7.7.6


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