diff --git a/core/api/src/main/java/org/onlab/onos/cluster/Leadership.java b/core/api/src/main/java/org/onlab/onos/cluster/Leadership.java
index cf247f5..6be7c9b 100644
--- a/core/api/src/main/java/org/onlab/onos/cluster/Leadership.java
+++ b/core/api/src/main/java/org/onlab/onos/cluster/Leadership.java
@@ -10,10 +10,10 @@
 public class Leadership {
 
     private final String topic;
-    private final ControllerNode leader;
+    private final NodeId leader;
     private final long epoch;
 
-    public Leadership(String topic, ControllerNode leader, long epoch) {
+    public Leadership(String topic, NodeId leader, long epoch) {
         this.topic = topic;
         this.leader = leader;
         this.epoch = epoch;
@@ -28,10 +28,10 @@
     }
 
     /**
-     * The leader for this topic.
+     * The nodeId of leader for this topic.
      * @return leader node.
      */
-    public ControllerNode leader() {
+    public NodeId leader() {
         return leader;
     }