Cleaning up reference errors to _parameters.py Class names
Merge branch 'jon' into sprint15