Renamed datastore entities, apparently KIND names have neglible impact on storage size...