diff --git a/mobile_tools.admin.inc b/mobile_tools.admin.inc
index 2ddca83..922adbe 100644
--- a/mobile_tools.admin.inc
+++ b/mobile_tools.admin.inc
@@ -181,10 +181,10 @@ function mobile_tools_themes_configuration_form() {
     '#suffix' => t('If enabled, !configure the settings of your mobile theme and manage the !blocks layout', array('!configure' => l('configure', 'admin/appearance/list'), '!blocks' => l('blocks', 'admin/structure/block'))) .'<br>',
     '#prefix' => $warning,
    );
-    $form['mobile_tools_theme_configuration']['mobile-tools-theme-switch'] = array(
+    $form['mobile_tools_theme_configuration']['mobile_tools_theme_switch'] = array(
     '#type' => 'radios',
     '#title' => t('When do you want to switch themes'),
-    '#default_value' => variable_get('mobile-tools-theme-switch', 'mobile-tools-no-switch'),
+    '#default_value' => variable_get('mobile_tools_theme_switch', 'mobile-tools-no-switch'),
     '#options' =>   array('mobile-tools-no-switch' => 'No theme switch', 'mobile-tools-mobile-device' => 'Switch theme for a mobile device *', 'mobile-tools-mobile-url' => 'Switch theme based on the URL'),
     '#description' => 'Choose one of these methods. *This is not recommended since using 1 url for both mobile and desktop site disable the drupal caching.',
   );
@@ -219,8 +219,8 @@ function mobile_tools_themes_configuration_form() {
 
    // for each group, checkbox and dropdown
    // Mobile
-   $mobile_groups = module_invoke(variable_get('mobile-tools-device-detection', 'mobile_tools'), 'device_groups');
-   $mobile_detection_module = variable_get('mobile-tools-device-detection', 'mobile_tools');
+   $mobile_groups = module_invoke(variable_get('mobile_tools_device_detection', 'mobile_tools'), 'device_groups');
+   $mobile_detection_module = variable_get('mobile_tools_device_detection', 'mobile_tools');
    foreach ($mobile_groups as $group => $group_title) {
       $form['mobile_tools_theme_configuration'][$mobile_detection_module . '_' . $group] = array(
         '#type' => 'fieldset',
@@ -301,10 +301,10 @@ function mobile_tools_external_modules_configuration_form() {
     '#collapsible' => TRUE,
     '#description' => t('You can let other modules do the device detection or detect if your site is being mobilised.'),
   );
-  $form['mobile_tools_detection']['mobile-tools-device-detection'] = array(
+  $form['mobile_tools_detection']['mobile_tools_device_detection'] = array(
     '#type' => 'radios',
     '#title' => 'Device detection module',
-    '#default_value' => variable_get('mobile-tools-device-detection', 'mobile_tools'),
+    '#default_value' => variable_get('mobile_tools_device_detection', 'mobile_tools'),
     '#options' => _mobile_tools_external('device-detection'),
     '#description' => t('Choose which module is in charge for detecting if the visiting device is a mobile device. The Mobile Tools provides a standard implementation. You can also use other modules'),
   );
@@ -314,10 +314,10 @@ function mobile_tools_external_modules_configuration_form() {
   if (count($device_capability) == 0) {
     $mess = 'No device capability modules installed';
   }
-  $form['mobile_tools_detection']['mobile-tools-device-capabilities'] = array(
+  $form['mobile_tools_detection']['mobile_tools_device_capabilities'] = array(
     '#type' => 'radios',
     '#title' => 'Device capability detection',
-    '#default_value' => variable_get('mobile-tools-device-capabilities', 'wurfl'),
+    '#default_value' => variable_get('mobile_tools_device_capabilities', 'wurfl'),
     '#options' => $device_capability,
     '#prefix' => $mess,
     '#description' => t('The mobile tools module gives an abstract api in order to get capabilities of the mobile devices. These capability can be fetched by calling mobile_tools_devicecapability($capability). Capability can be for example "is_wireless_device". A full range of parameters can be found on !wurfl you need at least one capability module (like !wurfl2) to use this functionality', array('!wurfl' => l('http://wurfl.sourceforge.net/help_doc.php', 'http://wurfl.sourceforge.net/help_doc.php'), '!wurfl2' => l('http://drupal.org/project/wurfl', 'http://drupal.org/project/wurfl')))
diff --git a/mobile_tools.install b/mobile_tools.install
index 1f518f9..d21ebd5 100755
--- a/mobile_tools.install
+++ b/mobile_tools.install
@@ -6,6 +6,8 @@
  */
 
 /**
+ * Implements hook_uninstall().
+ *
  * Removing the mobile user roles from the role table
  * Cleanup of the variables
  */
@@ -22,8 +24,38 @@ function mobile_tools_uninstall() {
   variable_del('mobile_tools_redirect');
   variable_del('mobile_tools_desktop_url');
   variable_del('mobile_tools_mobile_url');
-  variable_del('mobile-tools-theme-switch');
+  variable_del('mobile_tools_theme_switch');
   variable_del('mobile_tools_theme_name');
+  variable_del('mobile_tools_device_detection');
+  variable_del('mobile_tools_device_capabilities');
+}
+
+/**
+ * Implements hook_update_N().
+ *
+ * Rename variable names with a dash to comply with Drupal coding standards.
+ */
+function mobile_tools_update_7200() {
+  // Load the t function in case it isn't loaded yet
+  $t = get_t();
+  
+  $mt_device_detection = variable_get('mobile-tools-device-detection', 'mobile_tools');
+  $mt_device_capabilities = variable_get('mobile-tools-device-capabilities', 'wurfl');
+  $mt_device_capability = variable_get('mobile-tools-device-capability', 'wurfl');
+  $mt_theme_switch = variable_get('mobile-tools-theme-switch', 'mobile-tools-no-switch');
+  $mt_site_type_detection = variable_get('mobile-tools-site-type-detection', 'mobile_tools');
+
+  variable_set('mobile_tools_device_detection', $mt_device_detection);
+  variable_set('mobile_tools_device_capabilities', $mt_device_capabilities);
+  variable_set('mobile_tools_device_capability', $mt_device_capability);
+  variable_set('mobile_tools_theme_switch', $mt_theme_switch);
+  variable_set('mobile_tools_site_type_detection', $mt_site_type_detection);
+
   variable_del('mobile-tools-device-detection');
   variable_del('mobile-tools-device-capabilities');
+  variable_del('mobile-tools-device-capability');
+  variable_del('mobile-tools-theme-switch');
+  variable_del('mobile-tools-site-type-detection');
+
+  return $t('Renamed incorrect variable names.');
 }
\ No newline at end of file
diff --git a/mobile_tools.module b/mobile_tools.module
index e1b5ed6..c0df4bf 100755
--- a/mobile_tools.module
+++ b/mobile_tools.module
@@ -315,9 +315,9 @@ function mobile_tools_switch_theme($device) {
   global $custom_theme, $conf;
   // check if theme switching is forced
   $current_url_type = mobile_tools_site_type();
-  if (($current_url_type == 'mobile' &&  variable_get('mobile-tools-theme-switch', ''  ) == 'mobile-tools-mobile-url') || (variable_get('mobile-tools-theme-switch', ''  ) == 'mobile-tools-mobile-device' && $device['type']  == 'mobile') ) {
+  if (($current_url_type == 'mobile' &&  variable_get('mobile_tools_theme_switch', ''  ) == 'mobile-tools-mobile-url') || (variable_get('mobile_tools_theme_switch', ''  ) == 'mobile-tools-mobile-device' && $device['type']  == 'mobile') ) {
     $group = $device['group'];
-    $mobile_detection_module = variable_get('mobile-tools-device-detection', 'mobile_tools');
+    $mobile_detection_module = variable_get('mobile_tools_device_detection', 'mobile_tools');
     if (variable_get($mobile_detection_module . '_' . $group . '_enable', '') == 1) {
       $custom_theme = variable_get($mobile_detection_module . '_' . $group . '_theme', $conf['theme_default']);
       return $custom_theme;
@@ -330,7 +330,7 @@ function mobile_tools_switch_theme($device) {
   elseif (!empty($device['group'])){ //device groups are independent of device types
     // Allow custom themes for 'desktop' device types
     $group = $device['group'];
-    $mobile_detection_module = variable_get('mobile-tools-device-detection', 'mobile_tools');
+    $mobile_detection_module = variable_get('mobile_tools_device_detection', 'mobile_tools');
     if (variable_get($mobile_detection_module . '_' . $group . '_enable', '') == 1) {
       $custom_theme = variable_get($mobile_detection_module . '_' . $group . '_theme', $conf['theme_default']);
       return $custom_theme;
@@ -404,7 +404,7 @@ function mobile_tools_get_device() {
  *  The $device object. Other modules can implement the hook_is_mobile_device()
  */
 function mobile_tools_is_mobile_device() {
-  $device_detection = variable_get('mobile-tools-device-detection', 'mobile_tools');
+  $device_detection = variable_get('mobile_tools_device_detection', 'mobile_tools');
   drupal_load('module', $device_detection);
   if ($device_detection != 'mobile_tools') {
     return module_invoke($device_detection, 'is_mobile_device');
@@ -530,7 +530,7 @@ function mobile_tools_site_type(){
 function _mobile_tools_site_detection() {
   global $base_url, $mobile_tools_device;
   // Easy detection in case redireciton is disabled and device specific theme switching is enabled
-  if(!variable_get('mobile_tools_redirect', 0) && variable_get('mobile-tools-theme-switch', '' ) == 'mobile-tools-mobile-device'){
+  if(!variable_get('mobile_tools_redirect', 0) && variable_get('mobile_tools_theme_switch', '' ) == 'mobile-tools-mobile-device'){
     if($mobile_tools_device['type']  == 'mobile'){
       return 'mobile';
     }
@@ -600,7 +600,7 @@ function _mobile_tools_site_detection() {
  *  Array containing the device group detected by this module
  */
 function mobile_tools_device_groups() {
-  $device_detection = variable_get('mobile-tools-device-detection', 'mobile_tools');
+  $device_detection = variable_get('mobile_tools_device_detection', 'mobile_tools');
   drupal_load('module', $device_detection);
   if ($device_detection != 'mobile_tools') {
     return module_invoke($device_detection, 'device_groups');
diff --git a/mobile_tools_roles.inc b/mobile_tools_roles.inc
index 8f8b4d5..c1f85db 100644
--- a/mobile_tools_roles.inc
+++ b/mobile_tools_roles.inc
@@ -11,7 +11,7 @@ function mobile_tools_roles_boot() {
   if ($item->count > 0) {
     foreach ($roles as $key => $value) {
       $role = mobile_tools_roles_info(array('id' => $key));
-      if ($role->type == 'desktop' && $role->has_sibling == 1 && ($_SESSION['mobile-tools-site-type'] == 'mobile' || ($_SESSION['mobile-tools-mobile-device']['type'] == 'mobile' && variable_get('mobile-tools-theme-switch', FALSE) == 'mobile-tools-mobile-device'))) {
+      if ($role->type == 'desktop' && $role->has_sibling == 1 && ($_SESSION['mobile-tools-site-type'] == 'mobile' || ($_SESSION['mobile-tools-mobile-device']['type'] == 'mobile' && variable_get('mobile_tools_theme_switch', FALSE) == 'mobile-tools-mobile-device'))) {
         unset($user->roles[$key]);
         $user->roles[$role->sibling['id']] = $role->sibling['name'];
       }
diff --git a/mobile_tools_roles.module b/mobile_tools_roles.module
index 010bfe0..68b2958 100644
--- a/mobile_tools_roles.module
+++ b/mobile_tools_roles.module
@@ -29,7 +29,7 @@ function mobile_tools_roles_boot() {
   if ($item->count > 0) {
     foreach ($roles as $key => $value) {
       $role = mobile_tools_roles_info(array('id' => $key));
-      if ($role->type == 'desktop' && $role->has_sibling == 1 && ($_SESSION['mobile-tools-site-type'] == 'mobile' || ($_SESSION['mobile-tools-mobile-device']['type'] == 'mobile' && variable_get('mobile-tools-theme-switch', FALSE) == 'mobile-tools-mobile-device'))) {
+      if ($role->type == 'desktop' && $role->has_sibling == 1 && ($_SESSION['mobile-tools-site-type'] == 'mobile' || ($_SESSION['mobile-tools-mobile-device']['type'] == 'mobile' && variable_get('mobile_tools_theme_switch', FALSE) == 'mobile-tools-mobile-device'))) {
         unset($user->roles[$key]);
         $user->roles[$role->sibling['id']] = $role->sibling['name'];
       }