sync with global libmtm name changes