diff --git a/stormexpense/stormexpense.module b/stormexpense/stormexpense.module
index aee366f..5fd46f1 100644
--- a/stormexpense/stormexpense.module
+++ b/stormexpense/stormexpense.module
@@ -16,19 +16,41 @@ function stormexpense_help($path, $arg) {
   return $o;
 }
 
-function stormexpense_perm() {
+function stormexpense_permission() {
   return array(
-    'Storm expense: access',
-    'Storm expense: add',
-    'Storm expense: delete all',
-    'Storm expense: delete own',
-    'Storm expense: delete of user organization',
-    'Storm expense: edit all',
-    'Storm expense: edit own',
-    'Storm expense: edit of user organization',
-    'Storm expense: view all',
-    'Storm expense: view own',
-    'Storm expense: view of user organization',
+    'Storm expense: access' => array(
+      'title' => t('Access Storm Expense'),
+    ),
+    'Storm expense: add' => array(
+      'title' => t('Add Storm Expense'),
+    ),
+    'Storm expense: delete all' => array(
+      'title' => t('Delete Any Storm Expense'),
+    ),
+    'Storm expense: delete own' => array(
+      'title' => t('Delete Authored Storm Expenses'),
+    ),
+    'Storm expense: delete of user organization' => array(
+      'title' => t('Delete  Storm Expenses in own Organization'),
+    ),
+    'Storm expense: edit all' => array(
+      'title' => t('Edit Any Storm Expense'),
+    ),
+    'Storm expense: edit own' => array(
+      'title' => t('Edit Authored Storm Expenses'),
+    ),
+    'Storm expense: edit of user organization' => array(
+      'title' => t('Edit Storm Expenses in own Organization'),
+    ),
+    'Storm expense: view all' => array(
+      'title' => t('View Any Storm Expense'),
+    ),
+    'Storm expense: view own' => array(
+      'title' => t('View Authored Storm Expenses'),
+    ),
+    'Storm expense: view of user organization' => array(
+      'title' => t('View Storm Expenses in own Organization'),
+    ),
   );
 }
 
diff --git a/storminvoice/storminvoice.module b/storminvoice/storminvoice.module
index 638439b..cd8545d 100644
--- a/storminvoice/storminvoice.module
+++ b/storminvoice/storminvoice.module
@@ -26,19 +26,41 @@ function storminvoice_help($path, $arg) {
   return $o;
 }
 
-function storminvoice_perm() {
+function storminvoice_permission() {
   return array(
-    'Storm invoice: access',
-    'Storm invoice: add',
-    'Storm invoice: delete all',
-    'Storm invoice: delete own',
-    'Storm invoice: delete of user organization',
-    'Storm invoice: edit all',
-    'Storm invoice: edit own',
-    'Storm invoice: edit of user organization',
-    'Storm invoice: view all',
-    'Storm invoice: view own',
-    'Storm invoice: view of user organization',
+    'Storm invoice: access' => array(
+      'title' => t('Access Storm Invoice'),
+    ),
+    'Storm invoice: add' => array(
+      'title' => t('Add Storm Invoices'),
+    ),
+    'Storm invoice: delete all' => array(
+      'title' => t('Delete Any Storm Invoice'),
+    ),
+    'Storm invoice: delete own' => array(
+      'title' => t('Delete Authored Storm Invoices'),
+    ),
+    'Storm invoice: delete of user organization' => array(
+      'title' => t('Delete Storm Invoices in own Organization'),
+    ),
+    'Storm invoice: edit all' => array(
+      'title' => t('Edit Any Storm Invoice'),
+    ),
+    'Storm invoice: edit own' => array(
+      'title' => t('Edit Authored Storm Invoices'),
+    ),
+    'Storm invoice: edit of user organization' => array(
+      'title' => t('Edit Storm Invoices in own Organization'),
+    ),
+    'Storm invoice: view all' => array(
+      'title' => t('View Any Storm Invoice'),
+    ),
+    'Storm invoice: view own' => array(
+      'title' => t('View Authored Storm Invoices'),
+    ),
+    'Storm invoice: view of user organization' => array(
+      'title' => t('View Storm Invoices in own Organization'),
+    ),
   );
 }
 
diff --git a/stormnote/stormnote.module b/stormnote/stormnote.module
index 6500c26..a6cb209 100644
--- a/stormnote/stormnote.module
+++ b/stormnote/stormnote.module
@@ -16,19 +16,41 @@ function stormnote_help($path, $arg) {
   return $o;
 }
 
-function stormnote_perm() {
+function stormnote_permission() {
   return array(
-    'Storm note: access',
-    'Storm note: add',
-    'Storm note: delete all',
-    'Storm note: delete own',
-    'Storm note: delete of user organization',
-    'Storm note: edit all',
-    'Storm note: edit own',
-    'Storm note: edit of user organization',
-    'Storm note: view all',
-    'Storm note: view own',
-    'Storm note: view of user organization',
+    'Storm note: access' => array(
+      'title' => t('Access Storm Note'),
+    ),
+    'Storm note: add' => array(
+      'title' => t('Add Storm Notes'),
+    ),
+    'Storm note: delete all' => array(
+      'title' => t('Delete Any Storm Note'),
+    ),
+    'Storm note: delete own' => array(
+      'title' => t('Delete Authored Storm Notes'),
+    ),
+    'Storm note: delete of user organization' => array(
+      'title' => t('Delete Storm Note in own Organization'),
+    ),
+    'Storm note: edit all' => array(
+      'title' => t('Edit Any Storm Note'),
+    ),
+    'Storm note: edit own' => array(
+      'title' => t('Edit Authored Storm Notes'),
+    ),
+    'Storm note: edit of user organization' => array(
+      'title' => t('Edit Storm Notes in own Organization'),
+    ),
+    'Storm note: view all' => array(
+      'title' => t('View Any Storm Note'),
+    ),
+    'Storm note: view own' => array(
+      'title' => t('View Authored Storm Notes'),
+    ),
+    'Storm note: view of user organization' => array(
+      'title' => t('View Storm Notes in own Organization'),
+    ),
   );
 }
 
diff --git a/stormperson/stormperson.module b/stormperson/stormperson.module
index 4ca28a0..13c95fd 100644
--- a/stormperson/stormperson.module
+++ b/stormperson/stormperson.module
@@ -55,7 +55,7 @@ function stormperson_permission() {
       'title' => t('Delete Authored Storm Person'),
     ),
     'Storm person: delete of user organization' => array(
-      'title' => t('Delete Storm Persons in user organization'),
+      'title' => t('Delete Storm Persons in own Organization'),
     ),
     'Storm person: delete when linked to own user account' => array(
       'title' => t('Delete Storm Person linked to own user account'),
@@ -67,7 +67,7 @@ function stormperson_permission() {
       'title' => t('Edit Authored Storm Person'),
     ),
     'Storm person: edit of user organization' => array(
-      'title' => t('Edit Storm Persons in user organization'),
+      'title' => t('Edit Storm Persons in own Organization'),
     ),
     'Storm person: edit when linked to own user account' => array(
       'title' => t('Edit Storm Person linked to own user account'),
@@ -79,7 +79,7 @@ function stormperson_permission() {
       'title' => t('View Authored Storm Person'),
     ),
     'Storm person: view of user organization' => array(
-      'title' => t('View Storm Persons in user organization'),
+      'title' => t('View Storm Persons in own Organization'),
     ),
     'Storm person: view when linked to own user account' => array(
       'title' => t('View Storm Person linked to own user account'),
diff --git a/stormproject/stormproject.module b/stormproject/stormproject.module
index dd08c01..5f245d6 100644
--- a/stormproject/stormproject.module
+++ b/stormproject/stormproject.module
@@ -39,7 +39,7 @@ function stormproject_permission() {
       'title' => t('Delete Authored Storm Projects'),
     ),
     'Storm project: delete of user organization' => array(
-      'title' => t('Delete Storm Projects of user organization'),
+      'title' => t('Delete Storm Projects in own Organization'),
     ),
     'Storm project: delete if project manager' => array(
       'title' => t('Delete Storm Project if project manager'),
@@ -54,7 +54,7 @@ function stormproject_permission() {
       'title' => t('Edit Authored Storm Projects'),
     ),
     'Storm project: edit of user organization' => array(
-      'title' => t('Edit Storm Project of user organization'),
+      'title' => t('Edit Storm Project in own Organization'),
     ),
     'Storm project: edit if project manager' => array(
       'title' => t('Edit Storm Project if project manager'),
@@ -69,7 +69,7 @@ function stormproject_permission() {
       'title' => t('View Authored Storm Project'),
     ),
     'Storm project: view of user organization' => array(
-      'title' => t('View Storm Project of user organization'),
+      'title' => t('View Storm Project in own Organization'),
     ),
     'Storm project: view if project manager' => array(
       'title' => t('View Storm Project if project manager'),
diff --git a/stormtask/stormtask.module b/stormtask/stormtask.module
index f507c20..ed7783c 100644
--- a/stormtask/stormtask.module
+++ b/stormtask/stormtask.module
@@ -30,7 +30,7 @@ function stormtask_permission() {
       'title' => t('Delete Authored Storm Task'),
     ),
     'Storm task: delete of user organization' => array(
-      'title' => t('Delete Storm Task of user organization'),
+      'title' => t('Delete Storm Task in own Organization'),
     ),
     'Storm task: delete if assigned to task' => array(
       'title' => t('Delete Storm Task if user assigned to task'),
@@ -42,7 +42,7 @@ function stormtask_permission() {
       'title' => t('Edit Authored Storm Task'),
     ),
     'Storm task: edit of user organization' => array(
-      'title' => t('Edit Storm Task of user organization'),
+      'title' => t('Edit Storm Task in own Organization'),
     ),
     'Storm task: edit if assigned to task' => array(
       'title' => t('Edit Storm Task if user assigned to task'),
@@ -54,7 +54,7 @@ function stormtask_permission() {
       'title' => t('View Authored'),
     ),
     'Storm task: view of user organization' => array(
-      'title' => t('View Storm Task of user organization'),
+      'title' => t('View Storm Task in own Organization'),
     ),
     'Storm task: view if assigned to task' => array(
       'title' => t('View Storm Task if user assigned to task'),
diff --git a/stormticket/stormticket.module b/stormticket/stormticket.module
index b3afea2..7637611 100644
--- a/stormticket/stormticket.module
+++ b/stormticket/stormticket.module
@@ -34,7 +34,7 @@ function stormticket_permission() {
       'title' => t('Delete Authored Storm Ticket'),
     ),
     'Storm ticket: delete of user organization' => array(
-      'title' => t('Delete Storm Ticket of user organization'),
+      'title' => t('Delete Storm Ticket in own organization'),
     ),
     'Storm ticket: delete if assigned to ticket' => array(
       'title' => t('Delete Storm Ticket if user assigned to ticket'),
@@ -46,7 +46,7 @@ function stormticket_permission() {
       'title' => t('Edit Authored Storm Ticket'),
     ),
     'Storm ticket: edit of user organization' => array(
-      'title' => t('Edit Storm Ticket of user organization'),
+      'title' => t('Edit Storm Ticket in own Organization'),
     ),
     'Storm ticket: edit if assigned to ticket' => array(
       'title' => t('Edit Storm Ticket if assigned to ticket'),
@@ -58,7 +58,7 @@ function stormticket_permission() {
       'title' => t('View Authored Storm Ticket'),
     ),
     'Storm ticket: view of user organization' => array(
-      'title' => t('View Storm Ticket of user organization'),
+      'title' => t('View Storm Ticket in own Organization'),
     ),
     'Storm ticket: view if assigned to ticket' => array(
       'title' => t('View Storm Ticket if assigned to user'),
diff --git a/stormtimetracking/stormtimetracking.module b/stormtimetracking/stormtimetracking.module
index 905d31d..80eaff3 100644
--- a/stormtimetracking/stormtimetracking.module
+++ b/stormtimetracking/stormtimetracking.module
@@ -16,19 +16,41 @@ function stormtimetracking_help($path, $arg) {
   return $o;
 }
 
-function stormtimetracking_perm() {
+function stormtimetracking_permission() {
   return array(
-    'Storm timetracking: access',
-    'Storm timetracking: add',
-    'Storm timetracking: delete all',
-    'Storm timetracking: delete own',
-    'Storm timetracking: delete of user organization',
-    'Storm timetracking: edit all',
-    'Storm timetracking: edit own',
-    'Storm timetracking: edit of user organization',
-    'Storm timetracking: view all',
-    'Storm timetracking: view own',
-    'Storm timetracking: view of user organization',
+    'Storm timetracking: access' => array(
+      'title' => t('Access Storm Timetracking'),
+    ),
+    'Storm timetracking: add' => array(
+      'title' => t('Add Storm Timetracking'),
+    ),
+    'Storm timetracking: delete all' => array(
+      'title' => t('Delete Any Storm Timetracking'),
+    ),
+    'Storm timetracking: delete own' => array(
+      'title' => t('Delete Authored Storm Timetrackings'),
+    ),
+    'Storm timetracking: delete of user organization' => array(
+      'title' => t('Delete Storm Timetrackings in own Organization'),
+    ),
+    'Storm timetracking: edit all' => array(
+      'title' => t('Edit Any Storm Timetracking'),
+    ),
+    'Storm timetracking: edit own' => array(
+      'title' => t('Edit Authored Storm Timetrackings'),
+    ),
+    'Storm timetracking: edit of user organization' => array(
+      'title' => t('Edit Storm Timetrackings in own Organization'),
+    ),
+    'Storm timetracking: view all' => array(
+      'title' => t('View Any Storm Timetracking'),
+    ),
+    'Storm timetracking: view own' => array(
+      'title' => t('View Authored Storm Timetrackings'),
+    ),
+    'Storm timetracking: view of user organization' => array(
+      'title' => t('View Storm Timetrackings in own Organization'),
+    ),
   );
 }