diff --git a/vmmTblApp/src/vmm_tbl.cpp b/vmmTblApp/src/vmm_tbl.cpp
index 1274a9a1c8b7807c48b1025b4a07695c80e8bddd..4b5ce9c8fb5991d775b054b2b64e080aa8dfea42 100644
--- a/vmmTblApp/src/vmm_tbl.cpp
+++ b/vmmTblApp/src/vmm_tbl.cpp
@@ -10,7 +10,7 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid
       number_hybrids(hybrids)
 {
 
-  pVmmTblAPI = FrontEndFactory::createAndRegister<VmmTblAPI>(
+  pVmmAPI = FrontEndFactory::createAndRegister<VMMAPI>(
     rmm->getRMMAPI(),
     ring,
     node,
@@ -22,11 +22,11 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid
   rmm->updateTopologyPvs(ring, node, "vmmTbl");
   if (rmm->getRMMAPI()->checkRings() == rmmSuccess) {
     for (int hyb = 0; hyb < number_hybrids; hyb++) {
-      pVmmTblAPI->enableHybrid(hyb, true);
-      setStringParam(vmmHybFwVersion_[hyb], pVmmTblAPI->readFwVersion(hyb).c_str());
-      setStringParam(vmmHybId_[hyb], pVmmTblAPI->readIDChip(hyb).c_str());
-      setStringParam(vmmHybGeoPos_[hyb], pVmmTblAPI->readGeoPos(hyb).c_str());
-      setIntegerParam(vmmHybLinkStatus_[hyb], std::stoi(pVmmTblAPI->checkLinkStatus(hyb)));
+      pVmmAPI->enableHybrid(hyb, true);
+      setStringParam(vmmHybFwVersion_[hyb], pVmmAPI->readFwVersion(hyb).c_str());
+      setStringParam(vmmHybId_[hyb], pVmmAPI->readIDChip(hyb).c_str());
+      setStringParam(vmmHybGeoPos_[hyb], pVmmAPI->readGeoPos(hyb).c_str());
+      setIntegerParam(vmmHybLinkStatus_[hyb], std::stoi(pVmmAPI->checkLinkStatus(hyb)));
   }
   }
 }
@@ -91,9 +91,9 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
     for (int vmm = 0; vmm <= 1; vmm++) {
       getIntegerParam(vmmSelectMonitorVMM0_ + vmm, &adc_sensor);
       std::cout << "adc_sensor" << adc_sensor << std::endl;
-      pVmmTblAPI->getHybrid(0).getVMM(vmm).setRegister("sm5_sm0", adc_sensor + 64);
-      pVmmTblAPI->configVMM(0, vmm);
-      int adc_read = pVmmTblAPI->readADC(0, vmm);
+      pVmmAPI->getHybrid(0).getVMM(vmm).setRegister("sm5_sm0", adc_sensor + 64);
+      pVmmAPI->configVMM(0, vmm);
+      int adc_read = pVmmAPI->readADC(0, vmm);
 
       std::cout << "adc_read" << adc_read << std::endl;
 
@@ -109,11 +109,11 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
 
   else if (function == vmmAcquire_) {
   
-    if (value) pVmmTblAPI->acquire(true);
-    else pVmmTblAPI->acquire(false);
+    if (value) pVmmAPI->acquire(true);
+    else pVmmAPI->acquire(false);
 
     for (int hyb = 0; hyb < number_hybrids; hyb++)
-      setIntegerParam(vmmHybLinkStatus_[hyb], std::stoi(pVmmTblAPI->checkLinkStatus(hyb)));
+      setIntegerParam(vmmHybLinkStatus_[hyb], std::stoi(pVmmAPI->checkLinkStatus(hyb)));
   }
 
   return status;
@@ -146,7 +146,7 @@ asynStatus VMMTbl::writeInt8Array(asynUser *pasynUser, epicsInt8 *value, size_t
 
   for (epicsInt8 i = 0; i < ncopy; ++i) {
     int8Array.push_back(static_cast<int>(value[i]) >= 1 ? 1 : 0);
-    pVmmTblAPI->getHybrid(pair.hyb).getVMM(pair.vmm).setRegister(pair.rg.c_str(),
+    pVmmAPI->getHybrid(pair.hyb).getVMM(pair.vmm).setRegister(pair.rg.c_str(),
                                                   static_cast<int>(value[i]),
                                                   i);
   }
diff --git a/vmmTblApp/src/vmm_tbl.h b/vmmTblApp/src/vmm_tbl.h
index f369eed6aac6a94cb72a9e97b9997a37b0af7537..597fd5cdab3fc6288e64433d84546b2f54d2b118 100644
--- a/vmmTblApp/src/vmm_tbl.h
+++ b/vmmTblApp/src/vmm_tbl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "rmm.h"
-#include "VmmTblAPI.h"
+#include "VMMAPI.h"
 
 /* Struct to hold Hyb, VMM pair values */
 struct Reg {
@@ -45,6 +45,6 @@ protected:
 
 private:
   static constexpr const char *driverName = "VMMTbl";
-  std::shared_ptr<VmmTblAPI> pVmmTblAPI;
+  std::shared_ptr<VMMAPI> pVmmAPI;
   int number_hybrids;
 };