Clean up plug-in naming and set plugin_name for all plugin classes

Clean up some plug-ins with non-conforming or undescriptive names,
set plugin_name in all base plug-in classes to avoid <dist><plug>
names appearing in reports and remove the obsolete amd plug-in.
Rename several plug-ins:

 - rhn   -> satellite (also spacewalk)
 - i18n  -> internationalization
 - qpidd -> qpid
 - ftp   -> vsftpd

Enforce pep8 style class names for all plug-in classes.

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

88 files changed, 290 insertions, 93 deletions

diff --git a/sos/plugins/abrt.py b/sos/plugins/abrt.py
index 9437c562..b1cdd1d6 100644
--- a/sos/plugins/abrt.py
+++ b/sos/plugins/abrt.py
@@ -21,6 +21,8 @@ class Abrt(Plugin, RedHatPlugin):
     """ABRT log dump
     """
 
+    plugin_name = "abrt"
+
     option_list = [("backtraces", 'collect backtraces for every report', 'slow', False)]
 
     def check_enabled(self):
diff --git a/sos/plugins/anaconda.py b/sos/plugins/anaconda.py
index dd5f9760..dcec7041 100644
--- a/sos/plugins/anaconda.py
+++ b/sos/plugins/anaconda.py
@@ -19,6 +19,8 @@ class Anaconda(Plugin, RedHatPlugin):
     """Anaconda / Installation information
     """
 
+    plugin_name = 'anaconda'
+
     files = ('/var/log/anaconda.log',
              '/var/log/anaconda')
 
diff --git a/sos/plugins/apparmor.py b/sos/plugins/apparmor.py
index 29ea02a9..afdad185 100644
--- a/sos/plugins/apparmor.py
+++ b/sos/plugins/apparmor.py
@@ -18,6 +18,9 @@ from sos.plugins import Plugin, UbuntuPlugin
 class Apparmor(Plugin, UbuntuPlugin):
     """Apparmor related information
     """
