MADS: General cleanup and minor renamings