use lowercase hyphenated model-type keys

[#50749305]

Use the same form of lowercase hyphenated model-type
keys as used in the framework.