Update naming following flexgrid specification