diff --git a/tests/VersioncontrolTokenTests.test b/tests/VersioncontrolTokenTests.test
index 66bfe2b..ea60749 100644
--- a/tests/VersioncontrolTokenTests.test
+++ b/tests/VersioncontrolTokenTests.test
@@ -3,7 +3,7 @@
  * @file
  *   Tests ensuring proper behavior of the integration with Token.
  *
- *   @todo test when sanitized option is passed
+ *   @todo test when sanitized option is passed?
  *   @todo test chained tokens
  */
 require_once drupal_get_path('module', 'versioncontrol') . '/tests/VersioncontrolTestCase.test';
@@ -26,14 +26,14 @@ class VersioncontrolTokenTests extends VersioncontrolTestCase {
   function testVersioncontrolBackendTokens() {
     $object = $this->testBackend;
     $tokens = array(
-      '[VersioncontrolBackend:name]' => $object->name,
-      '[VersioncontrolBackend:type]' => $object->type,
-      '[VersioncontrolBackend:description]' => $object->description,
+      '[versioncontrol-backend:name]' => $object->name,
+      '[versioncontrol-backend:type]' => $object->type,
+      '[versioncontrol-backend:description]' => $object->description,
     );
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tokens)), t('No empty tokens generated.'));
     foreach ($tokens as $name => $value) {
-      $render = token_replace($name, array('VersioncontrolBackend' => $object));
+      $render = token_replace($name, array('versioncontrol-backend' => $object));
       $this->assertEqual($render, $value, t('Token %name generated correctly.', array('%name' => $name)));
     }
   }
@@ -42,15 +42,15 @@ class VersioncontrolTokenTests extends VersioncontrolTestCase {
     $object = $this->versioncontrolCreateRepository();
     $viewer_url = l($object->name, $object->getUrlHandler()->getRepositoryViewUrl());
     $tokens = array(
-      '[VersioncontrolRepository:id]' => $object->repo_id,
-      '[VersioncontrolRepository:name]' => $object->name,
-      '[VersioncontrolRepository:backend]' => $object->vcs,
-      '[VersioncontrolRepository:viewer]' => $viewer_url,
+      '[versioncontrol-repository:id]' => $object->repo_id,
+      '[versioncontrol-repository:name]' => $object->name,
+      '[versioncontrol-repository:backend]' => $object->vcs,
+      '[versioncontrol-repository:viewer]' => $viewer_url,
     );
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tokens)), t('No empty tokens generated.'));
     foreach ($tokens as $name => $value) {
-      $render = token_replace($name, array('VersioncontrolRepository' => $object));
+      $render = token_replace($name, array('versioncontrol-repository' => $object));
       $this->assertEqual($render, $value, t('Token %name generated correctly.', array('%name' => $name)));
     }
   }
@@ -58,18 +58,18 @@ class VersioncontrolTokenTests extends VersioncontrolTestCase {
   function testVersioncontrolOperationTokens() {
     $object = $this->versioncontrolCreateOperation();
     $tokens = array(
-      '[VersioncontrolOperation:id]' => $object->vc_op_id,
-      '[VersioncontrolOperation:revision]' => $object->revision,
-      '[VersioncontrolOperation:author_date]' => format_date($object->author_date, 'medium'),
-      '[VersioncontrolOperation:committer_date]' => format_date($object->committer_date, 'medium'),
-      '[VersioncontrolOperation:author]' => $object->author,
-      '[VersioncontrolOperation:committer]' => $object->committer,
-      '[VersioncontrolOperation:message]' => check_plain($object->message),
+      '[versioncontrol-operation:id]' => $object->vc_op_id,
+      '[versioncontrol-operation:revision]' => $object->revision,
+      '[versioncontrol-operation:author_date]' => format_date($object->author_date, 'medium'),
+      '[versioncontrol-operation:committer_date]' => format_date($object->committer_date, 'medium'),
+      '[versioncontrol-operation:author]' => $object->author,
+      '[versioncontrol-operation:committer]' => $object->committer,
+      '[versioncontrol-operation:message]' => check_plain($object->message),
     );
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tokens)), t('No empty tokens generated.'));
     foreach ($tokens as $name => $value) {
-      $render = token_replace($name, array('VersioncontrolOperation' => $object));
+      $render = token_replace($name, array('versioncontrol-operation' => $object));
       $this->assertEqual($render, $value, t('Token %name generated correctly.', array('%name' => $name)));
     }
   }
