Fix a type signature.
Fix a type signature.

This patch doesn't actually do anything ("KeyValId" is the same as "Key
KeyVal") but the new format is the one I'm using everywhere and it looks
confusing if the type suddenly changes.

dashea/bdcs,dashea/bdcs,atodorov/bdcs,weldr/bdcs