Follow ONOS naming convention in PIM application

Change-Id: Id553a89630b44eafc791e54e54b043fb4182e324
diff --git a/apps/pim/src/main/java/org/onosproject/pim/cli/PimNeighborsListCommand.java b/apps/pim/src/main/java/org/onosproject/pim/cli/PimNeighborsListCommand.java
index 605ec81..502647b 100644
--- a/apps/pim/src/main/java/org/onosproject/pim/cli/PimNeighborsListCommand.java
+++ b/apps/pim/src/main/java/org/onosproject/pim/cli/PimNeighborsListCommand.java
@@ -19,9 +19,9 @@
 import org.apache.karaf.shell.commands.Command;
 import org.onlab.util.Tools;
 import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.pim.impl.PIMInterface;
-import org.onosproject.pim.impl.PIMInterfaceService;
-import org.onosproject.pim.impl.PIMNeighbor;
+import org.onosproject.pim.impl.PimInterface;
+import org.onosproject.pim.impl.PimInterfaceService;
+import org.onosproject.pim.impl.PimNeighbor;
 
 import java.util.Set;
 
@@ -37,13 +37,13 @@
 
     @Override
     protected void execute() {
-        PIMInterfaceService interfaceService = get(PIMInterfaceService.class);
+        PimInterfaceService interfaceService = get(PimInterfaceService.class);
 
-        Set<PIMInterface> interfaces = interfaceService.getPimInterfaces();
+        Set<PimInterface> interfaces = interfaceService.getPimInterfaces();
 
-        for (PIMInterface intf : interfaces) {
+        for (PimInterface intf : interfaces) {
             print(INTF_FORMAT, intf.getInterface().name(), intf.getIpAddress());
-            for (PIMNeighbor neighbor : intf.getNeighbors()) {
+            for (PimNeighbor neighbor : intf.getNeighbors()) {
                 // Filter out the PIM neighbor representing 'us'
                 if (!neighbor.ipAddress().equals(intf.getIpAddress())) {
                     print(NEIGHBOR_FORMAT, neighbor.ipAddress(),