Resolving conflicts with upstream, removed 'name' field definition since char fields doesn't require the size in definition