Make keys more readable

There were some keys that were for the form `xlink` --- these should
rather be `x-link`