diff --git a/token_profile.module b/token_profile.module
index 43b516e..5bbe188 100644
--- token_profile.module
+++ token_profile.module
@@ -5,6 +5,8 @@
  * Provides profile tokens in Drupal 6.
  */
 
+define('TOKEN_PROFILE_PREFIX', 'token-profile-');
+
 /**
  * Implementation of hook_help().
  */
@@ -36,9 +38,11 @@ function token_profile_token_values($type, $object = NULL) {
     profile_load_profile($account);
     $fields = _token_profile_profile_fields();
 
+    $token_prefix = TOKEN_PROFILE_PREFIX . $type . '-';
+
     foreach ($fields as $name => $field) {
       $field->value = $account->$name;
-      $values[$type . ':' . $name] = _token_profile_format_field($field);
+      $values[$token_prefix . $name] = _token_profile_format_field($field);
     }
   }
 
@@ -57,10 +61,10 @@ function token_profile_token_list($type = 'all') {
 
     foreach ($fields as $name => $field) {
       if($show_node) {
-        $tokens['node']['node:' . $name] = $field->title;
+        $tokens['node'][TOKEN_PROFILE_PREFIX . 'node-' . $name] = $field->title;
       }
       if($show_user) {
-        $tokens['user']['user:' . $name] = $field->title;
+        $tokens['user'][TOKEN_PROFILE_PREFIX . 'user-' . $name] = $field->title;
       }
     }