diff --git a/views_block/views_block.views.inc b/views_block/views_block.views.inc
index 6835b9b..f026bd1 100644
--- a/views_block/views_block.views.inc
+++ b/views_block/views_block.views.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Provide views data and handlers for blocks.
+ * Provide views data and handlers for block.
  */
 
 /**
@@ -9,17 +9,17 @@
  */
 function views_block_views_data() {
   // Basic table information.
-  $data['blocks']['table']['group']  = t('Block');
+  $data['block']['table']['group']  = t('Block');
 
   // Advertise this table as a possible base table
-  $data['blocks']['table']['base'] = array(
+  $data['block']['table']['base'] = array(
     'field' => 'bid',
     'title' => t('Block'),
     'help' => t('Blocks are the boxes visible in the sidebar(s) of your Drupal website.'),
   );
   
   // Module
-  $data['blocks']['module'] = array(
+  $data['block']['module'] = array(
     'title' => t('Module'),
     'help' => t('The module that exposes the block.'),
     'field' => array(
@@ -38,7 +38,7 @@ function views_block_views_data() {
   );
 
   // Block id
-  $data['blocks']['bid'] = array(
+  $data['block']['bid'] = array(
     'title' => t('Block ID'),
     'help' => t('The ID of the block.'),
     'field' => array(
@@ -58,7 +58,7 @@ function views_block_views_data() {
   );
 
   // Delta
-  $data['blocks']['delta'] = array(
+  $data['block']['delta'] = array(
     'title' => t('Delta'),
     'help' => t('The block index within its parent module.'),
     'field' => array(
@@ -77,7 +77,7 @@ function views_block_views_data() {
   );
 
   // Theme
-  $data['blocks']['theme'] = array(
+  $data['block']['theme'] = array(
     'title' => t('Theme'),
     'help' => t('The theme where the block appears.'),
     'field' => array(
@@ -96,7 +96,7 @@ function views_block_views_data() {
   );
 
   // Status
-  $data['blocks']['status'] = array(
+  $data['block']['status'] = array(
     'title' => t('Active'),
     'help' => t('Whether or not the block is active.'),
     'field' => array(
@@ -114,7 +114,7 @@ function views_block_views_data() {
   );
 
   // Weight
-  $data['blocks']['weight'] = array(
+  $data['block']['weight'] = array(
     'title' => t('Weight'),
     'help' => t('The weight of the block.'),
     'field' => array(
@@ -133,7 +133,7 @@ function views_block_views_data() {
   );
 
   // Region
-  $data['blocks']['region'] = array(
+  $data['block']['region'] = array(
     'title' => t('Region'),
     'help' => t('The region where the block appears.'),
     'field' => array(
@@ -152,7 +152,7 @@ function views_block_views_data() {
   );
 
   // Custom
-  $data['blocks']['custom'] = array(
+  $data['block']['custom'] = array(
     'title' => t('Custom visibility'),
     'help' => t('The custom visibility setting of the block.'),
     'field' => array(
@@ -167,7 +167,7 @@ function views_block_views_data() {
   );
 
   // Throttle
-  $data['blocks']['throttle'] = array(
+  $data['block']['throttle'] = array(
     'title' => t('Throttle'),
     'help' => t('Whether or not the block can be throttled.'),
     'field' => array(
@@ -188,7 +188,7 @@ function views_block_views_data() {
   );
 
   // Visibility
-  $data['blocks']['visibility'] = array(
+  $data['block']['visibility'] = array(
     'title' => t('Page visibility'),
     'help' => t('The page-specific visibility setting of the block.'),
     'field' => array(
@@ -203,7 +203,7 @@ function views_block_views_data() {
   );
 
   // Pages
-  $data['blocks']['pages'] = array(
+  $data['block']['pages'] = array(
     'title' => t('Pages'),
     'help' => t('The pages where the block appears.'),
     'field' => array(
@@ -215,7 +215,7 @@ function views_block_views_data() {
   );
 
   // Title
-  $data['blocks']['title'] = array(
+  $data['block']['title'] = array(
     'title' => t('Title'),
     'help' => t('The block title.'),
     'field' => array(
@@ -234,7 +234,7 @@ function views_block_views_data() {
   );
 
   // Cache
-  $data['blocks']['cache'] = array(
+  $data['block']['cache'] = array(
     'title' => t('Cache'),
     'help' => t('The caching settings of the block.'),
     'field' => array(
@@ -250,7 +250,7 @@ function views_block_views_data() {
   );
 
   // Link to edit block
-  $data['blocks']['edit_block'] = array(
+  $data['block']['edit_block'] = array(
     'field' => array(
       'title' => t('Edit link'),
       'help' => t('Provide a simple link to edit the block.'),
@@ -261,11 +261,11 @@ function views_block_views_data() {
   // Boxes table
   $data['boxes']['table']['group']  = t('Block');
   $data['boxes']['table']['join'] = array(
-    'blocks' => array(
+    'block' => array(
       'left_field' => 'delta',
       'field' => 'bid',
       'extra' => array(
-        array('table' => 'blocks', 'field' => 'module', 'value' => 'block'),
+        array('table' => 'block', 'field' => 'module', 'value' => 'block'),
       ),
     ),
   );