diff --git a/checkin_notes b/checkin_notes
index 7be8484df6..cd47638a9e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9838,3 +9838,12 @@ David  24 Oct 2007
     html/user/
         merge_by_name.php
         hosts_user.php
+
+David  24 Oct 2007
+    - user web: change "host" to "computer" in a few places
+
+    html/
+        inc/
+            host.inc
+        user/
+            hosts_user.php
diff --git a/html/inc/host.inc b/html/inc/host.inc
index 92300655fd..3a3eb77159 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -142,11 +142,11 @@ function show_host($host, $private, $ipprivate, $user) {
         }
         row2("Location", location_form($host));
         if ($nresults == 0) {
-            $x = " | <a href=host_delete.php?hostid=$host->id".url_tokens($user->authenticator).">Delete this host</a> ";
+            $x = " | <a href=host_delete.php?hostid=$host->id".url_tokens($user->authenticator).">Delete this computer</a> ";
         } else {
             $x = "";
         }
-        row2("Click to", "<a href=host_edit_form.php?hostid=$host->id>merge this computer</a> $x");
+        row2("Click to", "<a href=host_edit_form.php?hostid=$host->id>Merge this computer</a> $x");
         //row2("Click to", "<a href=host_update_credit.php?hostid=$host->id>recompute credit</a>");
     }
     echo "</table>\n";
diff --git a/html/user/hosts_user.php b/html/user/hosts_user.php
index 82a70865fc..32e7e97262 100644
--- a/html/user/hosts_user.php
+++ b/html/user/hosts_user.php
@@ -9,9 +9,9 @@ require_once("../inc/cache.inc");
 
 function more_or_less($show_all) {
     if ($show_all) {
-        echo "<p>Show: All hosts  |  ".link_with_GET_variables("Only hosts active in past 30 days<p>", "hosts_user.php", 'show_all', '0');
+        echo "<p>Show: All computers  |  ".link_with_GET_variables("Only computers active in past 30 days<p>", "hosts_user.php", 'show_all', '0');
     } else {
-        echo "<p>Show: ".link_with_GET_variables("All hosts", "hosts_user.php", 'show_all', '1')."  |  Only hosts active in past 30 days<p>";;
+        echo "<p>Show: ".link_with_GET_variables("All computers", "hosts_user.php", 'show_all', '1')."  |  Only computers active in past 30 days<p>";;
     }
 }
 
@@ -134,7 +134,7 @@ if ($old_hosts>0) {
 }
 
 echo "
-    <a href=merge_by_name.php>Merge hosts by name</a>
+    <a href=merge_by_name.php>Merge computers by name</a>
 ";
 
 if ($caching) {