Separate widget model name from com target name.

model_name here, as well