--- smarty.engine	2006-01-09 20:19:34.000000000 -0600
+++ /home/scott/wpd/drupal-4.7.0-beta3/themes/engines/smarty/smarty.engine	2006-01-09 02:42:59.000000000 -0600
@@ -199,7 +199,7 @@ function smarty_node($node, $main = 0, $
       'title'          => check_plain($node->title),
       'node_url'       => url('node/' . $node->nid),
       'terms'          => theme('links', $taxonomy),
-      'name'           => theme('username',$node),
+      'name'           => format_name($node),
       'date'           => format_date($node->created),
       'sticky'         => $node->sticky,
       'picture'        => theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : '',
@@ -217,7 +217,7 @@ function smarty_node($node, $main = 0, $
 
   // Display info only on certain node types.
   if (theme_get_setting('toggle_node_info_' . $node->type)) {
-    $vars['submitted'] =  t('Submitted by %a on %b.', array('%a' => theme('username',$node), '%b' => format_date($node->created)));
+    $vars['submitted'] =  t('Submitted by %a on %b.', array('%a' => format_name($node), '%b' => format_date($node->created)));
   }
 
   return _smarty_callback('node', $vars, 'node-' . $node->type);
@@ -232,14 +232,14 @@ function smarty_comment($comment, $links
     'new'       => $comment->new ? t('new') : '',
     'comment'   => $comment,
     'submitted' => t('Submitted by %a on %b.',
-                      array('%a' => theme('username',$comment),
+                      array('%a' => format_name($comment),
                             '%b' => format_date($comment->timestamp))),
     'title'     => l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid"),
 
     'picture'   => theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', $comment) : '',
     'links'     => $links,
     'content'   => $comment->comment,
-    'author'    => theme('username',$comment),
+    'author'    => format_name($comment),
     'date'      => format_date($comment->timestamp)
   ));
 }