let's not rename just yet. I think we digest these include changes,
wait a bit to make sure nobody has had trouble with it, then we can
revisit the .cb issue. Since our spring goal is "Kconfig or death",
the .cb issue might not matter in a bit.