That sounds right sglad. Never heard a Thai person referring to a Japanese person, as Jaap, in English or Thai. Always as you have it.