Index: facebook_status.module
===================================================================
--- facebook_status.module	(revision 869)
+++ facebook_status.module	(working copy)
@@ -1201,7 +1201,7 @@
   );
 }
 
-/** 
+/**
  * Implementation of hook_activityapi().
  * Activity 1.
  */
@@ -1219,7 +1219,7 @@
 function facebook_status_token_list($type = 'all') {
   if ($type == 'facebook_status' || $type == 'owner' || $type == 'poster' || $type = 'fbss-user') {
     $tokens['facebook_status'] = array(
-      'operation' => t('The operation that took place. Always "update."'),
+      'fs_operation' => t('The operation that took place. Always "update."'),
       'owner' => t('The user whose profile the status was posted on.'),
       'poster' => t('The user who posted the status.'),
       'status-unformatted' => t('The new status, emphasized and with HTML escaped but no filters or anything run over it.'),
@@ -1243,7 +1243,7 @@
   else if (($type == 'owner' || $type == 'poster' || $type = 'fbss-user') && !empty($data)) {
     $status = $data->facebook_status;
     return array(
-      'operation' => t('update'),
+      'fs_operation' => t('update'),
       'owner' => theme('username', user_load(array('uid' => $status->uid))),
       'poster' => theme('username', user_load(array('uid' => $status->pid))),
       'status-unformatted' => theme('placeholder', $status->status),