diff --git a/fillpdf.admin.inc b/fillpdf.admin.inc
index 3cdd941..798ba87 100644
--- a/fillpdf.admin.inc
+++ b/fillpdf.admin.inc
@@ -176,6 +176,7 @@ function fillpdf_form_edit($form, &$form_state, $fid) {
   );
 
   $form['title_tokens_fieldset']['tokens'] = _fillpdf_admin_token_form();
+
   $form['default_nid'] = array(
     '#type' => 'textfield',
     '#title' => t('Default Node ID'),
@@ -617,10 +618,7 @@ function fillpdf_field_edit($form, &$form_state, $pdf_form, $field) {
     '#collapsed' => FALSE,
     '#weight' => 5,
   );
-  $form['tokens_fieldset']['tokens'] = array(
-    '#theme' => 'token_tree',
-    '#token_types' => array('node', 'webform'),
-  );
+  $form['tokens_fieldset']['tokens'] = _fillpdf_admin_token_form();
   $form['extra'] = array(
     '#type' => 'fieldset',
     '#title' => t('Transform values on this field'),
@@ -697,7 +695,8 @@ function fillpdf_update_field(&$pdf_form, &$field, $old_key) {
 function _fillpdf_admin_token_form() {
   return array(
     '#theme' => 'token_tree',
-    '#token_types' => array('node', 'webform'),
+    '#token_types' => array('node', 'webform-tokens', 'submission'),
+    '#global_types' => FALSE,
   );
 }
 
diff --git a/fillpdf.module b/fillpdf.module
index 38a88c2..22f472f 100644
--- a/fillpdf.module
+++ b/fillpdf.module
@@ -366,8 +366,11 @@ function fillpdf_merge_pdf($fid, $nids = NULL, $webform_arr = NULL, $sample = NU
       // --- webform token replacements
       if (!empty($webforms)) {
         foreach ($webforms as $webform) {
-          $token_objects['webform'] = $webform['submission'];
-          $token = token_replace($obj->value, array('webform' => $webform['submission']), array('clear' => TRUE));
+          $token_objects += array(
+            'webform-submission' => $webform['submission'],
+          );
+
+          $token = token_replace($obj->value, $token_objects, array('clear' => TRUE));
           if ($token) {
             break;
           }