diff --git a/bin/mn b/bin/mn
index 048a003..1933098 100755
--- a/bin/mn
+++ b/bin/mn
@@ -41,7 +41,7 @@ from functools import partial
 from mininet.examples.cluster import ( MininetCluster, RemoteHost,
                                        RemoteOVSSwitch, RemoteLink,
                                        SwitchBinPlacer, RandomPlacer )
-from mininet.examples.clustercli import DemoCLI as ClusterCLI
+from mininet.examples.clustercli import ClusterCLI
 
 PLACEMENT = { 'block': SwitchBinPlacer, 'random': RandomPlacer }
 
diff --git a/examples/clusterSanity.py b/examples/clusterSanity.py
index ac50f2d..c840ea0 100755
--- a/examples/clusterSanity.py
+++ b/examples/clusterSanity.py
@@ -6,7 +6,7 @@ A sanity check for cluster edition
 
 from mininet.examples.cluster import MininetCluster
 from mininet.log import info, setLogLevel
-from mininet.examples.clustercli import DemoCLI as CLI
+from mininet.examples.clustercli import ClusterCLI as CLI
 from mininet.topo import SingleSwitchTopo
 
 def clusterSanity():
diff --git a/examples/clustercli.py b/examples/clustercli.py
index c8d26de..7ff0f97 100644
--- a/examples/clustercli.py
+++ b/examples/clustercli.py
@@ -8,7 +8,7 @@ from mininet.log import output, error
 nx, graphviz_layout, plt = None, None, None  # Will be imported on demand
 
 
-class DemoCLI( CLI ):
+class ClusterCLI( CLI ):
     "CLI with additional commands for Cluster Edition demo"
 
     @staticmethod
diff --git a/examples/clusterdemo.py b/examples/clusterdemo.py
index 2e90b0f..cd7d21b 100755
--- a/examples/clusterdemo.py
+++ b/examples/clusterdemo.py
@@ -5,7 +5,7 @@
 from mininet.examples.cluster import MininetCluster, SwitchBinPlacer
 from mininet.topolib import TreeTopo
 from mininet.log import setLogLevel
-from mininet.examples.clustercli import DemoCLI as CLI
+from mininet.examples.clustercli import ClusterCLI as CLI
 
 def demo():
     "Simple Demo of Cluster Mode"