@@ -77,13 +77,13 @@ class VersioncontrolTokenTests extends VersioncontrolTestCase {
   function testVersioncontrolBranchTokens() {
     $object = $this->versioncontrolCreateBranch();
     $tokens = array(
-      '[VersioncontrolBranch:id]' => $object->label_id,
-      '[VersioncontrolBranch:name]' => $object->name,
+      '[versioncontrol-branch:id]' => $object->label_id,
+      '[versioncontrol-branch:name]' => $object->name,
     );
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tokens)), t('No empty tokens generated.'));
     foreach ($tokens as $name => $value) {
-      $render = token_replace($name, array('VersioncontrolBranch' => $object));
+      $render = token_replace($name, array('versioncontrol-branch' => $object));
       $this->assertEqual($render, $value, t('Token %name generated correctly.', array('%name' => $name)));
     }
   }
@@ -91,13 +91,13 @@ class VersioncontrolTokenTests extends VersioncontrolTestCase {
   function testVersioncontrolTagTokens() {
     $object = $this->versioncontrolCreateTag();
     $tokens = array(
-      '[VersioncontrolTag:id]' => $object->label_id,
-      '[VersioncontrolTag:name]' => $object->name,
+      '[versioncontrol-tag:id]' => $object->label_id,
+      '[versioncontrol-tag:name]' => $object->name,
     );
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tokens)), t('No empty tokens generated.'));
     foreach ($tokens as $name => $value) {
-      $render = token_replace($name, array('VersioncontrolTag' => $object));
+      $render = token_replace($name, array('versioncontrol-tag' => $object));
       $this->assertEqual($render, $value, t('Token %name generated correctly.', array('%name' => $name)));
     }
   }
@@ -106,20 +106,20 @@ class VersioncontrolTokenTests extends VersioncontrolTestCase {
     $object = $this->versioncontrolCreateItem();
     $action_strings = versioncontrol_revision_actions();
     $tokens = array(
-      '[VersioncontrolItem:id]' => $object->item_revision_id,
-      '[VersioncontrolItem:operation]' => $object->vc_op_id,
-      '[VersioncontrolItem:repository]' => $object->repo_id,
-      '[VersioncontrolItem:path]' => $object->path,
-      '[VersioncontrolItem:revision]' => $object->revision,
-      '[VersioncontrolItem:source_item]' => $object->source_item_revision_id,
-      '[VersioncontrolItem:action]' => $action_strings[$object->action],
-      '[VersioncontrolItem:line_changes_added]' => $object->line_changes_added,
-      '[VersioncontrolItem:line_changes_removed]' => $object->line_changes_removed,
+      '[versioncontrol-item:id]' => $object->item_revision_id,
+      '[versioncontrol-item:operation]' => $object->vc_op_id,
+      '[versioncontrol-item:repository]' => $object->repo_id,
+      '[versioncontrol-item:path]' => $object->path,
+      '[versioncontrol-item:revision]' => $object->revision,
+      '[versioncontrol-item:source_item]' => $object->source_item_revision_id,
+      '[versioncontrol-item:action]' => $action_strings[$object->action],
+      '[versioncontrol-item:line_changes_added]' => $object->line_changes_added,
+      '[versioncontrol-item:line_changes_removed]' => $object->line_changes_removed,
     );
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tokens)), t('No empty tokens generated.'));
     foreach ($tokens as $name => $value) {
-      $render = token_replace($name, array('VersioncontrolItem' => $object));
+      $render = token_replace($name, array('versioncontrol-item' => $object));
       $this->assertEqual($render, $value, t('Token %name generated correctly.', array('%name' => $name)));
     }
   }
