Fix error message semantics wrt model key/name distinction