sync with libmtm header name changes