diff --git storm_handler_field_attributes_domain.inc storm_handler_field_attributes_domain.inc
index 66b4365..522e234 100644
--- storm_handler_field_attributes_domain.inc
+++ storm_handler_field_attributes_domain.inc
@@ -3,7 +3,7 @@
  * @file
  * Views handler to show attribute values rather than keys in views.
  */
-class stormattribute_handler_field_attributes_domain extends views_handler_field {
+class storm_handler_field_attributes_domain extends views_handler_field {
 
   function render($values) {
     $key = $values->{$this->field_alias};
diff --git storm_handler_filter_attributes_domain.inc storm_handler_filter_attributes_domain.inc
index b7f8770..381ebe5 100644
--- storm_handler_filter_attributes_domain.inc
+++ storm_handler_filter_attributes_domain.inc
@@ -3,7 +3,7 @@
  * @file
  * Views handler to filter by attribute domain
  */
-class stormattribute_handler_filter_attributes_domain extends views_handler_filter_in_operator {
+class storm_handler_filter_attributes_domain extends views_handler_filter_in_operator {
   function get_value_options() {
     if (!isset($this->value_options)) {
       $this->value_options = storm_attributes_bydomain($this->definition['domain']);
diff --git stormexpense/stormexpense.views.inc stormexpense/stormexpense.views.inc
index 010b93a..79a6182 100644
--- stormexpense/stormexpense.views.inc
+++ stormexpense/stormexpense.views.inc
@@ -250,10 +250,10 @@ function stormexpense_views_data() {
 function stormexpense_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'stormattribute'),
+      'path' => drupal_get_path('module', 'storm'),
     ),
     'handlers' => array(
-      'stormattribute_handler_filter_attributes_domain' => array(
+      'storm_handler_filter_attributes_domain' => array(
         'parent' => 'views_handler_filter_in_operator',
       ),
       'storm_handler_field_operation' => array(
diff --git storminvoice/storminvoice.views.inc storminvoice/storminvoice.views.inc
index 409666b..537b21f 100644
--- storminvoice/storminvoice.views.inc
+++ storminvoice/storminvoice.views.inc
@@ -419,9 +419,9 @@ function storminvoice_views_handlers() {
       'path' => drupal_get_path('module', 'storminvoice'),
     ),
     'handlers' => array(
-      'stormattribute_handler_filter_attributes_domain' => array(
+      'storm_handler_filter_attributes_domain' => array(
         'parent' => 'views_handler_filter_in_operator',
-        'path' => drupal_get_path('module', 'stormattribute'),
+        'path' => drupal_get_path('module', 'storm'),
       ),
       'storm_handler_field_operation' => array(
         'parent' => 'views_handler_field_node_link',
diff --git stormnote/stormnote.views.inc stormnote/stormnote.views.inc
index 5af38eb..2549bff 100644
--- stormnote/stormnote.views.inc
+++ stormnote/stormnote.views.inc
@@ -128,10 +128,10 @@ function stormnote_views_data() {
 function stormnote_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'stormattribute'),
+      'path' => drupal_get_path('module', 'storm'),
     ),
     'handlers' => array(
-      'stormattribute_handler_filter_attributes_domain' => array(
+      'storm_handler_filter_attributes_domain' => array(
         'parent' => 'views_handler_filter_in_operator',
       ),
       'storm_handler_field_operation' => array(
diff --git stormorganization/stormorganization.views.inc stormorganization/stormorganization.views.inc
index 5b9bd8c..99d56e6 100644
--- stormorganization/stormorganization.views.inc
+++ stormorganization/stormorganization.views.inc
@@ -220,12 +220,12 @@ function stormorganization_views_data() {
     'title' => t('Currency'),
     'help' => t('Storm Organization Currency'),
     'field' => array(
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Currency',
       'click sortable' => TRUE,
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Currency',
     ),
     'sort' => array(
@@ -302,13 +302,13 @@ function stormorganization_views_data() {
 function stormorganization_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'stormattribute'),
+      'path' => drupal_get_path('module', 'storm'),
     ),
     'handlers' => array(
-      'stormattribute_handler_field_attributes_domain' => array(
+      'storm_handler_field_attributes_domain' => array(  
         'parent' => 'views_handler_field',
       ),
-      'stormattribute_handler_filter_attributes_domain' => array(
+      'storm_handler_filter_attributes_domain' => array(
         'parent' => 'views_handler_filter_in_operator',
       ),
       'storm_handler_field_operation' => array(
diff --git stormperson/stormperson.views.inc stormperson/stormperson.views.inc
index 32dfad7..25a068e 100644
--- stormperson/stormperson.views.inc
+++ stormperson/stormperson.views.inc
@@ -151,10 +151,10 @@ function stormperson_views_data() {
 function stormperson_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'stormattribute'),
+      'path' => drupal_get_path('module', 'storm'),
     ),
     'handlers' => array(
-      'stormattribute_handler_filter_attributes_domain' => array(
+      'storm_handler_filter_attributes_domain' => array(
         'parent' => 'views_handler_filter_in_operator',
       ),
       'storm_handler_field_operation' => array(
diff --git stormproject/stormproject.views.inc stormproject/stormproject.views.inc
index 9238ded..ae9874b 100644
--- stormproject/stormproject.views.inc
+++ stormproject/stormproject.views.inc
@@ -46,12 +46,12 @@ function stormproject_views_data() {
     'help' => t('Storm Project Status'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Project Status',
       'icon' => 'status',
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Project Status',
     ),
     'sort' => array(
@@ -64,12 +64,12 @@ function stormproject_views_data() {
     'help' => t('Storm Project Category'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Project Category',
       'icon' => 'projectcategory',
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Project Category',
     ),
     'sort' => array(
@@ -82,12 +82,12 @@ function stormproject_views_data() {
     'help' => t('Storm Project Priority'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Project Priority',
       'icon' => 'priority'
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Project Priority',
     ),
     'sort' => array(
@@ -309,13 +309,13 @@ function stormproject_views_data() {
 function stormproject_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'stormattribute'),
+      'path' => drupal_get_path('module', 'storm'),
     ),
     'handlers' => array(
-      'stormattribute_handler_field_attributes_domain' => array(
+      'storm_handler_field_attributes_domain' => array(
         'parent' => 'views_handler_field',
       ),
-      'stormattribute_handler_filter_attributes_domain' => array(
+      'storm_handler_filter_attributes_domain' => array(
         'parent' => 'views_handler_filter_in_operator',
       ),
       'storm_handler_field_operation' => array(
diff --git stormtask/stormtask.views.inc stormtask/stormtask.views.inc
index 7082f8d..19bc7a6 100644
--- stormtask/stormtask.views.inc
+++ stormtask/stormtask.views.inc
@@ -118,7 +118,7 @@ function stormtask_views_data() {
     'help' => t('Storm Task Status'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Task Status',
       'icon' => 'status',
     ),
@@ -126,7 +126,7 @@ function stormtask_views_data() {
       'handler' => 'views_handler_sort',
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Task Status',
     ),
   );
@@ -136,7 +136,7 @@ function stormtask_views_data() {
     'help' => t('Storm Task Category'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Task Category',
       'icon' => 'category',
     ),
@@ -144,7 +144,7 @@ function stormtask_views_data() {
       'handler' => 'views_handler_sort',
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Task Category',
     ),
   );
@@ -154,7 +154,7 @@ function stormtask_views_data() {
     'help' => t('Storm Task Priority'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Task Priority',
       'icon' => 'priority',
     ),
@@ -162,7 +162,7 @@ function stormtask_views_data() {
       'handler' => 'views_handler_sort',
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Task Priority',
     ),
   );
@@ -353,13 +353,13 @@ function stormtask_views_data() {
 function stormtask_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'stormattribute'),
+      'path' => drupal_get_path('module', 'storm'),
     ),
     'handlers' => array(
-      'stormattribute_handler_field_attributes_domain' => array(
+      'storm_handler_field_attributes_domain' => array(
         'parent' => 'views_handler_field',
       ),
-      'stormattribute_handler_filter_attributes_domain' => array(
+      'storm_handler_filter_attributes_domain' => array(
         'parent' => 'views_handler_filter_in_operator',
       ),
       'storm_handler_field_operation' => array(
diff --git stormticket/stormticket.views.inc stormticket/stormticket.views.inc
index 6c5b31e..2a471f4 100644
--- stormticket/stormticket.views.inc
+++ stormticket/stormticket.views.inc
@@ -84,12 +84,12 @@ function stormticket_views_data() {
     'help' => t('Storm Ticket category'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Ticket Category',
       'icon' => 'category',
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Ticket Category',
     ),
     'sort' => array(
@@ -102,12 +102,12 @@ function stormticket_views_data() {
     'help' => t('Storm Ticket Status'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Ticket Status',
       'icon' => 'status',
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Ticket Status',
     ),
     'sort' => array(
@@ -120,12 +120,12 @@ function stormticket_views_data() {
     'help' => t('Storm Ticket priority'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Ticket Priority',
       'icon' => 'priority',
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Ticket Priority',
     ),
     'sort' => array(
@@ -185,11 +185,11 @@ function stormticket_views_data() {
     'help' => t('Storm Ticket duration unit'),
     'field' => array(
       'click sortable' => TRUE,
-      'handler' => 'stormattribute_handler_field_attributes_domain',
+      'handler' => 'storm_handler_field_attributes_domain',
       'domain' => 'Duration unit',
     ),
     'filter' => array(
-      'handler' => 'stormattribute_handler_filter_attributes_domain',
+      'handler' => 'storm_handler_filter_attributes_domain',
       'domain' => 'Duration unit',
     ),
     'sort' => array(
@@ -282,13 +282,13 @@ function stormticket_views_data() {
 function stormticket_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'stormattribute'),
+      'path' => drupal_get_path('module', 'storm'),
     ),
     'handlers' => array(
-      'stormattribute_handler_field_attributes_domain' => array(
+      'storm_handler_field_attributes_domain' => array(
         'parent' => 'views_handler_field',
       ),
-      'stormattribute_handler_filter_attributes_domain' => array(
+      'storm_handler_filter_attributes_domain' => array(
         'parent' => 'views_handler_filter_in_operator',
       ),
       'storm_handler_field_operation' => array(
diff --git stormtimetracking/stormtimetracking.views.inc stormtimetracking/stormtimetracking.views.inc
index cb00172..f572cf8 100644
--- stormtimetracking/stormtimetracking.views.inc
+++ stormtimetracking/stormtimetracking.views.inc
@@ -243,10 +243,10 @@ function stormtimetracking_views_data() {
 function stormtimetracking_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'stormattribute'),
+      'path' => drupal_get_path('module', 'storm'),
     ),
     'handlers' => array(
-      'stormattribute_handler_filter_attributes_domain' => array(
+      'storm_handler_filter_attributes_domain' => array(
         'parent' => 'views_handler_filter_in_operator',
       ),
       'storm_handler_field_operation' => array(