Also made minor changes to the function and class names, to be more consistent with QGIS naming conventions.