Go back to "allocation_size" to avoid breaking the world.

27 files changed, 64 insertions, 64 deletions

diff --git a/bench/wtperf/wtperf.c b/bench/wtperf/wtperf.c
index ec31c79c890..a7bc351b27a 100644
--- a/bench/wtperf/wtperf.c
+++ b/bench/wtperf/wtperf.c
@@ -150,7 +150,7 @@ uint64_t wtperf_value_range(CONFIG *);
 
 #define	DEFAULT_LSM_CONFIG						\
 	"key_format=S,value_format=S,type=lsm,exclusive=true,"		\
-	"leaf_page_max=4kb,internal_page_max=64kb,block_allocation_size=4kb,"
+	"leaf_page_max=4kb,internal_page_max=64kb,allocation_size=4kb,"
 
 /* Default values. */
 CONFIG default_cfg = {
diff --git a/dist/api_data.py b/dist/api_data.py
index 5f4ccd42207..09215470f00 100644
--- a/dist/api_data.py
+++ b/dist/api_data.py
@@ -133,7 +133,7 @@ file_config = format_meta + [
 		algorithm during block allocation, the \c "best" configuration
 		uses a best-fit algorithm''',
 		choices=['first', 'best',]),
-	Config('block_allocation_size', '4KB', r'''
+	Config('allocation_size', '4KB', r'''
 		the file unit allocation size, in bytes, must a power-of-two;
 		smaller values decrease the file space required by overflow
 		items, and the default value of 4KB is a good choice absent
diff --git a/dist/s_string.ok b/dist/s_string.ok
index 97600e83fee..0bc66a9c0e8 100644
--- a/dist/s_string.ok
+++ b/dist/s_string.ok
@@ -390,6 +390,7 @@ datasets
 datasource
 dbc
 decile
+deciles
 decl
 decr
 decrement
@@ -690,6 +691,7 @@ qdown
 qrrSS
 qs
 qsort
+quartile
 qup
 rS
 rdlock
diff --git a/dist/stat_data.py b/dist/stat_data.py
index 70eacd06d5d..1b20213545f 100644
--- a/dist/stat_data.py
+++ b/dist/stat_data.py
@@ -244,7 +244,7 @@ dsrc_stats = [
 	# Block manager statistics
 	##########################################
 	Stat('block_alloc', 'blocks allocated'),
-	Stat('block_allocation_size',
+	Stat('allocation_size',
 	    'block manager file allocation unit size', 'no_aggregate,no_scale'),
 	Stat('block_checkpoint_size', 'checkpoint size', 'no_scale'),
 	Stat('block_extension', 'block allocations requiring file extension'),
diff --git a/src/block/block_open.c b/src/block/block_open.c
index ea943d3213e..2651ead3a66 100644
--- a/src/block/block_open.c
+++ b/src/block/block_open.c
@@ -315,7 +315,7 @@ __wt_block_stat(WT_SESSION_IMPL *session, WT_BLOCK *block, WT_DSRC_STATS *stats)
 	 * isn't like this is a common function for an application to call.
 	 */
 	__wt_spin_lock(session, &block->live_lock);
-	WT_STAT_SET(stats, block_allocation_size, block->allocsize);
+	WT_STAT_SET(stats, allocation_size, block->allocsize);
 	WT_STAT_SET(stats, block_checkpoint_size, block->live.ckpt_size);
 	WT_STAT_SET(stats, block_magic, WT_BLOCK_MAGIC);
 	WT_STAT_SET(stats, block_major, WT_BLOCK_MAJOR_VERSION);
diff --git a/src/btree/bt_handle.c b/src/btree/bt_handle.c
index 0c142025b48..9d1d4074ed1 100644
--- a/src/btree/bt_handle.c
+++ b/src/btree/bt_handle.c
@@ -587,7 +587,7 @@ __btree_page_sizes(WT_SESSION_IMPL *session)
 	cfg = btree->dhandle->cfg;
 
 	WT_RET(__wt_direct_io_size_check(
-	    session, cfg, "block_allocation_size", &btree->allocsize));
+	    session, cfg, "allocation_size", &btree->allocsize));
 	WT_RET(__wt_direct_io_size_check(
 	    session, cfg, "internal_page_max", &btree->maxintlpage));
 	WT_RET(__wt_config_gets(session, cfg, "internal_item_max", &cval));
diff --git a/src/config/config_def.c b/src/config/config_def.c
index 016087a8c61..f089d4592da 100644
--- a/src/config/config_def.c
+++ b/src/config/config_def.c
@@ -53,10 +53,10 @@ static const WT_CONFIG_CHECK confchk_connection_reconfigure[] = {
 };
 
 static const WT_CONFIG_CHECK confchk_file_meta[] = {
+	{ "allocation_size", "int", "min=512B,max=128MB", NULL},
 	{ "block_allocation", "string",
 	    "choices=[\"first\",\"best\"]",
 	    NULL},
-	{ "block_allocation_size", "int", "min=512B,max=128MB", NULL},
 	{ "block_compressor", "string", NULL, NULL},
 	{ "cache_resident", "boolean", NULL, NULL},
 	{ "checkpoint", "string", NULL, NULL},
@@ -114,10 +114,10 @@ static const WT_CONFIG_CHECK confchk_session_checkpoint[] = {
 };
 
 static const WT_CONFIG_CHECK confchk_session_create[] = {
+	{ "allocation_size", "int", "min=512B,max=128MB", NULL},
 	{ "block_allocation", "string",
 	    "choices=[\"first\",\"best\"]",
 	    NULL},
-	{ "block_allocation_size", "int", "min=512B,max=128MB", NULL},
 	{ "block_compressor", "string", NULL, NULL},
 	{ "cache_resident", "boolean", NULL, NULL},
 	{ "checksum", "string",
@@ -315,15 +315,14 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  NULL
 	},
 	{ "file.meta",
-	  "block_allocation=best,block_allocation_size=4KB,"
-	  "block_compressor=,cache_resident=0,checkpoint=,"
-	  "checksum=uncompressed,collator=,columns=,dictionary=0,"
-	  "format=btree,huffman_key=,huffman_value=,internal_item_max=0,"
-	  "internal_key_truncate=,internal_page_max=4KB,key_format=u,"
-	  "key_gap=10,leaf_item_max=0,leaf_page_max=1MB,memory_page_max=5MB"
-	  ",os_cache_dirty_max=0,os_cache_max=0,prefix_compression=,"
-	  "prefix_compression_min=4,split_pct=75,value_format=u,"
-	  "version=(major=0,minor=0)",
+	  "allocation_size=4KB,block_allocation=best,block_compressor=,"
+	  "cache_resident=0,checkpoint=,checksum=uncompressed,collator=,"
+	  "columns=,dictionary=0,format=btree,huffman_key=,huffman_value=,"
+	  "internal_item_max=0,internal_key_truncate=,internal_page_max=4KB"
+	  ",key_format=u,key_gap=10,leaf_item_max=0,leaf_page_max=1MB,"
+	  "memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,"
+	  "prefix_compression=,prefix_compression_min=4,split_pct=75,"
+	  "value_format=u,version=(major=0,minor=0)",
 	  confchk_file_meta
 	},
 	{ "index.meta",
@@ -351,18 +350,17 @@ static const WT_CONFIG_ENTRY config_entries[] = {
 	  NULL
 	},
 	{ "session.create",
-	  "block_allocation=best,block_allocation_size=4KB,"
-	  "block_compressor=,cache_resident=0,checksum=uncompressed,"
-	  "colgroups=,collator=,columns=,dictionary=0,exclusive=0,"
-	  "format=btree,huffman_key=,huffman_value=,internal_item_max=0,"
-	  "internal_key_truncate=,internal_page_max=4KB,key_format=u,"
-	  "key_gap=10,leaf_item_max=0,leaf_page_max=1MB,lsm_auto_throttle=,"
-	  "lsm_bloom=,lsm_bloom_bit_count=8,lsm_bloom_config=,"
-	  "lsm_bloom_hash_count=4,lsm_bloom_oldest=0,lsm_chunk_size=2MB,"
-	  "lsm_merge_max=15,lsm_merge_threads=1,memory_page_max=5MB,"
-	  "os_cache_dirty_max=0,os_cache_max=0,prefix_compression=,"
-	  "prefix_compression_min=4,source=,split_pct=75,type=file,"
-	  "value_format=u",
+	  "allocation_size=4KB,block_allocation=best,block_compressor=,"
+	  "cache_resident=0,checksum=uncompressed,colgroups=,collator=,"
+	  "columns=,dictionary=0,exclusive=0,format=btree,huffman_key=,"
+	  "huffman_value=,internal_item_max=0,internal_key_truncate=,"
+	  "internal_page_max=4KB,key_format=u,key_gap=10,leaf_item_max=0,"
+	  "leaf_page_max=1MB,lsm_auto_throttle=,lsm_bloom=,"
+	  "lsm_bloom_bit_count=8,lsm_bloom_config=,lsm_bloom_hash_count=4,"
+	  "lsm_bloom_oldest=0,lsm_chunk_size=2MB,lsm_merge_max=15,"
+	  "lsm_merge_threads=1,memory_page_max=5MB,os_cache_dirty_max=0,"
+	  "os_cache_max=0,prefix_compression=,prefix_compression_min=4,"
+	  "source=,split_pct=75,type=file,value_format=u",
 	  confchk_session_create
 	},
 	{ "session.drop",
diff --git a/src/docs/tuning.dox b/src/docs/tuning.dox
index 5a490cc4aad..579be81f3a3 100644
--- a/src/docs/tuning.dox
+++ b/src/docs/tuning.dox
@@ -156,10 +156,10 @@ single page.  In other words, page and overflow sizes are based on in-memory
 sizes, not disk sizes.
 
 There are two other, related configuration values, also settable by the
-WT_SESSION::create method.  They are \c block_allocation_size, and \c
+WT_SESSION::create method.  They are \c allocation_size, and \c
 split_pct.
 
-The \c block_allocation_size configuration value is the underlying unit
+The \c allocation_size configuration value is the underlying unit
 of allocation for the file.  As the unit of file allocation, it has two
 effects: first, it limits the ultimate size of the file, and second, it
 determines how much space is wasted when storing overflow items.
diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox
index 90bf4d9ff0b..52c4e49e9f5 100644
--- a/src/docs/upgrading.dox
+++ b/src/docs/upgrading.dox
@@ -8,7 +8,7 @@
 In previous releases, the \c allocation_size configuration string to the
 WT_SESSION::create method specified the file unit allocation size; in the
 1.6.6 release, this configuration string has been renamed to
-\c block_allocation_size for consistency with other configuration options.
+\c allocation_size for consistency with other configuration options.
 Applications may require modifications to resolve run-time errors.
 </dd>
 
diff --git a/src/include/stat.h b/src/include/stat.h
index 4c638f72586..3349ce146e6 100644
--- a/src/include/stat.h
+++ b/src/include/stat.h
@@ -116,8 +116,8 @@ struct __wt_stats {
  * Statistics entries for data sources.
  */
 struct __wt_dsrc_stats {
+	WT_STATS allocation_size;
 	WT_STATS block_alloc;
-	WT_STATS block_allocation_size;
 	WT_STATS block_checkpoint_size;
 	WT_STATS block_extension;
 	WT_STATS block_free;
diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in
index da0c136737f..ce68f07c0f4 100644
--- a/src/include/wiredtiger.in
+++ b/src/include/wiredtiger.in
@@ -707,16 +707,16 @@ struct __wt_session {
 	 * \c "table:stock". For a description of URI formats
 	 * see @ref data_sources.
 	 * @configstart{session.create, see dist/api_data.py}
+	 * @config{allocation_size, the file unit allocation size\, in bytes\,
+	 * must a power-of-two; smaller values decrease the file space required
+	 * by overflow items\, and the default value of 4KB is a good choice
+	 * absent requirements from the operating system or storage device., an
+	 * integer between 512B and 128MB; default \c 4KB.}
 	 * @config{block_allocation, configure block allocation.  Permitted
 	 * values are \c "first" or \c "best"; the \c "first" configuration uses
 	 * a first-available algorithm during block allocation\, the \c "best"
 	 * configuration uses a best-fit algorithm., a string\, chosen from the
 	 * following options: \c "first"\, \c "best"; default \c best.}
-	 * @config{block_allocation_size, the file unit allocation size\, in
-	 * bytes\, must a power-of-two; smaller values decrease the file space
-	 * required by overflow items\, and the default value of 4KB is a good
-	 * choice absent requirements from the operating system or storage
-	 * device., an integer between 512B and 128MB; default \c 4KB.}
 	 * @config{block_compressor, configure a compressor for file blocks.
 	 * Permitted values are empty (off) or \c "bzip2"\, \c "snappy" or
 	 * custom compression engine \c "name" created with
@@ -2556,10 +2556,10 @@ extern int wiredtiger_extension_terminate(WT_CONNECTION *connection);
  * @anchor statistics_dsrc
  * @{
  */
-/*! blocks allocated */
-#define	WT_STAT_DSRC_BLOCK_ALLOC			0
 /*! block manager file allocation unit size */
-#define	WT_STAT_DSRC_BLOCK_ALLOCATION_SIZE		1
+#define	WT_STAT_DSRC_ALLOCATION_SIZE			0
+/*! blocks allocated */
+#define	WT_STAT_DSRC_BLOCK_ALLOC			1
 /*! checkpoint size */
 #define	WT_STAT_DSRC_BLOCK_CHECKPOINT_SIZE		2
 /*! block allocations requiring file extension */
diff --git a/src/meta/meta_turtle.c b/src/meta/meta_turtle.c
index 409749f5857..0292de522ed 100644
--- a/src/meta/meta_turtle.c
+++ b/src/meta/meta_turtle.c
@@ -137,7 +137,7 @@ __metadata_load_bulk(WT_SESSION_IMPL *session)
 		 * retrieve the allocation size and re-create the file.
 		 */
 		WT_ERR(__wt_direct_io_size_check(
-		    session, filecfg, "block_allocation_size", &allocsize));
+		    session, filecfg, "allocation_size", &allocsize));
 		WT_ERR(__wt_block_manager_create(session, key, allocsize));
 	}
 	WT_ERR_NOTFOUND_OK(ret);
diff --git a/src/schema/schema_create.c b/src/schema/schema_create.c
index cb1afee53b8..52e29ba7ed1 100644
--- a/src/schema/schema_create.c
+++ b/src/schema/schema_create.c
@@ -76,7 +76,7 @@ __create_file(WT_SESSION_IMPL *session,
 
 	/* Sanity check the allocation size. */
 	WT_RET(__wt_direct_io_size_check(
-	    session, filecfg, "block_allocation_size", &allocsize));
+	    session, filecfg, "allocation_size", &allocsize));
 
 	/* Create the file. */
 	WT_ERR(__wt_block_manager_create(session, filename, allocsize));
diff --git a/src/support/stat.c b/src/support/stat.c
index 0eb1e2f11d1..a36dcc2cdb4 100644
--- a/src/support/stat.c
+++ b/src/support/stat.c
@@ -8,9 +8,9 @@ __wt_stat_init_dsrc_stats(WT_DSRC_STATS *stats)
 	/* Clear, so can also be called for reinitialization. */
 	memset(stats, 0, sizeof(*stats));
 
-	stats->block_alloc.desc = "blocks allocated";
-	stats->block_allocation_size.desc =
+	stats->allocation_size.desc =
 	    "block manager file allocation unit size";
+	stats->block_alloc.desc = "blocks allocated";
 	stats->block_checkpoint_size.desc = "checkpoint size";
 	stats->block_extension.desc =
 	    "block allocations requiring file extension";
@@ -126,8 +126,8 @@ __wt_stat_refresh_dsrc_stats(void *stats_arg)
 	WT_DSRC_STATS *stats;
 
 	stats = (WT_DSRC_STATS *)stats_arg;
+	stats->allocation_size.v = 0;
 	stats->block_alloc.v = 0;
-	stats->block_allocation_size.v = 0;
 	stats->block_checkpoint_size.v = 0;
 	stats->block_extension.v = 0;
 	stats->block_free.v = 0;
diff --git a/test/format/wts.c b/test/format/wts.c
index 98b4a1444dd..1d99093f36a 100644
--- a/test/format/wts.c
+++ b/test/format/wts.c
@@ -185,7 +185,7 @@ wts_create(void)
 	end = config + sizeof(config);
 	p += snprintf(p, (size_t)(end - p),
 	    "key_format=%s,"
-	    "block_allocation=%s,block_allocation_size=512,"
+	    "block_allocation=%s,allocation_size=512,"
 	    "internal_page_max=%d,internal_item_max=%d,"
 	    "leaf_page_max=%d,leaf_item_max=%d",
 	    (g.type == ROW) ? "u" : "r",
diff --git a/test/salvage/salvage.c b/test/salvage/salvage.c
index 188f9bf4acb..9d6eee1c59f 100644
--- a/test/salvage/salvage.c
+++ b/test/salvage/salvage.c
@@ -465,7 +465,7 @@ build(int ikey, int ivalue, int cnt)
 	case WT_PAGE_COL_FIX:
 		(void)snprintf(config, sizeof(config),
 		    "key_format=r,value_format=7t,"
-		    "block_allocation_size=%d,"
+		    "allocation_size=%d,"
 		    "internal_page_max=%d,internal_item_max=%d,"
 		    "leaf_page_max=%d,leaf_item_max=%d",
 		    PSIZE, PSIZE, OSIZE, PSIZE, OSIZE);
@@ -473,7 +473,7 @@ build(int ikey, int ivalue, int cnt)
 	case WT_PAGE_COL_VAR:
 		(void)snprintf(config, sizeof(config),
 		    "key_format=r,"
-		    "block_allocation_size=%d,"
+		    "allocation_size=%d,"
 		    "internal_page_max=%d,internal_item_max=%d,"
 		    "leaf_page_max=%d,leaf_item_max=%d",
 		    PSIZE, PSIZE, OSIZE, PSIZE, OSIZE);
@@ -481,7 +481,7 @@ build(int ikey, int ivalue, int cnt)
 	case WT_PAGE_ROW_LEAF:
 		(void)snprintf(config, sizeof(config),
 		    "key_format=u,"
-		    "block_allocation_size=%d,"
+		    "allocation_size=%d,"
 		    "internal_page_max=%d,internal_item_max=%d,"
 		    "leaf_page_max=%d,leaf_item_max=%d",
 		    PSIZE, PSIZE, OSIZE, PSIZE, OSIZE);
diff --git a/test/suite/test_base01.py b/test/suite/test_base01.py
index 48dcbe4e9fe..09e144320a7 100644
--- a/test/suite/test_base01.py
+++ b/test/suite/test_base01.py
@@ -37,7 +37,7 @@ class test_base01(wttest.WiredTigerTestCase):
     table_name2 = 'test_base01b.wt'
 
     def create_table(self, tablename):
-        extra_params = ',block_allocation_size=512,' +\
+        extra_params = ',allocation_size=512,' +\
             'internal_page_max=16384,leaf_page_max=131072'
         self.pr('create_table')
         self.session.create('table:' + tablename,
diff --git a/test/suite/test_base02.py b/test/suite/test_base02.py
index ebbef5b2bdd..10137c772b0 100644
--- a/test/suite/test_base02.py
+++ b/test/suite/test_base02.py
@@ -57,7 +57,7 @@ class test_base02(wttest.WiredTigerTestCase):
         """
         conf_confsize = [
             None,
-            'block_allocation_size=1024',
+            'allocation_size=1024',
             'internal_page_max=64k,internal_item_max=1k',
             'leaf_page_max=128k,leaf_item_max=512',
             'leaf_page_max=256k,leaf_item_max=256,internal_page_max=8k,internal_item_max=128',
diff --git a/test/suite/test_bug004.py b/test/suite/test_bug004.py
index ab2453524a5..03b01fa581b 100644
--- a/test/suite/test_bug004.py
+++ b/test/suite/test_bug004.py
@@ -39,7 +39,7 @@ class test_bug004(wttest.WiredTigerTestCase):
     uri = 'file:test_ovfl_key'
 
     # Use a small page size because we want to create overflow items
-    config = 'block_allocation_size=512,' +\
+    config = 'allocation_size=512,' +\
         'leaf_page_max=512,value_format=S,key_format=S'
 
     nentries = 30
diff --git a/test/suite/test_checkpoint01.py b/test/suite/test_checkpoint01.py
index b078aabffb7..e3f23f7298c 100644
--- a/test/suite/test_checkpoint01.py
+++ b/test/suite/test_checkpoint01.py
@@ -114,7 +114,7 @@ class test_checkpoint(wttest.WiredTigerTestCase):
         # the correct key/value pairs.
         self.session.create(self.uri,
             "key_format=" + self.fmt +\
-                ",value_format=S,block_allocation_size=512,leaf_page_max=512")
+                ",value_format=S,allocation_size=512,leaf_page_max=512")
         self.build_file_with_checkpoints()
         self.check()
 
diff --git a/test/suite/test_compact.py b/test/suite/test_compact.py
index 28edbd8c55c..72c720d0089 100644
--- a/test/suite/test_compact.py
+++ b/test/suite/test_compact.py
@@ -37,7 +37,7 @@ class test_compact(wttest.WiredTigerTestCase, suite_subprocess):
     name = 'test_compact'
 
     # Use a small page size because we want to create lots of pages.
-    config = 'block_allocation_size=512,' +\
+    config = 'allocation_size=512,' +\
         'leaf_page_max=512,value_format=S,key_format=S'
     nentries = 50000
 
diff --git a/test/suite/test_cursor_random.py b/test/suite/test_cursor_random.py
index a817d33818d..56d4fee285c 100644
--- a/test/suite/test_cursor_random.py
+++ b/test/suite/test_cursor_random.py
@@ -76,11 +76,11 @@ class test_cursor_random(wttest.WiredTigerTestCase):
         uri = self.type + 'random'
         if self.type == 'file:':
             simple_populate(self, uri,
-                'block_allocation_size=512,leaf_page_max=512,key_format=' +\
+                'allocation_size=512,leaf_page_max=512,key_format=' +\
                 self.fmt, 10000)
         else:
             complex_populate(self, uri,
-                'block_allocation_size=512,leaf_page_max=512,key_format=' +\
+                'allocation_size=512,leaf_page_max=512,key_format=' +\
                 self.fmt, 10000)
 
         # Close the connection so everything is forced to disk (otherwise the
diff --git a/test/suite/test_stat01.py b/test/suite/test_stat01.py
index efb167172b7..3d743324565 100644
--- a/test/suite/test_stat01.py
+++ b/test/suite/test_stat01.py
@@ -38,7 +38,7 @@ class test_stat01(wttest.WiredTigerTestCase):
     tablename = 'test_stat01.wt'
     uri = 'file:' + tablename
     config = 'key_format=S,' +\
-        'block_allocation_size=512,internal_page_max=16K,leaf_page_max=128K'
+        'allocation_size=512,internal_page_max=16K,leaf_page_max=128K'
     nentries = 25
 
     # Override WiredTigerTestCase, we have extensions.
diff --git a/test/suite/test_truncate01.py b/test/suite/test_truncate01.py
index 5df4f853a71..fcac125bd3f 100644
--- a/test/suite/test_truncate01.py
+++ b/test/suite/test_truncate01.py
@@ -183,12 +183,12 @@ class test_truncate_cursor(wttest.WiredTigerTestCase):
     # those tests to file objects.
     types = [
         ('file', dict(type='file:',\
-            config='block_allocation_size=512,leaf_page_max=512,key_format=')),
+            config='allocation_size=512,leaf_page_max=512,key_format=')),
         ('file8t', dict(type='file:',\
-            config='block_allocation_size=512,\
+            config='allocation_size=512,\
             leaf_page_max=512,value_format=8t,key_format=')),
         ('table', dict(type='table:',\
-            config='block_allocation_size=512,leaf_page_max=512,key_format=')),
+            config='allocation_size=512,leaf_page_max=512,key_format=')),
     ]
     keyfmt = [
         ('integer', dict(keyfmt='i')),
diff --git a/test/suite/test_truncate02.py b/test/suite/test_truncate02.py
index f50cd9502b7..fb0172a4c54 100644
--- a/test/suite/test_truncate02.py
+++ b/test/suite/test_truncate02.py
@@ -45,7 +45,7 @@ class test_truncate_fast_delete(wttest.WiredTigerTestCase):
     # of individual pages in the file.
     types = [
         ('file', dict(type='file:', config=\
-            'block_allocation_size=512,leaf_page_max=512,' +\
+            'allocation_size=512,leaf_page_max=512,' +\
             'value_format=S,key_format=')),
     ]
 
diff --git a/test/suite/test_truncate03.py b/test/suite/test_truncate03.py
index bbc4c9e0362..380bc0bbb4a 100644
--- a/test/suite/test_truncate03.py
+++ b/test/suite/test_truncate03.py
@@ -38,7 +38,7 @@ class test_truncate_address_deleted(wttest.WiredTigerTestCase):
     # Use a small page size and lots of keys because we want to create lots
     # of individual pages in the file.
     nentries = 10000
-    config = 'block_allocation_size=512,' +\
+    config = 'allocation_size=512,' +\
         'leaf_page_max=512,value_format=S,key_format=S'
 
     # address_deleted routine:
diff --git a/test/suite/wtscenario.py b/test/suite/wtscenario.py
index b867ec38859..7091052e356 100644
--- a/test/suite/wtscenario.py
+++ b/test/suite/wtscenario.py
@@ -219,11 +219,11 @@ class wtscenario:
         if hasattr(self, 'imax'):
             res += ',internal_page_max=' + str(self.imax)
             if self.imax < 4*1024:
-                res += ',block_allocation_size=512'
+                res += ',allocation_size=512'
         if hasattr(self, 'loverflow'):
             res += ',leaf_item_max=' + str(self.loverflow)
         if hasattr(self, 'lmax'):
             res += ',leaf_page_max=' + str(self.lmax)
             if self.lmax < 4*1024:
-                res += ',block_allocation_size=512'
+                res += ',allocation_size=512'
         return res