Control Widget: rename member variables (code review)