A little overzealous when search + replace on `Kind` string.