Renamed ComposedSchema columns to be less ambiguous
Merge remote-tracking branch 'origin/components' into components