demo: improved consistency in widgets names