diff --git a/nodepool/launcher.py b/nodepool/launcher.py
index 031653b1a..cc32f367d 100644
--- a/nodepool/launcher.py
+++ b/nodepool/launcher.py
@@ -472,6 +472,7 @@ class PoolWorker(threading.Thread, stats.StatsReporter):
         pool_config = self.getPoolConfig()
         self.component_info.content.update({
             'id': self.launcher_id,
+            'name': self.pool_name,
             'provider_name': self.provider_name,
             'supported_labels': list(pool_config.labels),
             'state': self.component_info.RUNNING,
diff --git a/nodepool/tests/unit/test_zk.py b/nodepool/tests/unit/test_zk.py
index 5b0f448ca..9ec621fe0 100644
--- a/nodepool/tests/unit/test_zk.py
+++ b/nodepool/tests/unit/test_zk.py
@@ -36,6 +36,7 @@ class TestComponentRegistry(tests.DBTestCase):
             version=get_version_string())
         launcher.content.update({
             'id': "launcher-Poolworker.provider-main-" + uuid.uuid4().hex,
+            'name': 'main',
             'provider_name': 'provider',
             'supported_labels': [],
             'state': launcher.RUNNING,
diff --git a/nodepool/zk/components.py b/nodepool/zk/components.py
index 678180d3e..983eba6a1 100644
--- a/nodepool/zk/components.py
+++ b/nodepool/zk/components.py
@@ -199,6 +199,7 @@ class PoolComponent(BaseComponent):
         super().__init__(*args, **kwargs)
         self.initial_state = {
             "id": None,
+            "name": None,
             "provider_name": None,
             "supported_labels": [],
             "priority": 100,