WMM cleanup (WME -> WMM rename, comments, etc.)