Even though I wrote, | Your call. on reflection, I'd offer a *recommendation* (only): to append just a 'W' to the SWI name (no '_'), and let the C name come out as it does at the moment (os_findw(), etc). That meets the SWI naming rules, involves no work in DefMod, and looks O K in the C. IMHO.