What Type of Visa Do I Need to Work at a University in Thailand?

I am confused. I may be returnng to Thailand in the future with the prospect of working in a University again. The last time I worked in a Uni over there I did the visa procedures in the same way I did when working in Governemnt schools. Non B _ WP_ Extension for 1 year.

Yet, I am looking on the Thai consulate site here in Vietnam and I see this......

Non-Immigrant Visa "B" -- To Teach in Thailand

1. REQUIREMENT

This type of visa is issued to applicants who intend to take up employment as school teachers under university level in Thailand.

So, if I were to return and work in a Uni again which obviously is not under Uni level ( ie I presume they mean schools) , which visa would I require? My guess is that it would be ...

Non-Immigrant Visa "B" -- To Work in Thailand

THỊ THỰC (VISA) LÀM VIỆC TẠI THÁI LAN

1. REQUIREMENT / ĐỐI TƯỢNG

This type of visa is issued to applicants who wish to enter the Kingdom to work.

Would I be correct in my assumption on this?