Widget Composite refactor in Widget Parent
Composite Table: name ambiguity fix