diff --git a/voltha/extensions/pki/README.md b/voltha/extensions/kpi/README.md
similarity index 95%
rename from voltha/extensions/pki/README.md
rename to voltha/extensions/kpi/README.md
index b6bce83..305ce3b 100644
--- a/voltha/extensions/pki/README.md
+++ b/voltha/extensions/kpi/README.md
@@ -1,10 +1,10 @@
-# VOLTHA Performance Monitoring/PKI Library
+# VOLTHA Performance Monitoring/KPI Library
 
 This directory provides a common library for the creation of Performance Monitoring groups
-within VOLTHA and should be used to insure that PKI information from different adapters use
+within VOLTHA and should be used to insure that KPI information from different adapters use
 the same format
 
-## PKI Manager Creation
+## KPI Manager Creation
 
 Currently, each device adapter is required to follow the following steps to create and
 register PM Metric manager. This is typically performed in the device handler's
@@ -84,12 +84,12 @@
     reactor.callLater(30, self.pm_metrics.start_collector)
 ```
 
-# Basic PKI Format
+# Basic KPI Format
 
 **TODO**: This needs to be defined by the community with assistance from the _SEBA_
 developers.
 
-The PKI information is published on the kafka bus under the _voltha.kpi_ topic. For 
+The KPI information is published on the kafka bus under the _voltha.kpi_ topic. For 
 VOLTHA PM information, the kafka key is empty and the value is a JSON message composed
 of the following key-value pairs.
 
@@ -106,8 +106,8 @@
 ```
     voltha.<device-adapter>.<device-id>.<group>[.<group-id>]
 ```
-Here is an JSON **example** of a current PKI published on the kafka bus under the 
-_voltha.pki_ topic. In this case, the _device-adapter_ is the **adtran_olt**, the _device-id_ is
+Here is an JSON **example** of a current KPI published on the kafka bus under the 
+_voltha.kpi_ topic. In this case, the _device-adapter_ is the **adtran_olt**, the _device-id_ is
 the value **0001c4397d43bc51**, the _group_ is **nni** port statistics, and the _group-id_ is the
 port number is **1**.
 
diff --git a/voltha/extensions/pki/__init__.py b/voltha/extensions/kpi/__init__.py
similarity index 100%
rename from voltha/extensions/pki/__init__.py
rename to voltha/extensions/kpi/__init__.py
diff --git a/voltha/extensions/pki/adapter_pm_metrics.py b/voltha/extensions/kpi/adapter_pm_metrics.py
similarity index 100%
rename from voltha/extensions/pki/adapter_pm_metrics.py
rename to voltha/extensions/kpi/adapter_pm_metrics.py
diff --git a/voltha/extensions/pki/olt/__init__.py b/voltha/extensions/kpi/olt/__init__.py
similarity index 100%
rename from voltha/extensions/pki/olt/__init__.py
rename to voltha/extensions/kpi/olt/__init__.py
diff --git a/voltha/extensions/pki/olt/olt_pm_metrics.py b/voltha/extensions/kpi/olt/olt_pm_metrics.py
similarity index 99%
rename from voltha/extensions/pki/olt/olt_pm_metrics.py
rename to voltha/extensions/kpi/olt/olt_pm_metrics.py
index 932aa7d..dae1803 100644
--- a/voltha/extensions/pki/olt/olt_pm_metrics.py
+++ b/voltha/extensions/kpi/olt/olt_pm_metrics.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from voltha.protos.device_pb2 import PmConfig, PmConfigs, PmGroupConfig
-from voltha.extensions.pki.adapter_pm_metrics import AdapterPmMetrics
+from voltha.extensions.kpi.adapter_pm_metrics import AdapterPmMetrics
 
 
 class OltPmMetrics(AdapterPmMetrics):
diff --git a/voltha/extensions/pki/onu/IntervalMetrics.md b/voltha/extensions/kpi/onu/IntervalMetrics.md
similarity index 100%
rename from voltha/extensions/pki/onu/IntervalMetrics.md
rename to voltha/extensions/kpi/onu/IntervalMetrics.md
diff --git a/voltha/extensions/pki/onu/__init__.py b/voltha/extensions/kpi/onu/__init__.py
similarity index 100%
rename from voltha/extensions/pki/onu/__init__.py
rename to voltha/extensions/kpi/onu/__init__.py
diff --git a/voltha/extensions/pki/onu/onu_omci_pm.py b/voltha/extensions/kpi/onu/onu_omci_pm.py
similarity index 96%
rename from voltha/extensions/pki/onu/onu_omci_pm.py
rename to voltha/extensions/kpi/onu/onu_omci_pm.py
index a1a3687..b0424d9 100644
--- a/voltha/extensions/pki/onu/onu_omci_pm.py
+++ b/voltha/extensions/kpi/onu/onu_omci_pm.py
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from voltha.protos.device_pb2 import PmConfig, PmConfigs, PmGroupConfig
-from voltha.extensions.pki.adapter_pm_metrics import AdapterPmMetrics
-from voltha.extensions.pki.onu.onu_pm_interval_metrics import OnuPmIntervalMetrics
+from voltha.protos.device_pb2 import PmConfig, PmGroupConfig
+from voltha.extensions.kpi.adapter_pm_metrics import AdapterPmMetrics
+from voltha.extensions.kpi.onu.onu_pm_interval_metrics import OnuPmIntervalMetrics
 
 
 class OnuOmciPmMetrics(AdapterPmMetrics):
diff --git a/voltha/extensions/pki/onu/onu_pm_interval_metrics.py b/voltha/extensions/kpi/onu/onu_pm_interval_metrics.py
similarity index 99%
rename from voltha/extensions/pki/onu/onu_pm_interval_metrics.py
rename to voltha/extensions/kpi/onu/onu_pm_interval_metrics.py
index 1f52e56..5b13ab8 100644
--- a/voltha/extensions/pki/onu/onu_pm_interval_metrics.py
+++ b/voltha/extensions/kpi/onu/onu_pm_interval_metrics.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from voltha.protos.device_pb2 import PmConfig, PmGroupConfig
-from voltha.extensions.pki.adapter_pm_metrics import AdapterPmMetrics
+from voltha.extensions.kpi.adapter_pm_metrics import AdapterPmMetrics
 from voltha.extensions.omci.omci_entities import \
     EthernetFrameUpstreamPerformanceMonitoringHistoryData, \
     EthernetFrameDownstreamPerformanceMonitoringHistoryData, \
diff --git a/voltha/extensions/pki/onu/onu_pm_metrics.py b/voltha/extensions/kpi/onu/onu_pm_metrics.py
similarity index 97%
rename from voltha/extensions/pki/onu/onu_pm_metrics.py
rename to voltha/extensions/kpi/onu/onu_pm_metrics.py
index 9cede63..7237a6f 100644
--- a/voltha/extensions/pki/onu/onu_pm_metrics.py
+++ b/voltha/extensions/kpi/onu/onu_pm_metrics.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 from voltha.protos.device_pb2 import PmConfig, PmConfigs, PmGroupConfig
-from voltha.extensions.pki.adapter_pm_metrics import AdapterPmMetrics
-from voltha.extensions.pki.onu.onu_omci_pm import OnuOmciPmMetrics
+from voltha.extensions.kpi.adapter_pm_metrics import AdapterPmMetrics
+from voltha.extensions.kpi.onu.onu_omci_pm import OnuOmciPmMetrics
 
 
 class OnuPmMetrics(AdapterPmMetrics):