[TH] normalize keys in entities so we can use dashes everywhere