diff --git a/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/DeviceDescriptionDiscoveryCisco9kImpl.java b/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/DeviceDescriptionDiscoveryCiscoImpl.java
similarity index 98%
rename from drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/DeviceDescriptionDiscoveryCisco9kImpl.java
rename to drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/DeviceDescriptionDiscoveryCiscoImpl.java
index 0827d09..2703780 100644
--- a/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/DeviceDescriptionDiscoveryCisco9kImpl.java
+++ b/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/DeviceDescriptionDiscoveryCiscoImpl.java
@@ -51,9 +51,9 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
- * Discovers the device, ports information from a Cisco Nexus 9K REST device.
+ * Discovers the device, ports information from a Cisco Nexus Switch REST device.
  */
-public class DeviceDescriptionDiscoveryCisco9kImpl extends AbstractHandlerBehaviour
+public class DeviceDescriptionDiscoveryCiscoImpl extends AbstractHandlerBehaviour
         implements DeviceDescriptionDiscovery {
     private final Logger log = getLogger(getClass());
 
diff --git a/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/LinkDiscoveryCisco9kImpl.java b/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/LinkDiscoveryCiscoImpl.java
similarity index 98%
rename from drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/LinkDiscoveryCisco9kImpl.java
rename to drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/LinkDiscoveryCiscoImpl.java
index b8a2016..77f5eb4 100644
--- a/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/LinkDiscoveryCisco9kImpl.java
+++ b/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/LinkDiscoveryCiscoImpl.java
@@ -63,9 +63,9 @@
 
 
 /**
- * Discovers the links from a Cisco Nexus 9K REST device.
+ * Discovers the links from a Cisco Nexus Switch REST device.
  */
-public class LinkDiscoveryCisco9kImpl extends AbstractHandlerBehaviour implements LinkDiscovery {
+public class LinkDiscoveryCiscoImpl extends AbstractHandlerBehaviour implements LinkDiscovery {
 
     private static final String SHOW_LLDP_NEIGHBOR_DETAIL_CMD = "show lldp neighbor detail";
     private static final String UNKNOWN = "unknown";
diff --git a/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/PortDiscoveryCiscoImpl.java b/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/PortDiscoveryCiscoImpl.java
index f63932c..b46fc50 100644
--- a/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/PortDiscoveryCiscoImpl.java
+++ b/drivers/cisco/rest/src/main/java/org/onosproject/drivers/cisco/rest/PortDiscoveryCiscoImpl.java
@@ -29,6 +29,6 @@
 
     @Deprecated
     public List<PortDescription> getPorts() {
-        return new DeviceDescriptionDiscoveryCisco9kImpl().discoverPortDetails();
+        return new DeviceDescriptionDiscoveryCiscoImpl().discoverPortDetails();
     }
 }
diff --git a/drivers/cisco/rest/src/main/resources/cisco-rest-drivers.xml b/drivers/cisco/rest/src/main/resources/cisco-rest-drivers.xml
index b201fd7..4c97f7f 100644
--- a/drivers/cisco/rest/src/main/resources/cisco-rest-drivers.xml
+++ b/drivers/cisco/rest/src/main/resources/cisco-rest-drivers.xml
@@ -21,8 +21,8 @@
         <behaviour api="org.onosproject.net.behaviour.ControllerConfig"
                    impl="org.onosproject.drivers.cisco.rest.ControllerConfigCiscoImpl"/>
         <behaviour api="org.onosproject.net.device.DeviceDescriptionDiscovery"
-                   impl="org.onosproject.drivers.cisco.rest.DeviceDescriptionDiscoveryCisco9kImpl"/>
+                   impl="org.onosproject.drivers.cisco.rest.DeviceDescriptionDiscoveryCiscoImpl"/>
         <behaviour api="org.onosproject.net.behaviour.LinkDiscovery"
-                   impl="org.onosproject.drivers.cisco.rest.LinkDiscoveryCisco9kImpl"/>
+                   impl="org.onosproject.drivers.cisco.rest.LinkDiscoveryCiscoImpl"/>
     </driver>
 </drivers>