diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf4c417a1103dddfcae21a9b66ade6468ae80a82..b38a8461628209011a9d6aa0d6f23c21ec1ccd21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,6 @@
-paraview_add_plugin(VelodynePlugin
+include(LidarViewInterpreterPlugin)
+
+lidarview_add_interpreter_plugin(Velodyne
   REQUIRED_ON_CLIENT
   REQUIRED_ON_SERVER
   VERSION "2.0"
diff --git a/VelodynePacketInterpreters/VelodyneLidarBasePacketInterpreter.xml b/VelodynePacketInterpreters/VelodyneLidarBasePacketInterpreter.xml
index 03b8ac96a06540e9eff0fe05e2299ed63e421fc1..7487fd19de8023dc4828b2fa4fdd705af22c8b2f 100644
--- a/VelodynePacketInterpreters/VelodyneLidarBasePacketInterpreter.xml
+++ b/VelodynePacketInterpreters/VelodyneLidarBasePacketInterpreter.xml
@@ -1,9 +1,9 @@
 <ServerManagerConfiguration>
-  <ProxyGroup name="internal_interpreter">
+  <ProxyGroup name="internal_velodyne">
     <Proxy name="BaseVelodynePacketInterpreter"
            class="vtkVelodyneBasePacketInterpreter"
            label="Velodyne Base Packet Interpreter"
-           base_proxygroup="internal_interpreter"
+           base_proxygroup="internal_velodyne"
            base_proxyname="CommonLidarPacketInterpreter">
 
       <StringVectorProperty name="CalibrationFileName"
diff --git a/VelodynePacketInterpreters/VelodyneLidarLegacyPacketInterpreter.xml b/VelodynePacketInterpreters/VelodyneLidarLegacyPacketInterpreter.xml
index c5435d281b2f5e96f460453631ecd9ff0f747c8d..bee7a619a377cab238b8a3daf9f997fddb8d18bf 100644
--- a/VelodynePacketInterpreters/VelodyneLidarLegacyPacketInterpreter.xml
+++ b/VelodynePacketInterpreters/VelodyneLidarLegacyPacketInterpreter.xml
@@ -1,9 +1,9 @@
 <ServerManagerConfiguration>
-  <ProxyGroup name="internal_interpreter">
+  <ProxyGroup name="internal_velodyne">
     <Proxy name="VelodyneLegacyPacketInterpreter"
            class="vtkVelodyneLegacyPacketInterpreter"
            label="Velodyne Packet Interpreter"
-           base_proxygroup="internal_interpreter"
+           base_proxygroup="internal_velodyne"
            base_proxyname="BaseVelodynePacketInterpreter">
 
       <IntVectorProperty name="LidarModel"
diff --git a/VelodynePacketInterpreters/VelodyneLidarReader.xml b/VelodynePacketInterpreters/VelodyneLidarReader.xml
index 9decd1f54f183671bd86ba9a7e1bb6bab5c693ee..9321fa4abeee82b2b57e4201b76065c763bf1f94 100644
--- a/VelodynePacketInterpreters/VelodyneLidarReader.xml
+++ b/VelodynePacketInterpreters/VelodyneLidarReader.xml
@@ -3,7 +3,7 @@
     <LidarReaderProxy name="VelodyneLidarReader"
                       class="vtkLidarReader"
                       label="Velodyne LiDAR Reader"
-                      base_proxygroup="internal_interpreter"
+                      base_proxygroup="internal_velodyne"
                       base_proxyname="CommonLidarReader">
 
       <Documentation short_help="Read Velodyne LiDAR data files." long_help="Read Velodyne LiDAR .pcap files.">
@@ -22,7 +22,7 @@
 
       <SubProxy command="SetLidarInterpreter">
         <Proxy name="PacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_velodyne"
                proxyname="VelodyneLegacyPacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="LiDAR Interpreter Options">
diff --git a/VelodynePacketInterpreters/VelodyneLidarStream.xml b/VelodynePacketInterpreters/VelodyneLidarStream.xml
index 4424a6d46af250b1ba86a9ed5d8ceda25f818c7e..569d02b82804db27d99e481745067cf07307bd05 100644
--- a/VelodynePacketInterpreters/VelodyneLidarStream.xml
+++ b/VelodynePacketInterpreters/VelodyneLidarStream.xml
@@ -3,7 +3,7 @@
     <SourceProxy name="VelodyneLidarStream"
                  class="vtkLidarStream"
                  label="Velodyne LiDAR Stream"
-                 base_proxygroup="internal_interpreter"
+                 base_proxygroup="internal_velodyne"
                  base_proxyname="CommonLidarStream">
 
       <Documentation short_help="Velodyne LiDAR data stream." long_help="Velodyne LiDAR live source stream.">
@@ -12,7 +12,7 @@
 
       <SubProxy command="SetLidarInterpreter">
         <Proxy name="PacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_velodyne"
                proxyname="VelodyneLegacyPacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="LiDAR Interpreter Options">
diff --git a/VelodynePosePacketInterpreters/VelodynePosePacketInterpreter.xml b/VelodynePosePacketInterpreters/VelodynePosePacketInterpreter.xml
index 9a4f5be26484a3088cc8a712918e67bcaf2e509a..432a7951aae6878032a21a16dce88e28e43c8930 100644
--- a/VelodynePosePacketInterpreters/VelodynePosePacketInterpreter.xml
+++ b/VelodynePosePacketInterpreters/VelodynePosePacketInterpreter.xml
@@ -1,9 +1,9 @@
 <ServerManagerConfiguration>
-  <ProxyGroup name="internal_interpreter">
+  <ProxyGroup name="internal_velodyne">
     <Proxy name="VelodynePosePacketInterpreter"
            class="vtkVelodynePosePacketInterpreter"
            label="Lidar and Pose Velodyne Interpreter"
-           base_proxygroup="internal_interpreter"
+           base_proxygroup="internal_velodyne"
            base_proxyname="CommonPosePacketInterpreter">
 
       <IntVectorProperty name="PPSSynced"
diff --git a/VelodynePosePacketInterpreters/VelodynePoseReader.xml b/VelodynePosePacketInterpreters/VelodynePoseReader.xml
index 588e4c9d66e4c4b162afb964e1442f54e5d0870f..d3d8b58e7ec5c5c8edb467fa51f7a673255b54b3 100644
--- a/VelodynePosePacketInterpreters/VelodynePoseReader.xml
+++ b/VelodynePosePacketInterpreters/VelodynePoseReader.xml
@@ -3,7 +3,7 @@
     <LidarReaderProxy name="VelodyneLidarPoseReader"
                       class="vtkLidarPoseReader"
                       label="Velodyne LiDAR + GNSS Reader"
-                      base_proxygroup="internal_interpreter"
+                      base_proxygroup="internal_velodyne"
                       base_proxyname="CommonLidarPoseReader">
 
       <Documentation short_help="Read Velodyne LiDAR data files." long_help="Read Velodyne LiDAR .pcap files.">
@@ -32,7 +32,7 @@
 
       <SubProxy command="SetLidarInterpreter">
         <Proxy name="LidarPacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_velodyne"
                proxyname="VelodyneLegacyPacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="LiDAR Interpreter Options">
@@ -66,7 +66,7 @@
 
       <SubProxy command="SetPoseInterpreter">
         <Proxy name="PosePacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_velodyne"
                proxyname="VelodynePosePacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="GNSS / IMU Transform">
diff --git a/VelodynePosePacketInterpreters/VelodynePoseStream.xml b/VelodynePosePacketInterpreters/VelodynePoseStream.xml
index fb89c017cc2f650e5d15e28cb6a6b0cb82fee15a..22d68282ff3982def5b42cb4d4d644756b0e9730 100644
--- a/VelodynePosePacketInterpreters/VelodynePoseStream.xml
+++ b/VelodynePosePacketInterpreters/VelodynePoseStream.xml
@@ -3,7 +3,7 @@
     <SourceProxy name="VelodyneLidarPoseStream"
                  class="vtkLidarPoseStream"
                  label="Velodyne LiDAR + GNSS Stream"
-                 base_proxygroup="internal_interpreter"
+                 base_proxygroup="internal_velodyne"
                  base_proxyname="CommonLidarPoseStream">
 
       <Documentation short_help="Velodyne LiDAR + GNSS stream." long_help="Velodyne LiDAR GNSS Pose live source stream.">
@@ -22,7 +22,7 @@
 
       <SubProxy command="SetLidarInterpreter">
         <Proxy name="LidarPacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_velodyne"
                proxyname="VelodyneLegacyPacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="LiDAR Interpreter Options">
@@ -56,7 +56,7 @@
 
       <SubProxy command="SetPoseInterpreter">
         <Proxy name="PosePacketInterpreter"
-               proxygroup="internal_interpreter"
+               proxygroup="internal_velodyne"
                proxyname="VelodynePosePacketInterpreter" />
         <ExposedProperties>
           <PropertyGroup label="GNSS / IMU Transform">
diff --git a/VelodyneProxies.xml b/VelodyneProxies.xml
index afeb6e5f0ce6dda4c1d2dec185fb94a0a22bf1f2..34ccf78e6e2bfb7012d17d71acd807982bd6c6f2 100644
--- a/VelodyneProxies.xml
+++ b/VelodyneProxies.xml
@@ -1,24 +1,14 @@
 <ServerManagerConfiguration>
   <ProxyGroup name="lidar_interpreters">
     <Proxy name="Velodyne"
-           base_proxygroup="internal_interpreter"
+           base_proxygroup="internal_velodyne"
            base_proxyname="BaseInterpreter">
 
-      <StringVectorProperty name="LidarReader"
-                            number_of_elements="1"
-                            override="1"
-                            default_values="VelodyneLidarReader"
-                            information_only="1" />
       <StringVectorProperty name="LidarPoseReader"
                             number_of_elements="1"
                             override="1"
                             default_values="VelodyneLidarPoseReader"
                             information_only="1" />
-      <StringVectorProperty name="LidarStream"
-                            number_of_elements="1"
-                            override="1"
-                            default_values="VelodyneLidarStream"
-                            information_only="1" />
       <StringVectorProperty name="LidarPoseStream"
                             number_of_elements="1"
                             override="1"