Updates the datastore names to be more consistent.