diff --git a/block_search_user.info b/block_search_user.info
index 65ecb1c..0b380e0 100644
--- a/block_search_user.info
+++ b/block_search_user.info
@@ -2,11 +2,10 @@
 name = Block Search User
 description = Adds a block to search for users on a Drupal site.
 dependencies[] = search
-core = 6.x
+core = 7.x
 
-; Information added by drupal.org packaging script on 2011-12-30
-version = "6.x-1.0-alpha2"
-core = "6.x"
+; 
+version = "7.x-1.0"
+core = "7.x"
 project = "block_search_user"
-datestamp = "1325227241"
 
diff --git a/block_search_user.module b/block_search_user.module
index 6b0e347..24228cf 100644
--- a/block_search_user.module
+++ b/block_search_user.module
@@ -24,8 +24,8 @@ function block_search_user_help($path, $arg) {
     case "admin/help#block_search_user":
       $help = '<p>' . t(
         'This module creates a block to search for users.  It is particularly useful when used in conjunction with the <a href="@quicktabs">quicktabs</a> module.  Please see the <a href="@project_page">block search user project page</a> for more information.',
-	array(
-	  '@quicktabs' => url('http://drupal.org/project/quicktabs/'),
+         array(
+          '@quicktabs' => url('http://drupal.org/project/quicktabs/'),
           '@project_page' => url('http://drupal.org/project/block_search_user/'),
         )
       ) . '</p>'; 
@@ -38,40 +38,52 @@ function block_search_user_help($path, $arg) {
 
 
 /**
- * Implementation of hook_block().
+ * Implements hook_block_info().
  */
-function block_search_user_block($op = 'list', $delta = 0) {
-  if ($op == 'list') {
-    $blocks[0]['info'] = t('Search users');
-    // Not worth caching.
-    $blocks[0]['cache'] = BLOCK_NO_CACHE;
-    return $blocks;
-  }
-  else if ($op == 'view' && user_access('search content')) {
-    $block['content'] = drupal_get_form('block_search_user_search_user_block_form');
-    $block['subject'] = t('Search');
-    return $block;
-  }
+
+function block_search_user_block_info() {
+  $block['block_search_user'] = array(
+      'info' => t('Search users'),
+);
+  return $block;
 }
 
+/**
+ * Implements hook_block_view().
+ */
+
+function block_search_user_block_view($delta='') {
+  $block = array();
+  switch ($delta) {
+    case 'block_search_user':
+      $block['subject'] = t('Search User');
+      $block['content'] = drupal_get_form('block_search_user_form');
+    break;
+}
+  return $block;
+}
+
+/**
+ * Implements hook_forms().
+ */
 function block_search_user_forms() {
-  $forms['block_search_user_search_user_block_form']= array(
-    'callback' => 'block_search_user_search_user_box',
-    'callback arguments' => array('block_search_user_search_user_block_form'),
+  $forms['block_search_user_form']= array(
+    'callback' => 'block_search_user_box',
+    'callback arguments' => array('block_search_user_form'),
   );
   return $forms;
 }
 
-function block_search_user_search_user_box(&$form_state, $form_id) {
-  $form[$form_id] = array(
-    '#title' => t('Search users'),
+function block_search_user_box($form, &$form_state, $form_id) {
+  $form['block_search_user_form'] = array(
+    '#title' => t('Search'),
     '#type' => 'textfield',
     '#size' => 15,
     '#default_value' => '',
-    '#attributes' => array('title' => t('Enter the usernames you wish to search for.')),
+    '#attributes' => array('title' => t('Enter the terms you wish to search for.')),
   );
   $form['submit'] = array('#type' => 'submit', '#value' => t('Search'));
-  $form['#submit'][] = 'block_search_user_search_user_box_form_submit';
+  $form['#submit'][] = 'block_search_user_box_form_submit';
 
   return $form;
 }
@@ -79,7 +91,7 @@ function block_search_user_search_user_box(&$form_state, $form_id) {
 /**
  * Process a block search form submission.
  */
-function block_search_user_search_user_box_form_submit($form, &$form_state) {
+function block_search_user_box_form_submit($form, &$form_state) {
   // The search form relies on control of the redirect destination for its
   // functionality, so we override any static destination set in the request,
   // for example by drupal_access_denied() or drupal_not_found()
@@ -92,5 +104,5 @@ function block_search_user_search_user_box_form_submit($form, &$form_state) {
   }
 
   $form_id = $form['form_id']['#value'];
-  $form_state['redirect'] = 'search/user/'. trim($form_state['values'][$form_id]);
+  $form_state['redirect'] = 'search/user/' . trim($form_state['values'][$form_id]);
 }