diff --git a/cod_events/cod_events.features.content.inc b/cod_events/cod_events.features.content.inc
index bcadd98..95fbe8c 100644
--- a/cod_events/cod_events.features.content.inc
+++ b/cod_events/cod_events.features.content.inc
@@ -1,7 +1,10 @@
 <?php
+/**
+ * @file
+ */
 
 /**
- * Implementation of hook_content_default_fields().
+ * Implements hook_content_default_fields().
  */
 function cod_events_content_default_fields() {
   $fields = array();
diff --git a/cod_events/cod_events.features.inc b/cod_events/cod_events.features.inc
index b199393..c119f4f 100644
--- a/cod_events/cod_events.features.inc
+++ b/cod_events/cod_events.features.inc
@@ -1,7 +1,10 @@
 <?php
+/**
+ * @file
+ */
 
 /**
- * Implementation of hook_ctools_plugin_api().
+ * Implements hook_ctools_plugin_api().
  */
 function cod_events_ctools_plugin_api() {
   list($module, $api) = func_get_args();
@@ -11,7 +14,7 @@ function cod_events_ctools_plugin_api() {
 }
 
 /**
- * Implementation of hook_views_api().
+ * Implements hook_views_api().
  */
 function cod_events_views_api() {
   return array(
diff --git a/cod_events/cod_events.info b/cod_events/cod_events.info
index efde830..4ce8d0d 100644
--- a/cod_events/cod_events.info
+++ b/cod_events/cod_events.info
@@ -1,4 +1,6 @@
-core = "6.x"
+name = "COD Events"
+package = "COD"
+core = "7.x"
 dependencies[] = "cod_base"
 dependencies[] = "date"
 dependencies[] = "date_api"
@@ -26,7 +28,3 @@ features[variable][] = "signup_node_default_state_event"
 features[variable][] = "uc_product_shippable_event"
 features[views][] = "cod_signup_user_vbo_admin_list"
 features[views_api][] = "api:2"
-name = "COD Events"
-package = "COD"
-project = "cod_events"
-version = "6.x-1.0-alpha3"
diff --git a/cod_events/cod_events.install b/cod_events/cod_events.install
index 47d3cd5..e208b49 100644
--- a/cod_events/cod_events.install
+++ b/cod_events/cod_events.install
@@ -1,6 +1,10 @@
 <?php
+/**
+ * @file
+ */
+
 /*
- * Implementation of hook_enable().
+ * Implements hook_enable().
  */
 function cod_events_enable() {
   cod_events_setup();
@@ -10,7 +14,7 @@ function cod_events_enable() {
  * Create a signup-enabled Event content type and product class.
  */
 function cod_events_setup() {
-  watchdog('cod_events', t('Performing COD Events setup.'));
+  watchdog('cod_events', 'Performing COD Events setup.');
   // Create an event content type.
   module_load_include('admin.inc', 'uc_product');
   $form_state['values']['pcid'] = 'event';
@@ -20,11 +24,11 @@ function cod_events_setup() {
   $temp_user = $user;
   session_save_session(FALSE);
   $user = user_load(1);
-  drupal_execute('uc_product_class_form', $form_state);
+  drupal_submit_form('uc_product_class_form', $form_state);
   $user = $temp_user;
   session_save_session(TRUE);
   // Rebuild features so that the event content type has the date field added.
   features_rebuild(array('cod_events' => array('content')));
-  watchdog('cod_events', t('Finished COD Events setup.'));
+  watchdog('cod_events', 'Finished COD Events setup.');
   drupal_set_message(t('Finished COD events setup.'));
-}
\ No newline at end of file
+}
diff --git a/cod_events/cod_events.module b/cod_events/cod_events.module
index 08d16ca..61456f0 100644
--- a/cod_events/cod_events.module
+++ b/cod_events/cod_events.module
@@ -1,3 +1,7 @@
 <?php
+/**
+ * @file
+ * Include the features for COD Events
+ */
 
 include_once('cod_events.features.inc');
diff --git a/cod_events/cod_events.strongarm.inc b/cod_events/cod_events.strongarm.inc
index d6ee3e8..518918c 100644
--- a/cod_events/cod_events.strongarm.inc
+++ b/cod_events/cod_events.strongarm.inc
@@ -1,7 +1,10 @@
 <?php
+/**
+ * @file
+ */
 
 /**
- * Implementation of hook_strongarm().
+ * Implements hook_strongarm().
  */
 function cod_events_strongarm() {
   $export = array();