+
+    plugin_name = 'apparmor'
+
     def setup(self):
         self.add_copy_specs([
             "/etc/apparmor"
diff --git a/sos/plugins/apport.py b/sos/plugins/apport.py
index f565261d..e3a02efd 100644
--- a/sos/plugins/apport.py
+++ b/sos/plugins/apport.py
@@ -18,5 +18,8 @@ from sos.plugins import Plugin, DebianPlugin, UbuntuPlugin
 class Apport(Plugin, DebianPlugin, UbuntuPlugin):
     """apport information
     """
+
+    plugin_name = 'apport'
+
     def setup(self):
         self.add_copy_spec("/etc/apport/*")
diff --git a/sos/plugins/auditd.py b/sos/plugins/auditd.py
index f0eb8a5c..c031e14f 100644
--- a/sos/plugins/auditd.py
+++ b/sos/plugins/auditd.py
@@ -14,13 +14,15 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class auditd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Auditd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """Auditd related information
     """
 
     option_list = [("logsize", "maximum size (MiB) of logs to collect",
                     "", 15)]
 
+    plugin_name = 'auditd'
+
     def setup(self):
         self.add_copy_specs(["/etc/audit/auditd.conf",
                             "/etc/audit/audit.rules"])
diff --git a/sos/plugins/azure.py b/sos/plugins/azure.py
index ed27f8c8..65ba9ac1 100644
--- a/sos/plugins/azure.py
+++ b/sos/plugins/azure.py
@@ -16,9 +16,11 @@
 
 from sos.plugins import Plugin, UbuntuPlugin
 
-class azure(Plugin, UbuntuPlugin):
+class Azure(Plugin, UbuntuPlugin):
     """ Microsoft Azure Client Plugin
     """
+
+    plugin_name = 'azure'
     packages = ('walinuxagent',)
 
     def setup(self):
diff --git a/sos/plugins/block.py b/sos/plugins/block.py
index 270080a9..895492b0 100644
--- a/sos/plugins/block.py
+++ b/sos/plugins/block.py
@@ -19,6 +19,8 @@ class Block(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """Block device related information
     """
 
+    plugin_name = 'block'
+
     def setup(self):
         # legacy location for non-/run distributions
         self.add_copy_spec("/etc/blkid.tab")
diff --git a/sos/plugins/bootloader.py b/sos/plugins/bootloader.py
index 3b3d2124..79a6152f 100644
--- a/sos/plugins/bootloader.py
+++ b/sos/plugins/bootloader.py
@@ -17,6 +17,9 @@ from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin
 class Bootloader(Plugin, RedHatPlugin, UbuntuPlugin):
     """Bootloader information
     """
+
+    plugin_name = 'bootloader'
+
     def setup(self):
         self.add_copy_specs([
             "/etc/lilo.conf",
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
index fbcee784..3c145e42 100644
--- a/sos/plugins/ceph.py
+++ b/sos/plugins/ceph.py
@@ -17,6 +17,8 @@ from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin
 class Ceph(Plugin, RedHatPlugin, UbuntuPlugin):
     """information on CEPH
     """
+
+    plugin_name = 'ceph'
     option_list = [("log", "gathers all ceph logs", "slow", False)]
 
     packages = ('ceph',
diff --git a/sos/plugins/cloudforms.py b/sos/plugins/cloudforms.py
index 3a11cc42..1dc0eae3 100644
--- a/sos/plugins/cloudforms.py
+++ b/sos/plugins/cloudforms.py
@@ -20,6 +20,7 @@ class Cloudforms(Plugin, RedHatPlugin):
     """CloudForms related information
     """
 
+    plugin_name = 'cloudforms'
     packages = ["katello", "katello-common",
                     "katello-headpin", "aeoleus-conductor"]
     files = ["/usr/share/katello/script/katello-debug",
diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index e31a295b..9949804d 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -20,6 +20,7 @@ class Cluster(Plugin, RedHatPlugin):
     """cluster suite and GFS related information
     """
 
+    plugin_name = 'cluster'
     option_list = [("gfslockdump",
                     'gather output of gfs lockdumps', 'slow', False),
                     ('lockdump', 'gather dlm lockdumps', 'slow', False)]
diff --git a/sos/plugins/crontab.py b/sos/plugins/crontab.py
index bcbb315d..cde73f12 100644
--- a/sos/plugins/crontab.py
+++ b/sos/plugins/crontab.py
@@ -14,7 +14,7 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class crontab(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Crontab(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """Crontab information
     """
 
diff --git a/sos/plugins/cs.py b/sos/plugins/cs.py
index e594ac2d..3adf1f65 100644
--- a/sos/plugins/cs.py
+++ b/sos/plugins/cs.py
@@ -20,10 +20,12 @@ from sos.plugins import Plugin, RedHatPlugin
 from os.path import exists
 from glob import glob
 
-class cs(Plugin, RedHatPlugin):
+class CertificateSystem(Plugin, RedHatPlugin):
     """Red Hat Certificate System 7.1, 7.3, 8.0 and dogtag related information
     """
 
+    plugin_name = 'certificatesystem'
+
     def checkversion(self):
         if self.is_installed("redhat-cs") or exists("/opt/redhat-cs"):
             return 71
diff --git a/sos/plugins/devicemapper.py b/sos/plugins/devicemapper.py
index 6e2b1a52..9e553c21 100644
--- a/sos/plugins/devicemapper.py
+++ b/sos/plugins/devicemapper.py
@@ -19,6 +19,8 @@ class DeviceMapper(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """device-mapper related information
     """
 
+    plugin_name = 'devicemapper'
+
     def setup(self):
         self.add_cmd_output("dmsetup info -c")
         self.add_cmd_output("dmsetup table")
diff --git a/sos/plugins/dmraid.py b/sos/plugins/dmraid.py
index 6c99d746..12242bf6 100644
--- a/sos/plugins/dmraid.py
+++ b/sos/plugins/dmraid.py
@@ -15,10 +15,11 @@
 import os
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class DmRaid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Dmraid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """dmraid related information
     """
 
+    plugin_name = 'dmraid'
     dmraid_options = ['V','b','r','s','tay','rD']
 
     def setup(self):
diff --git a/sos/plugins/dpkg.py b/sos/plugins/dpkg.py
index a3b55a60..1912e345 100644
--- a/sos/plugins/dpkg.py
+++ b/sos/plugins/dpkg.py
@@ -15,9 +15,12 @@
 
 from sos.plugins import Plugin, DebianPlugin, UbuntuPlugin
 
-class dpkg(Plugin, DebianPlugin, UbuntuPlugin):
+class Dpkg(Plugin, DebianPlugin, UbuntuPlugin):
     """dpkg information
     """
+
+    plugin_name = 'dpkg'
+
     def setup(self):
         self.add_copy_spec("/var/log/dpkg.log")
         self.add_cmd_output("dpkg -l", root_symlink = "installed-debs")
diff --git a/sos/plugins/ds.py b/sos/plugins/ds.py
index 46a0730b..1bbcd64c 100644
--- a/sos/plugins/ds.py
+++ b/sos/plugins/ds.py
@@ -17,10 +17,12 @@
 from sos.plugins import Plugin, RedHatPlugin
 import os
 
-class ds(Plugin, RedHatPlugin):
+class DirectoryServer(Plugin, RedHatPlugin):
     """Directory Server information
     """
 
+    plugin_name = 'directoryserver'
+
     files = ('/etc/dirsrv', '/opt/redhat-ds')
     packages = ('redhat-ds-base', 'redhat-ds-7')
 
diff --git a/sos/plugins/emc.py b/sos/plugins/emc.py
index 7646ea2c..89d0734e 100644
--- a/sos/plugins/emc.py
+++ b/sos/plugins/emc.py
@@ -18,10 +18,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, os
 
-class emc(Plugin, RedHatPlugin):
+class Emc(Plugin, RedHatPlugin):
     """EMC related information (PowerPath, Solutions Enabler CLI and Navisphere CLI)
     """
 
+    plugin_name = 'emc'
+
     def about_emc(self):
         """ EMC Corporation specific information
         """
diff --git a/sos/plugins/filesys.py b/sos/plugins/filesys.py
index e5d63dfa..759ccb2e 100644
--- a/sos/plugins/filesys.py
+++ b/sos/plugins/filesys.py
@@ -17,9 +17,12 @@ import os
 import re
 from itertools import *
 
-class filesys(Plugin, RedHatPlugin, UbuntuPlugin):
+class Filesys(Plugin, RedHatPlugin, UbuntuPlugin):
     """information on filesystems
     """
+
+    plugin_name = 'filesys'
+
     option_list = [("lsof", 'gathers information on all open files', 'slow', False)]
     option_list = [("dumpe2fs", 'dump filesystem information', 'slow', False)]
 
diff --git a/sos/plugins/gdm.py b/sos/plugins/gdm.py
index 45c80f02..05601f3e 100644
--- a/sos/plugins/gdm.py
+++ b/sos/plugins/gdm.py
@@ -14,8 +14,11 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class gdm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Gdm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """gdm related information
     """
+
+    plugin_name = 'gdm'
+
     def setup(self):
         self.add_copy_spec("/etc/gdm/*")
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
index b5670993..a535d797 100644
--- a/sos/plugins/gluster.py
+++ b/sos/plugins/gluster.py
@@ -18,9 +18,11 @@ import os
 import string
 from sos.plugins import Plugin, RedHatPlugin
 
-class gluster(Plugin, RedHatPlugin):
+class Gluster(Plugin, RedHatPlugin):
     '''gluster related information'''
 
+    plugin_name = 'gluster'
+
     statedump_dir = '/tmp/glusterfs-statedumps'
     packages = ["glusterfs", "glusterfs-core"]
     files = ["/etc/glusterd", "/var/lib/glusterd"]
diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index 11b0a2c4..244dbba7 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin
 from glob import glob
 import os
 
-class hardware(Plugin):
+class Hardware(Plugin):
     """hardware related information
     """
 
@@ -70,7 +70,7 @@ class hardware(Plugin):
         self.add_cmd_output("systool -c fc_host -v")
         self.add_cmd_output("systool -c scsi_host -v")
 
-class RedHatHardware(hardware, RedHatPlugin):
+class RedHatHardware(Hardware, RedHatPlugin):
     """hardware related information for Red Hat distribution
     """
 
@@ -82,7 +82,7 @@ class RedHatHardware(hardware, RedHatPlugin):
         self.add_cmd_output("python " + hwpaths[0])
 
 
-class DebianHardware(hardware, DebianPlugin, UbuntuPlugin):
+class DebianHardware(Hardware, DebianPlugin, UbuntuPlugin):
     """hardware related information for Debian distribution
     """
 
diff --git a/sos/plugins/hts.py b/sos/plugins/hts.py
index 689f7be2..d514bf8d 100644
--- a/sos/plugins/hts.py
+++ b/sos/plugins/hts.py
@@ -14,9 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class hts(Plugin, RedHatPlugin):
+class HardwareTestSuite(Plugin, RedHatPlugin):
     """Red Hat Hardware Test Suite related information
     """
+
+    plugin_name = 'hardwaretestsuite'
+
     def setup(self):
         self.add_copy_spec("/etc/httpd/conf.d/hts.conf")
         self.add_copy_spec("/var/hts")
diff --git a/sos/plugins/infiniband.py b/sos/plugins/infiniband.py
index dcb8e44f..e1288c9f 100644
--- a/sos/plugins/infiniband.py
+++ b/sos/plugins/infiniband.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """Infiniband related information
     """
 
+    plugin_name = 'infiniband'
+
     def check_enabled(self):
          if self.commons["policy"].pkg_by_name("libibverbs-utils"):
              return True
diff --git a/sos/plugins/initrd.py b/sos/plugins/initrd.py
index 69cffb9b..db40999c 100644
--- a/sos/plugins/initrd.py
+++ b/sos/plugins/initrd.py
@@ -15,9 +15,12 @@
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 from glob import glob
 
-class initrd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Initrd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """initrd related information
     """
+
+    plugin_name = 'initrd'
+
     def setup(self):
         for initrd in glob('/boot/initrd-*.img'):
             self.add_cmd_output("zcat "+initrd+" | cpio "+
diff --git a/sos/plugins/i18n.py b/sos/plugins/internationalization.py
index 891e71bd..4ffaa4e4 100644
--- a/sos/plugins/i18n.py
+++ b/sos/plugins/internationalization.py
@@ -14,9 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class i18n(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Internationalization(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """i18n related information
     """
+
+    plugin_name = 'internationalization'
+
     def setup(self):
         self.add_copy_specs(["/etc/X11/xinit/xinput.d/*", "/etc/locale.conf"])
         self.add_cmd_output("locale")
diff --git a/sos/plugins/ipa.py b/sos/plugins/ipa.py
index 3bbf71cd..3244f34d 100644
--- a/sos/plugins/ipa.py
+++ b/sos/plugins/ipa.py
@@ -20,6 +20,8 @@ class Ipa(Plugin, RedHatPlugin):
     """IPA diagnostic information
     """
 
+    plugin_name = 'ipa'
+
     ipa_server = False
     ipa_client = False
 
diff --git a/sos/plugins/ipsec.py b/sos/plugins/ipsec.py
index 4cfba6c0..1f00d51c 100644
--- a/sos/plugins/ipsec.py
+++ b/sos/plugins/ipsec.py
@@ -16,14 +16,14 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class ipsec(Plugin):
+class IPSec(Plugin):
     """ipsec related information
     """
 
     plugin_name = "ipsec"
     packages = ('ipsec-tools',)
 
-class RedHatIpsec(ipsec, RedHatPlugin):
+class RedHatIpsec(IPSec, RedHatPlugin):
     """ipsec related information for Red Hat distributions
     """
 
@@ -32,7 +32,7 @@ class RedHatIpsec(ipsec, RedHatPlugin):
     def setup(self):
         self.add_copy_spec("/etc/racoon")
 
-class DebianIpsec(ipsec, DebianPlugin, UbuntuPlugin):
+class DebianIPSec(IPSec, DebianPlugin, UbuntuPlugin):
     """ipsec related information for Debian distributions
     """
 
diff --git a/sos/plugins/iscsitarget.py b/sos/plugins/iscsitarget.py
index 1657e6cb..a3a3e7ee 100644
--- a/sos/plugins/iscsitarget.py
+++ b/sos/plugins/iscsitarget.py
@@ -17,13 +17,13 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class Iscsitarget(Plugin):
+class IscsiTarget(Plugin):
     """iscsi-target related information
     """
 
     plugin_name = "iscsitarget"
 
-class RedHatIscsiTarget(Iscsitarget, RedHatPlugin):
+class RedHatIscsiTarget(IscsiTarget, RedHatPlugin):
     """iscsi-target related information for Red Hat distributions
     """
 
@@ -34,7 +34,7 @@ class RedHatIscsiTarget(Iscsitarget, RedHatPlugin):
         self.add_copy_spec("/etc/tgt/targets.conf")
         self.add_cmd_output("tgtadm --lld iscsi --op show --mode target")
 
-class DebianIscsiTarget(Iscsitarget, DebianPlugin, UbuntuPlugin):
+class DebianIscsiTarget(IscsiTarget, DebianPlugin, UbuntuPlugin):
     """iscsi-target related information for Debian based distributions
     """
 
diff --git a/sos/plugins/juju.py b/sos/plugins/juju.py
index df79185e..64b4f1db 100644
--- a/sos/plugins/juju.py
+++ b/sos/plugins/juju.py
@@ -16,9 +16,12 @@
 
 from sos.plugins import Plugin, UbuntuPlugin
 
-class juju(Plugin, UbuntuPlugin):
+class Juju(Plugin, UbuntuPlugin):
     """ Juju Plugin
     """
+
+    plugin_name = 'juju'
+
     def setup(self):
         self.add_copy_specs(["/var/log/juju",
                            "/var/lib/juju"])
diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index ebe17ede..73e5d5e3 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -14,7 +14,7 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class kdump(Plugin):
+class KDump(Plugin):
     """Kdump related information
     """
 
@@ -25,7 +25,7 @@ class kdump(Plugin):
             "/proc/cmdline"
             ])
 
-class RedHatKdump(kdump, RedHatPlugin):
+class RedHatKDump(KDump, RedHatPlugin):
     """Kdump related information for Red Hat distributions
     """
 
@@ -37,7 +37,7 @@ class RedHatKdump(kdump, RedHatPlugin):
             "/etc/kdump.conf",
             "/etc/udev/rules.d/*kexec.rules"])
 
-class DebianKdump(kdump, DebianPlugin, UbuntuPlugin):
+class DebianKDump(KDump, DebianPlugin, UbuntuPlugin):
     """Kdump related information for Debian distributions
     """
 
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
index de25e8b6..2a0d2f12 100644
--- a/sos/plugins/kernel.py
+++ b/sos/plugins/kernel.py
@@ -15,10 +15,12 @@
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 import os
 
-class kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """kernel related information
     """
 
+    plugin_name = 'kernel'
+
     sys_module = '/sys/module'
 
     def setup(self):
diff --git a/sos/plugins/kernelrt.py b/sos/plugins/kernelrt.py
index 7d7daa16..b5fdc5d9 100644
--- a/sos/plugins/kernelrt.py
+++ b/sos/plugins/kernelrt.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class kernel_rt(Plugin, RedHatPlugin):
+class KernelRT(Plugin, RedHatPlugin):
     '''Information specific to the realtime kernel
     '''
 
+    plugin_name = 'kernelrt'
+
     # this file exists only when the realtime kernel is booted
     # this plugin will not be called is this file does not exist
     files = ('/sys/kernel/realtime',)
diff --git a/sos/plugins/kvm.py b/sos/plugins/kvm.py
index e94ac0a1..608353ad 100644
--- a/sos/plugins/kvm.py
+++ b/sos/plugins/kvm.py
@@ -18,10 +18,12 @@
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 import os
 
-class kvm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Kvm(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """KVM related information
     """
 
+    plugin_name = 'kvm'
+
     option_list = [("topOutput", '5x iterations of top data', 'slow', False)]
 
     def check_enabled(self):
diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py
index 9861281f..4096039c 100644
--- a/sos/plugins/landscape.py
+++ b/sos/plugins/landscape.py
@@ -19,6 +19,8 @@ class Landscape(Plugin, UbuntuPlugin):
     landscape client related information
     """
 
+    plugin_name = 'landscape'
+
     files = ('/etc/landscape/client.conf',
             'broker.log',
             'broker.log.gz',
diff --git a/sos/plugins/libraries.py b/sos/plugins/libraries.py
index 222df5a4..1ab5f173 100644
--- a/sos/plugins/libraries.py
+++ b/sos/plugins/libraries.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin
 
-class libraries(Plugin, RedHatPlugin, UbuntuPlugin):
+class Libraries(Plugin, RedHatPlugin, UbuntuPlugin):
     """information on shared libraries
     """
 
+    plugin_name = 'libraries'
+
     option_list = [('ldconfigv', 'the name of each directory as it is scanned, and any links that are created.',
                     "slow", False)]
 
diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py
index 6e2930a0..e525f1b2 100644
--- a/sos/plugins/libvirt.py
+++ b/sos/plugins/libvirt.py
@@ -15,9 +15,12 @@
 from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin
 import glob
 
-class libvirt(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
+class Libvirt(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
     """libvirt-related information
     """
+
+    plugin_name = 'libvirt'
+
     def setup(self):
         self.add_copy_specs(["/etc/libvirt/", "/var/log/libvirt*"])
 
diff --git a/sos/plugins/logrotate.py b/sos/plugins/logrotate.py
index 960e4b7e..c4b1fc58 100644
--- a/sos/plugins/logrotate.py
+++ b/sos/plugins/logrotate.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class logrotate(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class LogRotate(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """logrotate configuration files and debug info
     """
 
+    plugin_name = 'logrotate'
+
     def setup(self):
         self.add_cmd_output("logrotate --debug /etc/logrotate.conf",
                               suggest_filename = "logrotate_debug")
diff --git a/sos/plugins/lsbrelease.py b/sos/plugins/lsbrelease.py
index e3e996e9..e364a179 100644
--- a/sos/plugins/lsbrelease.py
+++ b/sos/plugins/lsbrelease.py
@@ -16,10 +16,12 @@
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 import os
 
-class lsbrelease(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class LsbRelease(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """Linux Standard Base information
     """
 
+    plugin_name = 'lsbrelease'
+
     def setup(self):
         self.add_cmd_output("lsb_release -a")
         self.add_cmd_output("lsb_release -d", suggest_filename = "lsb_release", root_symlink = "lsb-release")
diff --git a/sos/plugins/lvm2.py b/sos/plugins/lvm2.py
index f34cd5fb..8fb1843b 100644
--- a/sos/plugins/lvm2.py
+++ b/sos/plugins/lvm2.py
@@ -19,6 +19,8 @@ class Lvm2(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """lvm2 related information 
     """
 
+    plugin_name = 'lvm2'
+
     option_list = [("lvmdump", 'collect an lvmdump tarball', 'fast', False),
                   ("lvmdump-a", 'use the -a option of lvmdump (implies the ' \
                     + '"lvmdump" option)', 'slow', False)]
diff --git a/sos/plugins/maas.py b/sos/plugins/maas.py
index 0ef61384..d40a5699 100644
--- a/sos/plugins/maas.py
+++ b/sos/plugins/maas.py
@@ -16,9 +16,12 @@
 
 from sos.plugins import Plugin, UbuntuPlugin
 
-class maas(Plugin, UbuntuPlugin):
+class Maas(Plugin, UbuntuPlugin):
     """ MAAS Plugin
     """
+
+    plugin_name = 'maas'
+
     def setup(self):
         self.add_copy_specs(["/etc/squid-deb-proxy",
                            "/etc/maas",
diff --git a/sos/plugins/md.py b/sos/plugins/md.py
index 752a52a1..ecba0f72 100644
--- a/sos/plugins/md.py
+++ b/sos/plugins/md.py
@@ -19,6 +19,8 @@ class Md(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """MD subsystem information
     """
 
+    plugin_name = 'md'
+
     def setup(self):
         self.add_cmd_output("mdadm -D /dev/md*")
         self.add_copy_specs([
diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py
index 088b79b2..0b26a84a 100644
--- a/sos/plugins/memory.py
+++ b/sos/plugins/memory.py
@@ -14,9 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """memory usage information
     """
+
+    plugin_name = 'memory'
+
     def setup(self):
         self.add_copy_specs([
             "/proc/pci",
diff --git a/sos/plugins/mrggrid.py b/sos/plugins/mrggrid.py
index 2044985b..a8e7e357 100644
--- a/sos/plugins/mrggrid.py
+++ b/sos/plugins/mrggrid.py
@@ -14,9 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class mrggrid(Plugin, RedHatPlugin):
+class MrgGrid(Plugin, RedHatPlugin):
     """MRG GRID related information
     """
+
+    plugin_name = 'mrggrid'
+
     def setup(self):
         self.add_copy_spec("/etc/condor/condor_config")
         self.add_copy_spec("condor_status")
diff --git a/sos/plugins/mrgmessg.py b/sos/plugins/mrgmessg.py
index 0cdcb83c..4e85db6e 100644
--- a/sos/plugins/mrgmessg.py
+++ b/sos/plugins/mrgmessg.py
@@ -14,9 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class mrgmessg(Plugin, RedHatPlugin):
+class MrgMessg(Plugin, RedHatPlugin):
     """MRG Messaging related information
     """
+
+    plugin_name = 'mrgmessg'
+
     def setup(self):
         self.add_copy_specs([
             "/etc/qpidd.conf",
diff --git a/sos/plugins/multipath.py b/sos/plugins/multipath.py
index 3fa2c33b..79173526 100644
--- a/sos/plugins/multipath.py
+++ b/sos/plugins/multipath.py
@@ -19,6 +19,8 @@ class Multipath(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """device-mapper multipath information
     """
 
+    plugin_name = 'multipath'
+
     def setup(self):
         self.add_copy_specs([
             "/etc/multipath/",
diff --git a/sos/plugins/netdump.py b/sos/plugins/netdump.py
index 964e14e8..da4353be 100644
--- a/sos/plugins/netdump.py
+++ b/sos/plugins/netdump.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class netdump(Plugin, RedHatPlugin):
+class Netdump(Plugin, RedHatPlugin):
     """Netdump Configuration Information
     """
 
+    plugin_name = 'netdump'
+
     files = ('/etc/sysconfig/netdump',)
     packages = ('netdump',)
 
diff --git a/sos/plugins/nfsserver.py b/sos/plugins/nfsserver.py
index abe70e1d..4e87452d 100644
--- a/sos/plugins/nfsserver.py
+++ b/sos/plugins/nfsserver.py
@@ -18,9 +18,12 @@ from sos.plugins import Plugin, RedHatPlugin
 import os
 from stat import ST_SIZE
 
-class nfsserver(Plugin, RedHatPlugin):
+class NfsServer(Plugin, RedHatPlugin):
     """NFS server-related information
     """
+
+    plugin_name = 'nfsserver'
+
     def check_enabled(self):
        if self.policy().default_runlevel() in self.policy().runlevel_by_service("nfs"):
           return True
diff --git a/sos/plugins/nis.py b/sos/plugins/nis.py
index 8f98d325..5439b8fc 100644
--- a/sos/plugins/nis.py
+++ b/sos/plugins/nis.py
@@ -18,10 +18,12 @@
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 import os
 
-class nis(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Nis(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """NIS related information
     """
 
+    plugin_name = 'nis'
+
     files = ('/var/yp',)
 
     def setup(self):
diff --git a/sos/plugins/nscd.py b/sos/plugins/nscd.py
index 8139fac9..91a31ef1 100644
--- a/sos/plugins/nscd.py
+++ b/sos/plugins/nscd.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class nscd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Nscd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """NSCD related information
     """
 
+    plugin_name = 'nscd'
+
     option_list = [("nscdlogsize", "max size (MiB) to collect per nscd log file",
                    "", 50)]
 
diff --git a/sos/plugins/oddjob.py b/sos/plugins/oddjob.py
index 6d38e74a..473a6910 100644
--- a/sos/plugins/oddjob.py
+++ b/sos/plugins/oddjob.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class oddjob(Plugin, RedHatPlugin):
+class Oddjob(Plugin, RedHatPlugin):
     """oddjob related information
     """
 
+    plugin_name = 'oddjob'
+
     files = ('/etc/oddjobd.conf',)
     packages = ('oddjob',)
 
diff --git a/sos/plugins/openssl.py b/sos/plugins/openssl.py
index 81815adc..2ad44a2d 100644
--- a/sos/plugins/openssl.py
+++ b/sos/plugins/openssl.py
@@ -16,29 +16,29 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class openssl(Plugin):
+class OpenSSL(Plugin):
     """openssl related information
     """
 
     plugin_name = "openssl"
     packages = ('openssl',)
 
-class RedHatOpenssl(openssl, RedHatPlugin):
+class RedHatOpenSSL(OpenSSL, RedHatPlugin):
     """openssl related information for Red Hat distributions
     """
 
     files = ('/etc/pki/tls/openssl.cnf',)
 
     def setup(self):
-        super(RedHatOpenssl, self).setup()
+        super(RedHatOpenSSL, self).setup()
         self.add_copy_spec("/etc/pki/tls/openssl.cnf")
 
-class DebianOpenssl(openssl, DebianPlugin, UbuntuPlugin):
+class DebianOpenSSL(OpenSSL, DebianPlugin, UbuntuPlugin):
     """openssl related information for Debian distributions
     """
 
     files = ('/etc/ssl/openssl.cnf',)
 
     def setup(self):
-        super(DebianOpenssl, self).setup()
+        super(DebianOpenSSL, self).setup()
         self.add_copy_spec("/etc/ssl/openssl.cnf")
diff --git a/sos/plugins/openstack.py b/sos/plugins/openstack.py
index 48355792..8c521365 100644
--- a/sos/plugins/openstack.py
+++ b/sos/plugins/openstack.py
@@ -20,7 +20,7 @@ import os
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
 
-class openstack(Plugin):
+class OpenStack(Plugin):
     """openstack related information
     """
     plugin_name = "openstack"
@@ -28,7 +28,7 @@ class openstack(Plugin):
     option_list = [("log", "gathers all openstack logs", "slow", False)]
 
 
-class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin):
+class DebianOpenStack(OpenStack, DebianPlugin, UbuntuPlugin):
     """OpenStack related information for Debian based distributions
     """
 
@@ -152,7 +152,7 @@ class DebianOpenStack(openstack, DebianPlugin, UbuntuPlugin):
                            "/var/log/quantum/"])
 
 
-class RedHatOpenStack(openstack, RedHatPlugin):
+class RedHatOpenStack(OpenStack, RedHatPlugin):
     """OpenStack related information for Red Hat distributions
     """
 
diff --git a/sos/plugins/openswan.py b/sos/plugins/openswan.py
index 2c4a1c01..1354e174 100644
--- a/sos/plugins/openswan.py
+++ b/sos/plugins/openswan.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class openswan(Plugin, RedHatPlugin):
+class Openswan(Plugin, RedHatPlugin):
     """ipsec related information
     """
 
+    plugin_name = 'openswan'
+
     files = ('/etc/ipsec.conf',)
     packages = ('openswan',)
 
diff --git a/sos/plugins/ppp.py b/sos/plugins/ppp.py
index 76e44046..6f0c5caf 100644
--- a/sos/plugins/ppp.py
+++ b/sos/plugins/ppp.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class ppp(Plugin, RedHatPlugin):
+class Ppp(Plugin, RedHatPlugin):
     """ppp, wvdial and rp-pppoe related information
     """
 
+    plugin_name = 'ppp'
+
     files = ('/etc/wvdial.conf',)
     packages = ('ppp',)
 
diff --git a/sos/plugins/printing.py b/sos/plugins/printing.py
index 45bea20a..0c3e29b8 100644
--- a/sos/plugins/printing.py
+++ b/sos/plugins/printing.py
@@ -14,9 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class printing(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Printing(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """printing related information (cups)
     """
+
+    plugin_name = 'printing'
+
     option_list = [("cups", "max size (MiB) to collect per cups log file",
                    "", 50)]
 
diff --git a/sos/plugins/process.py b/sos/plugins/process.py
index 3b06c7c4..02eaa587 100644
--- a/sos/plugins/process.py
+++ b/sos/plugins/process.py
@@ -18,6 +18,9 @@ import os
 class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """process information
     """
+
+    plugin_name = 'process'
+
     def setup(self):
         self.add_cmd_output("ps auxwww", root_symlink = "ps")
         self.add_cmd_output("ps auxwwwm")
diff --git a/sos/plugins/qpidd.py b/sos/plugins/qpid.py
index 8c3820d4..cee84435 100644
--- a/sos/plugins/qpidd.py
+++ b/sos/plugins/qpid.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class qpidd(Plugin, RedHatPlugin):
+class Qpid(Plugin, RedHatPlugin):
     """Messaging related information
     """
 
+    plugin_name = 'qpid'
+
     packages = ('qpidd', 'qpid-cpp-server', 'qpid-tools')
 
     def setup(self):
diff --git a/sos/plugins/quagga.py b/sos/plugins/quagga.py
index 703b4a54..909f9d49 100644
--- a/sos/plugins/quagga.py
+++ b/sos/plugins/quagga.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class quagga(Plugin, RedHatPlugin):
+class Quagga(Plugin, RedHatPlugin):
     """quagga related information
     """
 
+    plugin_name = 'quagga'
+
     files = ('/etc/quagga/zebra.conf',)
     packages = ('quagga',)
 
diff --git a/sos/plugins/radius.py b/sos/plugins/radius.py
index e814526e..427fd250 100644
--- a/sos/plugins/radius.py
+++ b/sos/plugins/radius.py
@@ -16,14 +16,14 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class radius(Plugin):
+class Radius(Plugin):
     """radius related information
     """
 
     plugin_name = "radius"
     packages = ('freeradius',)
 
-class RedHatRadius(radius, RedHatPlugin):
+class RedHatRadius(Radius, RedHatPlugin):
     """radius related information on Red Hat distributions
     """
 
@@ -36,7 +36,7 @@ class RedHatRadius(radius, RedHatPlugin):
     def postproc(self):
         self.do_file_sub("/etc/raddb/sql.conf", r"(\s*password\s*=\s*)\S+", r"\1***")
 
-class DebianRadius(radius, DebianPlugin, UbuntuPlugin):
+class DebianRadius(Radius, DebianPlugin, UbuntuPlugin):
     """radius related information on Debian distributions
     """
 
diff --git a/sos/plugins/rhevm.py b/sos/plugins/rhevm.py
index a9cd5f2d..39b32f46 100644
--- a/sos/plugins/rhevm.py
+++ b/sos/plugins/rhevm.py
@@ -1,8 +1,10 @@
 from sos.plugins import Plugin, RedHatPlugin
 
 # Class name must be the same as file name and method names must not change
-class rhevm(Plugin, RedHatPlugin):
-    """Nogah related information"""
+class RhevM(Plugin, RedHatPlugin):
+    """RHEV-Manager related information"""
+
+    plugin_name = 'rhevm'
 
     option_list = [("vdsmlogs",  'Directory containing all of the SOS logs from the RHEV hypervisor(s)', '', False)]
 
diff --git a/sos/plugins/rhui.py b/sos/plugins/rhui.py
index 78874098..69f3f22a 100644
--- a/sos/plugins/rhui.py
+++ b/sos/plugins/rhui.py
@@ -15,10 +15,12 @@
 from sos.plugins import Plugin, RedHatPlugin
 import os
 
-class rhui(Plugin, RedHatPlugin):
+class Rhui(Plugin, RedHatPlugin):
     """Red Hat Update Infrastructure for Cloud Providers data
     """
 
+    plugin_name = 'rhui'
+
     rhui_debug_path = "/usr/share/rh-rhua/rhui-debug.py"
 
     packages = [ "rh-rhui-tools" ]
diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py
index 02a0de69..9d44fde2 100644
--- a/sos/plugins/rpm.py
+++ b/sos/plugins/rpm.py
@@ -14,9 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class rpm(Plugin, RedHatPlugin):
+class Rpm(Plugin, RedHatPlugin):
     """RPM information
     """
+
+    plugin_name = 'rpm'
+
     option_list = [("rpmq", "queries for package information via rpm -q", "fast", True),
                   ("rpmva", "runs a verify on all packages", "slow", False)]
 
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py
index 82164a4d..7254649d 100644
--- a/sos/plugins/s390.py
+++ b/sos/plugins/s390.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class s390(Plugin, RedHatPlugin):
+class S390(Plugin, RedHatPlugin):
     """s390 related information
     """
 
+    plugin_name = 's390'
+
     ### Check for s390 arch goes here
 
     def check_enabled(self):
diff --git a/sos/plugins/sanlock.py b/sos/plugins/sanlock.py
index 5c5d48fa..67474af8 100644
--- a/sos/plugins/sanlock.py
+++ b/sos/plugins/sanlock.py
@@ -14,7 +14,7 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class sanlock(Plugin):
+class SANLock(Plugin):
     """sanlock-related information
     """
     plugin_name = "sanlock"
@@ -27,7 +27,7 @@ class sanlock(Plugin):
         self.add_cmd_output("sanlock client log_dump")
         return
 
-class RedHatSanlock(sanlock, RedHatPlugin):
+class RedHatSANLock(SANLock, RedHatPlugin):
 
     files = [ "/etc/sysconfig/sanlock" ]
 
diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py
index 4e6cf51c..c09055cb 100644
--- a/sos/plugins/sar.py
+++ b/sos/plugins/sar.py
@@ -19,6 +19,8 @@ class Sar(Plugin,):
     """ Collect system activity reporter data
     """
 
+    plugin_name = 'sar'
+
     packages = ('sysstat',)
     sa_path = '/var/log/sa'
 
diff --git a/sos/plugins/rhn.py b/sos/plugins/satellite.py
index 73e6c0e7..b2d3cde3 100644
--- a/sos/plugins/rhn.py
+++ b/sos/plugins/satellite.py
@@ -15,9 +15,11 @@
 from sos.plugins import Plugin, RedHatPlugin
 import os
 
-class rhn(Plugin, RedHatPlugin):
-    """RHN Satellite related information
+class Satellite(Plugin, RedHatPlugin):
+    """RHN Satellite and Spacewalk related information
     """
+
+    plugin_name = 'satellite'
     satellite = False
     proxy = False
 
diff --git a/sos/plugins/selinux.py b/sos/plugins/selinux.py
index d35010a7..699e5ff6 100644
--- a/sos/plugins/selinux.py
+++ b/sos/plugins/selinux.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class selinux(Plugin, RedHatPlugin):
+class SELinux(Plugin, RedHatPlugin):
     """selinux related information
     """
 
+    plugin_name = 'selinux'
+
     option_list = [("fixfiles", 'Print incorrect file context labels', 'slow', False)]
     packages = ('libselinux',)
 
diff --git a/sos/plugins/smartcard.py b/sos/plugins/smartcard.py
index 969aa611..207f07af 100644
--- a/sos/plugins/smartcard.py
+++ b/sos/plugins/smartcard.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class smartcard(Plugin, RedHatPlugin):
+class Smartcard(Plugin, RedHatPlugin):
     """Smart Card related information
     """
 
+    plugin_name = 'smartcard'
+
     files = ('/etc/pam_pkcs11/pam_pkcs11.conf',)
     packages = ('pam_pkcs11',)
 
diff --git a/sos/plugins/squid.py b/sos/plugins/squid.py
index dae5759f..61d953be 100644
--- a/sos/plugins/squid.py
+++ b/sos/plugins/squid.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class squid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Squid(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """squid related information
     """
 
+    plugin_name = 'squid'
+
     files = ('/etc/squid/squid.conf',)
     packages = ('squid',)
 
diff --git a/sos/plugins/ssh.py b/sos/plugins/ssh.py
index 35ce3598..1abfc2a4 100644
--- a/sos/plugins/ssh.py
+++ b/sos/plugins/ssh.py
@@ -16,8 +16,11 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class ssh(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class Ssh(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """ssh-related information
     """
+
+    plugin_name = 'ssh'
+
     def setup(self):
         self.add_copy_specs(["/etc/ssh/ssh_config", "/etc/ssh/sshd_config"])
diff --git a/sos/plugins/sssd.py b/sos/plugins/sssd.py
index a5c3af72..b28f4b44 100644
--- a/sos/plugins/sssd.py
+++ b/sos/plugins/sssd.py
@@ -16,7 +16,7 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class sssd(Plugin):
+class Sssd(Plugin):
     """sssd-related Diagnostic Information
     """
 
@@ -26,14 +26,14 @@ class sssd(Plugin):
     def setup(self):
         self.add_copy_specs(["/etc/sssd", "/var/log/sssd/*"])
 
-class RedHatSssd(sssd, RedHatPlugin):
+class RedHatSssd(Sssd, RedHatPlugin):
     """sssd-related Diagnostic Information on Red Hat based distributions
     """
 
     def setup(self):
         super(RedHatSssd, self).setup()
 
-class DebianSssd(sssd, DebianPlugin, UbuntuPlugin):
+class DebianSssd(Sssd, DebianPlugin, UbuntuPlugin):
     """sssd-related Diagnostic Information on Debian based distributions
     """
 
diff --git a/sos/plugins/sunrpc.py b/sos/plugins/sunrpc.py
index dff6ed80..c1e50549 100644
--- a/sos/plugins/sunrpc.py
+++ b/sos/plugins/sunrpc.py
@@ -16,7 +16,7 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class sunrpc(Plugin):
+class SunRPC(Plugin):
     """Sun RPC related information
     """
 
@@ -33,7 +33,7 @@ class sunrpc(Plugin):
         self.add_cmd_output("rpcinfo -p localhost")
         return
 
-class RedHatSunrpc(sunrpc, RedHatPlugin):
+class RedHatSunRPC(SunRPC, RedHatPlugin):
     """Sun RPC related information for Red Hat systems
     """
 
@@ -41,7 +41,7 @@ class RedHatSunrpc(sunrpc, RedHatPlugin):
 
 # FIXME: depends on addition of runlevel_by_service (or similar)
 # in Debian/Ubuntu policy classes
-#class DebianSunrpc(sunrpc, DebianPlugin, UbuntuPlugin):
+#class DebianSunRPC(SunRPC, DebianPlugin, UbuntuPlugin):
 #    """Sun RPC related information for Red Hat systems
 #    """
 #
diff --git a/sos/plugins/system.py b/sos/plugins/system.py
index a3a76767..7f8efe05 100644
--- a/sos/plugins/system.py
+++ b/sos/plugins/system.py
@@ -14,10 +14,10 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class system(Plugin):
+class System(Plugin):
     plugin_name = "system"
 
-class RedHatSystem(system, RedHatPlugin):
+class RedHatSystem(System, RedHatPlugin):
     """core system related information
     """
     def setup(self):
@@ -39,7 +39,7 @@ class RedHatSystem(system, RedHatPlugin):
 
         self.add_cmd_output("crontab -l")
 
-class DebianSystem(system, DebianPlugin, UbuntuPlugin):
+class DebianSystem(System, DebianPlugin, UbuntuPlugin):
     """core system related information for Debian and Ubuntu
     """
     def setup(self):
diff --git a/sos/plugins/systemd.py b/sos/plugins/systemd.py
index 046fb227..915c8fcf 100644
--- a/sos/plugins/systemd.py
+++ b/sos/plugins/systemd.py
@@ -16,7 +16,7 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class systemd(Plugin, RedHatPlugin):
+class Systemd(Plugin, RedHatPlugin):
     """ Information on systemd and related subsystems
     """
 
diff --git a/sos/plugins/systemtap.py b/sos/plugins/systemtap.py
index 039a9b91..213dcdb9 100644
--- a/sos/plugins/systemtap.py
+++ b/sos/plugins/systemtap.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class systemtap(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class SystemTap(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """SystemTap information
     """
 
+    plugin_name = 'systemtap'
+
     files = ('stap',)
     packages = ('systemtap', 'systemtap-runtime')
 
diff --git a/sos/plugins/sysvipc.py b/sos/plugins/sysvipc.py
index f1089495..d8b68fe8 100644
--- a/sos/plugins/sysvipc.py
+++ b/sos/plugins/sysvipc.py
@@ -15,7 +15,7 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class sysvipc(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class SysVIPC(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """SysV IPC related information
     """
 
diff --git a/sos/plugins/tftpserver.py b/sos/plugins/tftpserver.py
index 4a4018f4..c6089ed5 100644
--- a/sos/plugins/tftpserver.py
+++ b/sos/plugins/tftpserver.py
@@ -16,10 +16,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class tftpserver(Plugin, RedHatPlugin):
+class TftpServer(Plugin, RedHatPlugin):
     """tftpserver related information
     """
 
+    plugin_name = 'tftpserver'
+
     files = ('/etc/xinetd.d/tftp',)
     packages = ('tftp-server',)
 
diff --git a/sos/plugins/tomcat.py b/sos/plugins/tomcat.py
index c188f848..d4e1ac65 100644
--- a/sos/plugins/tomcat.py
+++ b/sos/plugins/tomcat.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class tomcat(Plugin, RedHatPlugin):
+class Tomcat(Plugin, RedHatPlugin):
     """Tomcat related information
     """
 
+    plugin_name = 'tomcat'
+
     packages = ('tomcat5',)
 
     def setup(self):
diff --git a/sos/plugins/udev.py b/sos/plugins/udev.py
index c5981fc3..b745e6a9 100644
--- a/sos/plugins/udev.py
+++ b/sos/plugins/udev.py
@@ -14,8 +14,11 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class udev(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
-    """udev related information
+class Udev(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+    """Udev related information
     """
+
+    plugin_name = 'udev'
+
     def setup(self):
         self.add_copy_specs(["/etc/udev/udev.conf", "/etc/udev/rules.d/*"])
diff --git a/sos/plugins/usb.py b/sos/plugins/usb.py
new file mode 100644
index 00000000..03119572
--- /dev/null
+++ b/sos/plugins/usb.py
@@ -0,0 +1,31 @@
+### This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin
+from glob import glob
+import os
+
+class Usb(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+    """USB subsystem information
+    """
+
+    plugin_name = "usb"
+
+    def setup(self):
+        self.add_copy_spec("/sys/bus/usb")
+        
+        self.add_cmd_output("lsusb")
+        self.add_cmd_output("lsusb -v")
+        self.add_cmd_output("lsusb -t")
+
diff --git a/sos/plugins/veritas.py b/sos/plugins/veritas.py
index 03eda211..8d5dff8a 100644
--- a/sos/plugins/veritas.py
+++ b/sos/plugins/veritas.py
@@ -15,9 +15,12 @@
 from sos.plugins import Plugin, RedHatPlugin
 import os
 
-class veritas(Plugin, RedHatPlugin):
+class Veritas(Plugin, RedHatPlugin):
     """Veritas related information
     """
+
+    plugin_name = 'veritas'
+
     # Information about VRTSexplorer obtained from
     # http://seer.entsupport.symantec.com/docs/243150.htm
     option_list = [("script", "Define VRTSexplorer script path", "", "/opt/VRTSspt/VRTSexplorer")]
diff --git a/sos/plugins/vmware.py b/sos/plugins/vmware.py
index d7d39f82..3a23dd30 100644
--- a/sos/plugins/vmware.py
+++ b/sos/plugins/vmware.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class vmware(Plugin, RedHatPlugin):
+class VMWare(Plugin, RedHatPlugin):
     """VMWare related information
     """
 
+    plugin_name = 'vmware'
+
     files = ('vmware','/usr/init.d/vmware-tools')
 
     def setup(self):
diff --git a/sos/plugins/ftp.py b/sos/plugins/vsftpd.py
index 693b8cbd..4cf58cf1 100644
--- a/sos/plugins/ftp.py
+++ b/sos/plugins/vsftpd.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin
 
-class ftp(Plugin, RedHatPlugin):
+class Vsftpd(Plugin, RedHatPlugin):
     """FTP server related information
     """
 
+    plugin_name = 'vsftpd'
+
     files = ('/etc/vsftpd',)
     packages = ('vsftpd',)
 
diff --git a/sos/plugins/x11.py b/sos/plugins/x11.py
index 2f25cb29..15730c6f 100644
--- a/sos/plugins/x11.py
+++ b/sos/plugins/x11.py
@@ -14,10 +14,12 @@
 
 from sos.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin
 
-class x11(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
+class X11(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """X related information
     """
 
+    plugin_name = 'x11'
+
     files = ('/etc/X11',)
 
     def setup(self):
diff --git a/sos/plugins/xen.py b/sos/plugins/xen.py
index 0a5684fa..1bbeaf5c 100644
--- a/sos/plugins/xen.py
+++ b/sos/plugins/xen.py
@@ -20,6 +20,9 @@ from stat import *
 class Xen(Plugin, RedHatPlugin):
     """Xen related information
     """
+
+    plugin_name = 'xen'
+
     def determine_xen_host(self):
         if os.access("/proc/acpi/dsdt", os.R_OK):
             (status, output, rtime) = self.call_ext_prog("grep -qi xen /proc/acpi/dsdt")
diff --git a/sos/plugins/xinetd.py b/sos/plugins/xinetd.py
index 8c3945e0..e561044f 100644
--- a/sos/plugins/xinetd.py
+++ b/sos/plugins/xinetd.py
@@ -20,6 +20,8 @@ class Xinetd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """xinetd information
     """
 
+    plugin_name = 'xinetd'
+
     files = ('/etc/xinetd.conf',)
     packages = ('xinetd',)
 
diff --git a/sos/plugins/yum.py b/sos/plugins/yum.py
index 18519df3..6d473c90 100644
--- a/sos/plugins/yum.py
+++ b/sos/plugins/yum.py
@@ -18,6 +18,8 @@ class Yum(Plugin, RedHatPlugin):
     """yum information
     """
 
+    plugin_name = 'yum'
+
     files = ('/etc/yum.conf',)
     packages = ('yum',)
     option_list = [("yumlist", "list repositories and packages", "slow", False),