Data: update both hyphenated and camel case keys

Fixes #14799