Maybe a separate checkin, but didn't we decide to rename these to TDataStore and DataStore?