diff --git a/nova/db/api.py b/nova/db/api.py
index 3b427cefed..43e1c2183e 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -154,19 +154,19 @@ def service_update(context, service_id, values):
 
 
 def compute_node_get(context, compute_id, session=None):
-    """Get an computeService or raise if it does not exist."""
+    """Get an computeNode or raise if it does not exist."""
     return IMPL.compute_node_get(context, compute_id)
 
 
 def compute_node_create(context, values):
-    """Create a computeService from the values dictionary."""
+    """Create a computeNode from the values dictionary."""
     return IMPL.compute_node_create(context, values)
 
 
 def compute_node_update(context, compute_id, values):
-    """Set the given properties on an computeService and update it.
+    """Set the given properties on an computeNode and update it.
 
-    Raises NotFound if computeService does not exist.
+    Raises NotFound if computeNode does not exist.
 
     """
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 69aa072793..b305543ffd 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -308,7 +308,7 @@ def compute_node_get(context, compute_id, session=None):
                      first()
 
     if not result:
-        raise exception.NotFound(_('No computeService for id %s') % compute_id)
+        raise exception.NotFound(_('No computeNode for id %s') % compute_id)
 
     return result