Updated class names as we're not quite ready for the PHP 5.3 jump and namespaces just yet.