diff --git a/role_export.install b/role_export.install
index ea1a4bc..77f21ca 100644
--- a/role_export.install
+++ b/role_export.install
@@ -40,7 +40,7 @@ function role_export_install() {
     ->fetchAll();
   foreach ($roles as $role) {
     $rid = $role->rid;
-    $machine_name = 'role-' . str_replace(' ', '_', strtolower($role->name));
+    $machine_name = str_replace(' ', '_', strtolower($role->name));
     db_update('role')
       ->fields(array(
         'machine_name' => $machine_name,
diff --git a/role_export.module b/role_export.module
index efa619c..5b00bd2 100644
--- a/role_export.module
+++ b/role_export.module
@@ -42,7 +42,7 @@ function role_export_form_alter(&$form, &$form_state, $form_id) {
         '#type' => 'machine_name',
         '#maxlength' => 255,
         '#title_display' => 'invisible',
-        '#default_value' => str_replace('role-', '', $roles[$form['rid']['#value']]->machine_name),
+        '#default_value' => $roles[$form['rid']['#value']]->machine_name,
         // Role machine names can not be edited.
         '#disabled' => TRUE,
       );
@@ -56,7 +56,6 @@ function role_export_form_alter(&$form, &$form_state, $form_id) {
  */
 function role_export_role_name_exists($value) {
   $roles = role_export_roles();
-  $value = 'role-' . $value;
   foreach ($roles as $role) {
     if ($role->machine_name == $value) {
       return $value;
@@ -68,17 +67,6 @@ function role_export_role_name_exists($value) {
  * Save the role information to the {role} table.
  */
 function role_export_submit($form, &$form_state) {
-  $op = $form_state['values']['op'];
-  if ($op == 'Add role') {
-    $role = (object) $form_state['values'];
-    $rid = db_query('SELECT rid FROM {role} WHERE name = :rid', array(':rid' => $role->name))->fetchField();
-    db_update('role')
-      ->fields(array(
-        'machine_name' => 'role-' . $role->machine_name,
-      ))
-      ->condition('rid', $rid, '=')
-      ->execute();
-  }
   // Clear cache on 'role_export_roles' so the new/edited role will be
   // added/updated and saved back into the cache.
   cache_clear_all('role_export_roles', 'cache');