@@ -127,15 +127,15 @@ class VersioncontrolTokenTests extends VersioncontrolTestCase {
   function testVersioncontrolEventTokens() {
     $object = $this->versioncontrolCreateEvent();
     $tokens = array(
-      '[VersioncontrolEvent:id]' => $object->elid,
-      '[VersioncontrolEvent:repository]' => $object->repo_id,
-      '[VersioncontrolEvent:date]' => format_date($object->timestamp, 'medium'),
-      '[VersioncontrolEvent:actor]' => $object->uid,
+      '[versioncontrol-event:id]' => $object->elid,
+      '[versioncontrol-event:repository]' => $object->repo_id,
+      '[versioncontrol-event:date]' => format_date($object->timestamp, 'medium'),
+      '[versioncontrol-event:actor]' => $object->uid,
     );
     // Test to make sure that we generated something for each token.
     $this->assertFalse(in_array(0, array_map('strlen', $tokens)), t('No empty tokens generated.'));
     foreach ($tokens as $name => $value) {
-      $render = token_replace($name, array('VersioncontrolEvent' => $object));
+      $render = token_replace($name, array('versioncontrol-event' => $object));
       $this->assertEqual($render, $value, t('Token %name generated correctly.', array('%name' => $name)));
     }
   }
diff --git a/versioncontrol.tokens.inc b/versioncontrol.tokens.inc
index a12e3cb..407aead 100644
--- a/versioncontrol.tokens.inc
+++ b/versioncontrol.tokens.inc
@@ -11,12 +11,12 @@ function versioncontrol_token_info() {
   $info = array();
 
   // Backend.
-  $info['types']['VersioncontrolBackend'] = array(
+  $info['types']['versioncontrol-backend'] = array(
     'name' => t('Version Control Backend'),
     'description' => t('Tokens related to backends.'),
-    'needs-data' => 'VersioncontrolBackend',
+    'needs-data' => 'versioncontrol-backend',
   );
-  $info['tokens']['VersioncontrolBackend'] = array(
+  $info['tokens']['versioncontrol-backend'] = array(
     'name' => array(
       'name'=> t('Backend name'),
       'description' => t('The name of the backend'),
@@ -32,12 +32,12 @@ function versioncontrol_token_info() {
   );
 
   // Repository.
-  $info['types']['VersioncontrolRepository'] = array(
+  $info['types']['versioncontrol-repository'] = array(
     'name' => t('Version Control Repository'),
     'description' => t('Tokens related to repositories.'),
-    'needs-data' => 'VersioncontrolRepository',
+    'needs-data' => 'versioncontrol-repository',
   );
-  $info['tokens']['VersioncontrolRepository'] = array(
+  $info['tokens']['versioncontrol-repository'] = array(
     'id' => array(
       'name'=> t('Repository ID'),
       'description' => t('The unique identifier for the repository.'),
@@ -49,7 +49,7 @@ function versioncontrol_token_info() {
     'backend' => array(
       'name'=> t('Repository backend machine name'),
       'description' => t('The backend machine name this repository uses.'),
-      'type' => 'VersioncontrolBackend',
+      'type' => 'versioncontrol-backend',
     ),
     'viewer' => array(
       'name'=> t('Repository viewer url.'),
@@ -58,12 +58,12 @@ function versioncontrol_token_info() {
   );
 
   // Operation.
-  $info['types']['VersioncontrolOperation'] = array(
+  $info['types']['versioncontrol-operation'] = array(
     'name' => t('Version Control Operation'),
     'description' => t('Tokens related to operations.'),
-    'needs-data' => 'VersioncontrolOperation',
+    'needs-data' => 'versioncontrol-operation',
   );
-  $info['tokens']['VersioncontrolOperation'] = array(
+  $info['tokens']['versioncontrol-operation'] = array(
     'id' => array(
       'name' => t('Operation ID'),
       'description' => t('The unique identifier for the operation.'),
@@ -71,7 +71,7 @@ function versioncontrol_token_info() {
     'repository' => array(
       'name' => t('Operation repository ID'),
       'description' => t('The unique identifier for the repository this operation belongs to.'),
-      'type' => 'VersioncontrolRepository',
+      'type' => 'versioncontrol-repository',
     ),
     'revision' => array(
       'name' => t('Operation revision'),
@@ -104,12 +104,12 @@ function versioncontrol_token_info() {
   );
 
   // Branch.
-  $info['types']['VersioncontrolBranch'] = array(
+  $info['types']['versioncontrol-branch'] = array(
     'name' => t('Version Control Branch'),
     'description' => t('Tokens related to branches.'),
-    'needs-data' => 'VersioncontrolBranch',
+    'needs-data' => 'versioncontrol-branch',
   );
-  $info['tokens']['VersioncontrolBranch'] = array(
+  $info['tokens']['versioncontrol-branch'] = array(
     'id' => array(
       'name' => t('Branch ID'),
       'description' => t('The unique identifier for the branch.'),
@@ -121,17 +121,17 @@ function versioncontrol_token_info() {
     'repository' => array(
       'name' => t('Branch repository ID'),
       'description' => t('The unique identifier for the repository this branch belongs to.'),
-      'type' => 'VersioncontrolRepository',
+      'type' => 'versioncontrol-repository',
     ),
   );
 
   // Tag.
-  $info['types']['VersioncontrolTag'] = array(
+  $info['types']['versioncontrol-tag'] = array(
     'name' => t('Version Control Tag'),
     'description' => t('Tokens related to tags.'),
-    'needs-data' => 'VersioncontrolTag',
+    'needs-data' => 'versioncontrol-tag',
   );
-  $info['tokens']['VersioncontrolTag'] = array(
+  $info['tokens']['versioncontrol-tag'] = array(
     'id' => array(
       'name' => t('Tag ID'),
       'description' => t('The unique identifier for the tag.'),
@@ -143,17 +143,17 @@ function versioncontrol_token_info() {
     'repository' => array(
       'name' => t('Tag repository ID'),
       'description' => t('The unique identifier for the repository this tag belongs to.'),
-      'type' => 'VersioncontrolRepository',
+      'type' => 'versioncontrol-repository',
     ),
   );
 
   // Item revision.
-  $info['types']['VersioncontrolItem'] = array(
+  $info['types']['versioncontrol-item'] = array(
     'name' => t('Version Control Item'),
     'description' => t('Tokens related to item revisions.'),
-    'needs-data' => 'VersioncontrolItem',
+    'needs-data' => 'versioncontrol-item',
   );
-  $info['tokens']['VersioncontrolItem'] = array(
+  $info['tokens']['versioncontrol-item'] = array(
     'id' => array(
       'name' => t('Item revision ID'),
       'description' => t('The unique identifier for the item revision.'),
@@ -161,12 +161,12 @@ function versioncontrol_token_info() {
     'operation' => array(
       'name' => t('Item revision operation ID'),
       'description' => t('The unique identifier for the operation this item revision belongs to.'),
-      'type' => 'VersioncontrolOperation',
+      'type' => 'versioncontrol-operation',
     ),
     'repository' => array(
       'name' => t('Item revision repository ID'),
       'description' => t('The unique identifier for the repository this item revision belongs to.'),
-      'type' => 'VersioncontrolRepository',
+      'type' => 'versioncontrol-repository',
     ),
     'path' => array(
       'name' => t('Item revision path'),
@@ -180,7 +180,7 @@ function versioncontrol_token_info() {
     'source_item' => array(
       'name' => t('Item revision type'),
       'description' => t('File-level revision of the item.'),
-      'type' => 'VersioncontrolItem',
+      'type' => 'versioncontrol-item',
     ),
     'action' => array(
       'name' => t('Item revision action'),
@@ -197,12 +197,12 @@ function versioncontrol_token_info() {
   );
 
   // Event.
-  $info['types']['VersioncontrolEvent'] = array(
+  $info['types']['versioncontrol-event'] = array(
     'name' => t('Version Control Event'),
     'description' => t('Tokens related to events.'),
-    'needs-data' => 'VersioncontrolEvent',
+    'needs-data' => 'versioncontrol-event',
   );
-  $info['tokens']['VersioncontrolEvent'] = array(
+  $info['tokens']['versioncontrol-event'] = array(
     'id' => array(
       'name' => t('Event ID'),
       'description' => t('The unique identifier for the event.'),
@@ -210,7 +210,7 @@ function versioncontrol_token_info() {
     'repository' => array(
       'name' => t('Event repository ID'),
       'description' => t('The unique identifier for the repository this event belongs to.'),
-      'type' => 'VersioncontrolRepository',
+      'type' => 'versioncontrol-repository',
     ),
     'actor' => array(
       'name' => t('Event actor user ID'),
@@ -242,7 +242,7 @@ function versioncontrol_tokens($type, $tokens, array $data = array(), array $opt
 
   foreach ($tokens as $name => $original) {
     switch ($type) {
-      case 'VersioncontrolBackend':
+      case 'versioncontrol-backend':
         switch ($name) {
           case 'name':
           case 'type':
@@ -250,7 +250,7 @@ function versioncontrol_tokens($type, $tokens, array $data = array(), array $opt
             $replacements[$original] = $sanitize ? check_plain($object->$name) : $object->$name;
         }
         break;
-      case 'VersioncontrolRepository':
+      case 'versioncontrol-repository':
         switch ($name) {
           case 'viewer':
             $replacements[$original] = l($object->name, $object->getUrlHandler()->getRepositoryViewUrl());
@@ -266,10 +266,10 @@ function versioncontrol_tokens($type, $tokens, array $data = array(), array $opt
         }
         if ($backend_tokens = token_find_with_prefix($tokens, 'backend')) {
           $backend = $object->getBackend();
-          $replacements += token_generate('VersioncontrolBackend', $backend_tokens, array('VersioncontrolBackend' => $backend), $options);
+          $replacements += token_generate('versioncontrol-backend', $backend_tokens, array('versioncontrol-backend' => $backend), $options);
         }
         break;
-      case 'VersioncontrolOperation':
+      case 'versioncontrol-operation':
         switch ($name) {
           case 'type':
             $operation_types = versioncontrol_operation_types();
@@ -308,11 +308,11 @@ function versioncontrol_tokens($type, $tokens, array $data = array(), array $opt
         if ($repository_tokens = token_find_with_prefix($tokens, 'repository')) {
           //$repository = $object->getRepository();
           $repository = versioncontrol_repository_load($object->repo_id);
-          $replacements += token_generate('VersioncontrolRepository', $repository_tokens, array('VersioncontrolRepository' => $repository), $options);
+          $replacements += token_generate('versioncontrol-repository', $repository_tokens, array('versioncontrol-repository' => $repository), $options);
         }
         break;
-      case 'VersioncontrolBranch':
-      case 'VersioncontrolTag':
+      case 'versioncontrol-branch':
+      case 'versioncontrol-tag':
         switch ($name) {
           case 'repository':
             $name = 'repo_id';
@@ -325,10 +325,10 @@ function versioncontrol_tokens($type, $tokens, array $data = array(), array $opt
         }
         if ($repository_tokens = token_find_with_prefix($tokens, 'repository')) {
           $repository = $object->getRepository();
-          $replacements += token_generate('VersioncontrolRepository', $repository_tokens, array('VersioncontrolRepository' => $repository), $options);
+          $replacements += token_generate('versioncontrol-repository', $repository_tokens, array('versioncontrol-repository' => $repository), $options);
         }
         break;
-      case 'VersioncontrolItem':
+      case 'versioncontrol-item':
         switch ($name) {
           case 'repository':
             $name = 'repo_id';
@@ -357,18 +357,18 @@ function versioncontrol_tokens($type, $tokens, array $data = array(), array $opt
         }
         if ($repository_tokens = token_find_with_prefix($tokens, 'repository')) {
           $repository = $object->getRepository();
-          $replacements += token_generate('VersioncontrolRepository', $repository_tokens, array('VersioncontrolRepository' => $repository), $options);
+          $replacements += token_generate('versioncontrol-repository', $repository_tokens, array('versioncontrol-repository' => $repository), $options);
         }
         if ($operation_tokens = token_find_with_prefix($tokens, 'operation')) {
           $operation = $object->getBackend()->loadEntity('operation', array($object->vc_op_id));
-          $replacements += token_generate('VersioncontrolOperation', $operation_tokens, array('VersioncontrolOperation' => $operation), $options);
+          $replacements += token_generate('versioncontrol-operation', $operation_tokens, array('versioncontrol-operation' => $operation), $options);
         }
         if ($source_item_tokens = token_find_with_prefix($tokens, 'source_item')) {
           $source_item = $object->getSourceItem();
-          $replacements += token_generate('VersioncontrolItem', $source_item_tokens, array('VersioncontrolItem' => $source_item), $options);
+          $replacements += token_generate('versioncontrol-item', $source_item_tokens, array('versioncontrol-item' => $source_item), $options);
         }
         break;
-      case 'VersioncontrolEvent':
+      case 'versioncontrol-event':
         switch ($name) {
           case 'repository':
             $name = 'repo_id';
@@ -388,7 +388,7 @@ function versioncontrol_tokens($type, $tokens, array $data = array(), array $opt
         }
         if ($repository_tokens = token_find_with_prefix($tokens, 'repository')) {
           $repository = $object->getRepository();
-          $replacements += token_generate('VersioncontrolRepository', $repository_tokens, array('VersioncontrolRepository' => $repository), $options);
+          $replacements += token_generate('versioncontrol-repository', $repository_tokens, array('versioncontrol-repository' => $repository), $options);
         }
         if ($date_tokens = token_find_with_prefix($tokens, 'date')) {
           $replacements += token_generate('date', $date_tokens, array('date' => $object->timestamp), $options);