s/Data/Kind/g. No functionality change.