Change brand_elements.json to use more explicitly named structure.

It's a tradeoff, but this way probably makes for a more self-explanatory
file.