diff --git a/if/InstruentationCalibration_v1_0/InstruentationCalibration.xml b/if/ZmodScope_Calibration_v1_0/ZmodScope_Calibration.xml
similarity index 91%
rename from if/InstruentationCalibration_v1_0/InstruentationCalibration.xml
rename to if/ZmodScope_Calibration_v1_0/ZmodScope_Calibration.xml
index f4bf9b54..958db81d 100644
--- a/if/InstruentationCalibration_v1_0/InstruentationCalibration.xml
+++ b/if/ZmodScope_Calibration_v1_0/ZmodScope_Calibration.xml
@@ -2,7 +2,7 @@
 <spirit:busDefinition xmlns:xilinx="http://www.xilinx.com" xmlns:spirit="http://www.spiritconsortium.org/XMLSchema/SPIRIT/1685-2009" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <spirit:vendor>natinst.com</spirit:vendor>
   <spirit:library>user</spirit:library>
-  <spirit:name>ZmodADC_Calibration</spirit:name>
+  <spirit:name>ZmodScope_Calibration</spirit:name>
   <spirit:version>1.0</spirit:version>
   <spirit:directConnection>false</spirit:directConnection>
   <spirit:isAddressable>false</spirit:isAddressable>
diff --git a/if/InstruentationCalibration_v1_0/InstruentationCalibration_rtl.xml b/if/ZmodScope_Calibration_v1_0/ZmodScope_Calibration_rtl.xml
similarity index 95%
rename from if/InstruentationCalibration_v1_0/InstruentationCalibration_rtl.xml
rename to if/ZmodScope_Calibration_v1_0/ZmodScope_Calibration_rtl.xml
index 37639d03..60103273 100644
--- a/if/InstruentationCalibration_v1_0/InstruentationCalibration_rtl.xml
+++ b/if/ZmodScope_Calibration_v1_0/ZmodScope_Calibration_rtl.xml
@@ -2,9 +2,9 @@
 <spirit:abstractionDefinition xmlns:xilinx="http://www.xilinx.com" xmlns:spirit="http://www.spiritconsortium.org/XMLSchema/SPIRIT/1685-2009" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <spirit:vendor>natinst.com</spirit:vendor>
   <spirit:library>user</spirit:library>
-  <spirit:name>ZmodADC_Calibration_rtl</spirit:name>
+  <spirit:name>ZmodScope_Calibration_rtl</spirit:name>
   <spirit:version>1.0</spirit:version>
-  <spirit:busType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodADC_Calibration" spirit:version="1.0"/>
+  <spirit:busType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodScope_Calibration" spirit:version="1.0"/>
   <spirit:ports>
     <spirit:port>
       <spirit:logicalName>LgCoefMult</spirit:logicalName>
diff --git a/ip/Zmods/ZmodScopeController/component.xml b/ip/Zmods/ZmodScopeController/component.xml
index 71cf59cc..1fa01668 100644
--- a/ip/Zmods/ZmodScopeController/component.xml
+++ b/ip/Zmods/ZmodScopeController/component.xml
@@ -181,8 +181,8 @@
     </spirit:busInterface>
     <spirit:busInterface>
       <spirit:name>ExtCh1Calib</spirit:name>
-      <spirit:busType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodADC_Calibration" spirit:version="1.0"/>
-      <spirit:abstractionType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodADC_Calibration_rtl" spirit:version="1.0"/>
+      <spirit:busType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodScope_Calibration" spirit:version="1.0"/>
+      <spirit:abstractionType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodScope_Calibration_rtl" spirit:version="1.0"/>
       <spirit:slave/>
       <spirit:portMaps>
         <spirit:portMap>
@@ -228,8 +228,8 @@
     </spirit:busInterface>
     <spirit:busInterface>
       <spirit:name>ExtCh2Calib</spirit:name>
-      <spirit:busType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodADC_Calibration" spirit:version="1.0"/>
-      <spirit:abstractionType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodADC_Calibration_rtl" spirit:version="1.0"/>
+      <spirit:busType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodScope_Calibration" spirit:version="1.0"/>
+      <spirit:abstractionType spirit:vendor="natinst.com" spirit:library="user" spirit:name="ZmodScope_Calibration_rtl" spirit:version="1.0"/>
       <spirit:slave/>
       <spirit:portMaps>
         <spirit:portMap>