redo naming structure of wids