diff --git a/modules/storm/storm.drush.inc b/modules/storm/storm.drush.inc
deleted file mode 100644
index 59af995..0000000
--- a/modules/storm/storm.drush.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-function storm_drush_command() {
-  $items['storm-reinstall'] = array(
-    'description' => dt('Disable, Uninstall, Reinstall storm modules in the correct order, in one cmd.'),
-    'examples' => array(
-      'drush storm-reinstall' => 'Disable, Unistall, and Reinstall SuiteDesk & sub modules'
-    ),
-  'aliases' => array('stre'),
-  );
-  return $items;
-}
-
-function drush_storm_reinstall() {
-  $sub_mods = array(
-    'stormexpense',
-    'storminvoice',
-    'stormnote',
-    'stormorganization',
-    'stormperson',
-    'stormproject',
-    'stormtask',
-    'stormteam',
-    'stormticket',
-    'stormtimetracking');
-
-  drush_invoke_process(@self, 'pm-disable', array('storm'));
-
-  drush_invoke_process(@self, 'pm-uninstall', array('stormexpense', 'storminvoice', 'stormnote', 'stormteam', 'stormtimetracking'));
-
-  drush_invoke_process(@self, 'pm-uninstall', array('stormperson', 'stormticket'));
-
-  drush_invoke_process(@self, 'pm-uninstall', array('stormtask'));
-
-  drush_invoke_process(@self, 'pm-uninstall', array('stormproject'));
-
-  drush_invoke_process(@self, 'pm-uninstall', array('stormorganization'));
-
-  drush_invoke('pm-enable', $sub_mods);
-}
-
diff --git a/modules/storm/storm.module b/modules/storm/storm.module
index 66e801f..b1239dd 100644
--- a/modules/storm/storm.module
+++ b/modules/storm/storm.module
@@ -365,6 +365,12 @@ function storm_init() {
     'watcher_notifications_templates_body_node',
     'watcher_notifications_templates_body_cmt',
     'watcher_notifications_templates_body_confirm',
+    // SuiteDesk configuration:
+    'storminvoice_payment_modes',
+    'storminvoice_cover_note_subject',
+    'storminvoice_cover_note',
+    'storminvoice_payment_terms',
+    'stormquicktt_default_title',
   );
 
   // It is intended to move these calls to pages which specifically need them rather than on hook_init.
@@ -571,7 +577,7 @@ function storm_menu() {
 
   // Admin options.
   $items['admin/settings/suitedesk'] = array(
-    'title' => 'SuiteDesk',
+    'title' => 'Configuration',
     'description' => 'SuiteDesk administration page',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('storm_admin_settings'),
diff --git a/modules/storm/storminvoice/storminvoice.module b/modules/storm/storminvoice/storminvoice.module
index 4a06941..139a5fc 100644
--- a/modules/storm/storminvoice/storminvoice.module
+++ b/modules/storm/storminvoice/storminvoice.module
@@ -863,7 +863,7 @@ function storminvoice_admin_settings() {
   $form['storminvoice_cover_note_subject'] = array(
     '#type' => 'textfield',
     '#title' => t('Cover note subject'),
-    '#default_value' => variable_get('storminvoice_cover_note_subject', t('Invoice from !site', array('!site' => variable_get('site_name', 'STORM')))),
+    '#default_value' => variable_get('storminvoice_cover_note_subject', t('Invoice from !site', array('!site' => variable_get('site_name', 'SuiteDesk')))),
     '#description' => t('Default subject for cover note.'),
     '#size' => 50,
   );
diff --git a/modules/storm/stormquicktt/stormquicktt.admin.inc b/modules/storm/stormquicktt/stormquicktt.admin.inc
index c653eda..ca091fa 100644
--- a/modules/storm/stormquicktt/stormquicktt.admin.inc
+++ b/modules/storm/stormquicktt/stormquicktt.admin.inc
@@ -10,7 +10,7 @@ function stormquicktt_settings() {
   $form['stormquicktt_default_title'] = array(
     '#type' => 'textfield',
     '#title' => t('Default title'),
-    '#default_value' => variable_get('stormquicktt_default_title', 'Auto-created by QuickTT'),
+    '#default_value' => variable_get('stormquicktt_default_title', t('Auto-generated Timetracking')),
   );
   $status_option_prj = array('none' => t('-none-'));
   $project_status = storm_attributes_bydomain('Project status');