MADS: Renaming to use InterWaiting enum entries
MADS: Renamings for saving fields in MADSAction::startAction