Updates to the etl-pipeline class names and Model base classes