inconsistent naming of block item types

include/widgets.php

@@ -903,7 +903,7 @@ function widget_random_block($arr) {
 		item_type = %d $sql_options order by $randfunc limit 1",
 		intval($channel_id),
 		dbesc('%' . $contains . '%'),
-		intval(ITEM_TYPE_BUILDBLOCK)
+		intval(ITEM_TYPE_BLOCK)
 	);
 
 	if($r) {

mod/block.php

@@ -53,7 +53,7 @@ function block_content(&$a) {
 		item_type = %d $sql_options $revision limit 1",
 		intval($u[0]['channel_id']),
 		dbesc($page_id),
-		intval(ITEM_TYPE_BUILDBLOCK)
+		intval(ITEM_TYPE_BLOCK)
 	);
 
 	if(! $r) {
@@ -65,7 +65,7 @@ function block_content(&$a) {
 		item_type = %d $revision limit 1",
 			intval($u[0]['channel_id']),
 			dbesc($page_id),
-			intval(ITEM_TYPE_BUILDBLOCK)
+			intval(ITEM_TYPE_BLOCK)
 		);
 		if($x) {
 			// Yes, it's there. You just aren't allowed to see it.

mod/blocks.php

@@ -84,7 +84,7 @@ function blocks_content(&$a) {
 	}
 
 	$x = array(
-		'webpage' => ITEM_TYPE_BUILDBLOCK,
+		'webpage' => ITEM_TYPE_BLOCK,
 		'is_owner' => true,
 		'nickname' => $a->profile['channel_address'],
 		'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
@@ -110,7 +110,7 @@ function blocks_content(&$a) {
 	$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
 		where item_id.uid = %d and service = 'BUILDBLOCK' and item_type = %d order by item.created desc",
 		intval($owner),
-		intval(ITEM_TYPE_BUILDBLOCK)
+		intval(ITEM_TYPE_BLOCK)
 	);
 
 	$pages = null;

mod/editblock.php

@@ -136,7 +136,7 @@ function editblock_content(&$a) {
 	$o .= replace_macros($tpl,array(
 		'$return_path'         => $rp,
 		'$action'              => 'item',
-		'$webpage'             => ITEM_TYPE_BUILDBLOCK,
+		'$webpage'             => ITEM_TYPE_BLOCK,
 		'$share'               => t('Edit'),
 		'$bold'                => t('Bold'),
 		'$italic'              => t('Italic'),