Add entity names to contract types

I noticed while I was working on 940b7c63 that we already give the wrong entity name in several cases:

Adding it to the YAML file seems the best way to keep it up-to-date.