diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/AristaPipeliner.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/AristaPipeliner.java
index 8b1a508..a1d67c9 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/AristaPipeliner.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/AristaPipeliner.java
@@ -31,7 +31,7 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
- * Simple single table pipeline abstraction.
+ * Arista OpenFlow Switch single table pipeline abstraction.
  */
 public class AristaPipeliner extends DefaultSingleTablePipeline {
 
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperPipeliner.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperQfx5100Pipeliner.java
similarity index 97%
rename from drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperPipeliner.java
rename to drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperQfx5100Pipeliner.java
index f3c3a62..76a717d 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperPipeliner.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/JuniperQfx5100Pipeliner.java
@@ -46,9 +46,9 @@
 
 
 /**
- * Simple single table pipeline abstraction.
+ * Juniper QFX5100 Series Switch single table pipeline abstraction.
  */
-public class JuniperPipeliner extends DefaultSingleTablePipeline implements Pipeliner {
+public class JuniperQfx5100Pipeliner extends DefaultSingleTablePipeline implements Pipeliner {
 
     private final Logger log = getLogger(getClass());
 
diff --git a/drivers/default/src/main/resources/onos-drivers.xml b/drivers/default/src/main/resources/onos-drivers.xml
index 9316057..5b81f09 100644
--- a/drivers/default/src/main/resources/onos-drivers.xml
+++ b/drivers/default/src/main/resources/onos-drivers.xml
@@ -292,7 +292,7 @@
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.handshaker.JuniperSwitchHandshaker"/>
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
-                   impl="org.onosproject.driver.pipeline.JuniperPipeliner"/>
+                   impl="org.onosproject.driver.pipeline.JuniperQfx5100Pipeliner"/>
     </driver>
 
     <driver name="ciscoof" extends="default"