diff --git a/webform_tokens.module b/webform_tokens.module
index 561579f..4875445 100644
--- a/webform_tokens.module
+++ b/webform_tokens.module
@@ -20,11 +20,12 @@ function webform_tokens_guess_webform_version() {
  * Implements hook_token_info().
  */
 function webform_tokens_token_info() {
-  $types = array(
-    'name' => t('Webform'),
-    'description' => t('Tokens for Webform submitted data and metadata.'),
-    'needs-data' => 'webform',
+  $types['webform-tokens'] = array(
+    'name' => t('Webform Tokens-provided data'),
+    'description' => t('Tokens for Webform submitted data and metadata. The old [webform:] style will work if Webform Rules is not enabled.'),
+    'needs-data' => 'webform-submission',
   );
+
   $tokens = array();
 
   $tokens['meta-label-(Field_Key)'] = array(
@@ -90,9 +91,13 @@ function webform_tokens_token_info() {
     }
   }
 
+  $type_tokens = array(
+    'webform-tokens' => $tokens,
+  );
+
   return array(
-    'types' => array('webform' => $types),
-    'tokens' => array('webform' => $tokens),
+    'types' => $types,
+    'tokens' => $type_tokens,
   );
 }
 
@@ -102,8 +107,14 @@ function webform_tokens_token_info() {
  * The first "_tokens" is part of the module name.
  */
 function webform_tokens_tokens($type, array $tokens, array $data = array(), array $options = array()) {
-  if ($type === 'webform' && isset($data['webform']) && is_object($data['webform'])) {
-    $submission = $data['webform'];
+  // Support [webform:] tokens if Webform Rules is not enabled.
+  if ($type == 'webform' && module_exists('webform_rules') === FALSE) {
+    $type = 'webform-tokens';
+    $data['webform-tokens'] = $data['webform'];
+  }
+
+  if ($type === 'webform-tokens' && isset($data['webform-submission']) && is_object($data['webform-submission'])) {
+    $submission = $data['webform-submission'];
     $nid = $submission->nid;
     $sid = $submission->sid;
     $replacements = array();