Change datastore options names for consistency
Land #2145, consistent datastore options