style renames in Widgets

Change-Id: Ieee6047f80cc1440cf006937c9812121ea7ad607
Merge remote-tracking branch 'upstream/master'