Similar as in D43568, this patch renames ompt_wait_id* to omp_wait_id*. This renaming was introduced in OpenMP TR6.
Since this patch might bring similar trouble to tool writers as D43568, I would submit both patches at the same time.
Sounds good if that's the direction of the spec. It was clear that the implementation of OMPT might change based on newer Technical Reports.
You should add another space before /* here and in many more places below