button-remapping and remapping are the same thing, and keyboard-layout's Tag description says to use it for remapping keys.
I'm for merging both of the former into the latter. Does this seem sensible?
At the very least, remapping should be merged with button-remapping