Merge "Correct datastore names via DatastoreType Enum"