diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 3e468b3a48..66bbb8d5a4 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -105,7 +105,7 @@ class ComputeManager(manager.Manager):
         self.network_manager.setup_compute_network(context, instance_id)
         self.db.instance_update(context,
                                 instance_id,
-                                {'host': self.host, 'launch_at':self.host})
+                                {'host': self.host, 'launched_on':self.host})
 
         # TODO(vish) check to make sure the availability zone matches
         self.db.instance_set_state(context,
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 7f3a58bcb8..c3e566c6a3 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -234,9 +234,9 @@ class Instance(BASE, NovaBase):
     display_name = Column(String(255))
     display_description = Column(String(255))
 
-    # To remember at which host a instance booted.
+    # To remember on which host a instance booted.
     # An instance may moved to other host by live migraiton.
-    launch_at = Column(String(255))
+    launched_on = Column(String(255))
 
     # TODO(vish): see Ewan's email about state improvements, probably
     #             should be in a driver base class or some such
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index 0921e3791f..fe3ca9d5e3 100644
--- a/nova/scheduler/manager.py
+++ b/nova/scheduler/manager.py
@@ -82,7 +82,7 @@ class SchedulerManager(manager.Manager):
         instance_id = instance_ref['id']
 
         # 2. get src host and dst host
-        src = instance_ref['launch_at']
+        src = instance_ref['launched_on']
         shost_ref = db.host_get_by_name(context, src )
         dhost_ref = db.host_get_by_name(context, dest)