Updated widget examples for recent changes and,
renames from earlier PRs