made the class names in model_loading.py compliant with the ones used in models.py
Merge branch 'P0N3Y-master'