References #1928: Renamed "Attribute" to "Column" for consistency with rest of core

Change-Id: Ia51edc45487109fb28ae2484a611cf11581a83d9