[WSD] Rename some structures to make the code more readable.