Standardized class names, some modifications to generate Sphinx