s/model_name/_model_name
s/Underscore/_
Merge pull request #4933 from jdfreder/widget-model-name

Small Widget inconsistency fixes