Index: storm.module
===================================================================
--- storm.module	(revision 372)
+++ storm.module	(working copy)
@@ -166,7 +166,7 @@
     '#weight' => $w++,
   );
   
-  $form['taxation']['tax1app'] = array(
+  $form['taxation']['storm_tax1_app'] = array(
     '#type' => 'select',
     '#title' => t('Tax 1: Application'),
     '#default_value' => variable_get('storm_tax1_app', 1),
@@ -178,7 +178,7 @@
     '#weight' => $w++,
   );
   
-  $form['taxation']['tax1name'] = array(
+  $form['taxation']['storm_tax1_name'] = array(
     '#type' => 'textfield',
     '#title' => t('Tax 1: Name'),
     '#default_value' => variable_get('storm_tax1_name', 'VAT'),
@@ -186,7 +186,7 @@
     '#weight' => $w++,
   );
   
-  $form['taxation']['tax1percent'] = array(
+  $form['taxation']['storm_tax1_percent'] = array(
     '#type' => 'textfield',
     '#title' => t('Tax 1: Default percentage'),
     '#default_value' => variable_get('storm_tax1_percent', 20),
@@ -195,7 +195,7 @@
     '#weight' => $w++
   );
   
-  $form['taxation']['tax2app'] = array(
+  $form['taxation']['storm_tax2_app'] = array(
     '#type' => 'select',
     '#title' => t('Tax 2: Application'),
     '#default_value' => variable_get('storm_tax2_app', 0),
@@ -208,7 +208,7 @@
     '#weight' => $w++,
   );
   
-  $form['taxation']['tax2name'] = array(
+  $form['taxation']['storm_tax2_name'] = array(
     '#type' => 'textfield',
     '#title' => t('Tax 2: Name'),
     '#default_value' => variable_get('storm_tax2_name', 'VAT'),
@@ -216,7 +216,7 @@
     '#weight' => $w++,
   );
   
-  $form['taxation']['tax2percent'] = array(
+  $form['taxation']['storm_tax2_percent'] = array(
     '#type' => 'textfield',
     '#title' => t('Tax 2: Default percentage'),
     '#default_value' => variable_get('storm_tax2_percent', 20),