MADS: Renaming and fixes for loading sample data