changes to wid naming strcuture