Tidy UI, use naming  required for MSD fit

Refs #10409
Fix failing unit tests

Refs #10409
Merge branch 'feature/10409_elwin_ui_use_elasticwindow' into develop