fix ITypeAndVersion ref and add tokenpool ITypeAndVersion (#192)

contracts/gas-snapshots/ccip.gas-snapshot

@@ -52,11 +52,11 @@ AggregateTokenLimiter_setAdmin:testOwnerSuccess() (gas: 18631)
 AggregateTokenLimiter_setRateLimiterConfig:testOnlyOnlyCallableByAdminOrOwnerReverts() (gas: 21552)
 AggregateTokenLimiter_setRateLimiterConfig:testOwnerSuccess() (gas: 41466)
 AggregateTokenLimiter_setRateLimiterConfig:testTokenLimitAdminSuccess() (gas: 48072)
-BurnMintERC677_burn:testPoolBurnRevertNotHealthyReverts() (gas: 58150)
-BurnMintERC677_burn:testPoolBurnSuccess() (gas: 197641)
-BurnMintERC677_mint:testPoolMintNotHealthyReverts() (gas: 55384)
-BurnMintERC677_mint:testPoolMintSuccess() (gas: 93675)
-CCIPClientExample_sanity:testExamples() (gas: 2213963)
+BurnMintERC677_burn:testPoolBurnRevertNotHealthyReverts() (gas: 58172)
+BurnMintERC677_burn:testPoolBurnSuccess() (gas: 197691)
+BurnMintERC677_mint:testPoolMintNotHealthyReverts() (gas: 55341)
+BurnMintERC677_mint:testPoolMintSuccess() (gas: 93632)
+CCIPClientExample_sanity:testExamples() (gas: 2214087)
 CommitStore_constructor:testConstructorSuccess() (gas: 3344466)
 CommitStore_isUnpausedAndARMHealthy:testARMSuccess() (gas: 71312)
 CommitStore_report:testInvalidIntervalMinLargerThanMaxReverts() (gas: 26312)
@@ -87,26 +87,26 @@ CommitStore_verify:testPausedReverts() (gas: 18438)
 CommitStore_verify:testTooManyLeavesReverts() (gas: 36830)
 DefensiveExampleTest:testHappyPathSuccess() (gas: 174828)
 DefensiveExampleTest:testRecovery() (gas: 399728)
-E2E:testE2E_3MessagesSuccess_gas() (gas: 865142)
-EVM2EVMOffRamp__releaseOrMintTokens:testRateLimitErrorsReverts() (gas: 426986)
-EVM2EVMOffRamp__releaseOrMintTokens:testTokenHandlingErrorReverts() (gas: 100073)
+E2E:testE2E_3MessagesSuccess_gas() (gas: 865196)
+EVM2EVMOffRamp__releaseOrMintTokens:testRateLimitErrorsReverts() (gas: 426656)
+EVM2EVMOffRamp__releaseOrMintTokens:testTokenHandlingErrorReverts() (gas: 100007)
 EVM2EVMOffRamp__releaseOrMintTokens:testUnsupportedTokenReverts() (gas: 18155)
-EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokensSuccess() (gas: 139040)
+EVM2EVMOffRamp__releaseOrMintTokens:test_releaseOrMintTokensSuccess() (gas: 138996)
 EVM2EVMOffRamp__report:testReportSuccess() (gas: 126633)
-EVM2EVMOffRamp__trialExecute:testRateLimitErrorSuccess() (gas: 171346)
-EVM2EVMOffRamp__trialExecute:testTokenHandlingErrorIsCaughtSuccess() (gas: 179665)
-EVM2EVMOffRamp__trialExecute:test_trialExecuteSuccess() (gas: 228022)
-EVM2EVMOffRamp_applyPoolUpdates:testApplyPoolUpdatesSuccess() (gas: 2548304)
+EVM2EVMOffRamp__trialExecute:testRateLimitErrorSuccess() (gas: 171280)
+EVM2EVMOffRamp__trialExecute:testTokenHandlingErrorIsCaughtSuccess() (gas: 179599)
+EVM2EVMOffRamp__trialExecute:test_trialExecuteSuccess() (gas: 227978)
+EVM2EVMOffRamp_applyPoolUpdates:testApplyPoolUpdatesSuccess() (gas: 2562444)
 EVM2EVMOffRamp_applyPoolUpdates:testInvalidTokenPoolConfigReverts() (gas: 17359)
 EVM2EVMOffRamp_applyPoolUpdates:testOnlyCallableByOwnerReverts() (gas: 16000)
-EVM2EVMOffRamp_applyPoolUpdates:testPoolAlreadyExistsReverts() (gas: 5153053)
-EVM2EVMOffRamp_applyPoolUpdates:testPoolDoesNotExistReverts() (gas: 2512963)
-EVM2EVMOffRamp_applyPoolUpdates:testTokenPoolMismatchReverts() (gas: 5155382)
+EVM2EVMOffRamp_applyPoolUpdates:testPoolAlreadyExistsReverts() (gas: 5181459)
+EVM2EVMOffRamp_applyPoolUpdates:testPoolDoesNotExistReverts() (gas: 2527193)
+EVM2EVMOffRamp_applyPoolUpdates:testTokenPoolMismatchReverts() (gas: 5183789)
 EVM2EVMOffRamp_ccipReceive:testReverts() (gas: 17094)
 EVM2EVMOffRamp_constructor:testCommitStoreAlreadyInUseReverts() (gas: 169122)
-EVM2EVMOffRamp_constructor:testConstructorSuccess() (gas: 5915423)
+EVM2EVMOffRamp_constructor:testConstructorSuccess() (gas: 5915400)
 EVM2EVMOffRamp_constructor:testTokenConfigMismatchReverts() (gas: 145488)
-EVM2EVMOffRamp_constructor:testZeroOnRampAddressReverts() (gas: 2651772)
+EVM2EVMOffRamp_constructor:testZeroOnRampAddressReverts() (gas: 2665993)
 EVM2EVMOffRamp_execute:testAlreadyExecutedReverts() (gas: 136560)
 EVM2EVMOffRamp_execute:testEmptyReportReverts() (gas: 18992)
 EVM2EVMOffRamp_execute:testInvalidMessageIdReverts() (gas: 33956)
@@ -120,29 +120,29 @@ EVM2EVMOffRamp_execute:testRouterYULCallReverts() (gas: 412675)
 EVM2EVMOffRamp_execute:testSingleMessageNoTokensSuccess() (gas: 172208)
 EVM2EVMOffRamp_execute:testSingleMessageToNonCCIPReceiverSuccess() (gas: 245937)
 EVM2EVMOffRamp_execute:testSingleMessagesNoTokensSuccess_gas() (gas: 114035)
-EVM2EVMOffRamp_execute:testSkippedIncorrectNonceStillExecutesSuccess() (gas: 314961)
+EVM2EVMOffRamp_execute:testSkippedIncorrectNonceStillExecutesSuccess() (gas: 314917)
 EVM2EVMOffRamp_execute:testSkippedIncorrectNonceSuccess() (gas: 51701)
 EVM2EVMOffRamp_execute:testStrictUntouchedToSuccessSuccess() (gas: 130176)
 EVM2EVMOffRamp_execute:testTokenDataMismatchReverts() (gas: 49541)
-EVM2EVMOffRamp_execute:testTwoMessagesWithTokensAndGESuccess() (gas: 430263)
-EVM2EVMOffRamp_execute:testTwoMessagesWithTokensSuccess_gas() (gas: 389536)
+EVM2EVMOffRamp_execute:testTwoMessagesWithTokensAndGESuccess() (gas: 430175)
+EVM2EVMOffRamp_execute:testTwoMessagesWithTokensSuccess_gas() (gas: 389448)
 EVM2EVMOffRamp_execute:testUnexpectedTokenDataReverts() (gas: 32945)
-EVM2EVMOffRamp_execute:testUnhealthyReverts() (gas: 406693)
+EVM2EVMOffRamp_execute:testUnhealthyReverts() (gas: 406605)
 EVM2EVMOffRamp_execute:testUnsupportedNumberOfTokensReverts() (gas: 61057)
 EVM2EVMOffRamp_execute:testUnsupportedTokenReverts() (gas: 129634)
 EVM2EVMOffRamp_executeSingleMessage:testMessageSenderReverts() (gas: 20494)
 EVM2EVMOffRamp_executeSingleMessage:testNoTokensSuccess() (gas: 47668)
 EVM2EVMOffRamp_executeSingleMessage:testNonContractSuccess() (gas: 20042)
-EVM2EVMOffRamp_executeSingleMessage:testNonContractWithTokensSuccess() (gas: 196939)
-EVM2EVMOffRamp_executeSingleMessage:testTokenHandlingErrorReverts() (gas: 136622)
-EVM2EVMOffRamp_executeSingleMessage:testTokensSuccess() (gas: 225488)
+EVM2EVMOffRamp_executeSingleMessage:testNonContractWithTokensSuccess() (gas: 196895)
+EVM2EVMOffRamp_executeSingleMessage:testTokenHandlingErrorReverts() (gas: 136556)
+EVM2EVMOffRamp_executeSingleMessage:testTokensSuccess() (gas: 225444)
 EVM2EVMOffRamp_executeSingleMessage:testZeroGasDONExecutionReverts() (gas: 48191)
 EVM2EVMOffRamp_execute_upgrade:testV2NonceNewSenderStartsAtZeroSuccess() (gas: 230624)
 EVM2EVMOffRamp_execute_upgrade:testV2NonceStartsAtV1NonceSuccess() (gas: 277815)
 EVM2EVMOffRamp_execute_upgrade:testV2OffRampNonceSkipsIfMsgInFlightSuccess() (gas: 259301)
 EVM2EVMOffRamp_execute_upgrade:testV2SenderNoncesReadsPreviousRampSuccess() (gas: 223057)
 EVM2EVMOffRamp_execute_upgrade:testV2Success() (gas: 130696)
-EVM2EVMOffRamp_getDestinationToken:testGetDestinationTokenSuccess() (gas: 32662)
+EVM2EVMOffRamp_getDestinationToken:testGetDestinationTokenSuccess() (gas: 32616)
 EVM2EVMOffRamp_getDestinationToken:testUnsupportedTokenReverts() (gas: 13728)
 EVM2EVMOffRamp_getDestinationTokens:testGetDestinationTokensSuccess() (gas: 26043)
 EVM2EVMOffRamp_getExecutionState:testFillExecutionStateSuccess() (gas: 3047472)
@@ -153,7 +153,7 @@ EVM2EVMOffRamp_manuallyExecute:testManualExecGasLimitMismatchReverts() (gas: 434
 EVM2EVMOffRamp_manuallyExecute:testManualExecInvalidGasLimitReverts() (gas: 25940)
 EVM2EVMOffRamp_manuallyExecute:testManualExecSuccess() (gas: 188359)
 EVM2EVMOffRamp_manuallyExecute:testManualExecWithGasOverrideSuccess() (gas: 188939)
-EVM2EVMOffRamp_manuallyExecute:testReentrancyManualExecuteFAILS() (gas: 1890571)
+EVM2EVMOffRamp_manuallyExecute:testReentrancyManualExecuteFAILS() (gas: 1890548)
 EVM2EVMOffRamp_metadataHash:testMetadataHashSuccess() (gas: 6074)
 EVM2EVMOffRamp_setDynamicConfig:testNonOwnerReverts() (gas: 44264)
 EVM2EVMOffRamp_setDynamicConfig:testRouterZeroAddressReverts() (gas: 38118)
@@ -166,7 +166,7 @@ EVM2EVMOnRamp_applyPoolUpdates:testOnlyCallableByOwnerReverts() (gas: 23110)
 EVM2EVMOnRamp_applyPoolUpdates:testPoolAlreadyExistsReverts() (gas: 351554)
 EVM2EVMOnRamp_applyPoolUpdates:testPoolDoesNotExistReverts() (gas: 277860)
 EVM2EVMOnRamp_applyPoolUpdates:testRemoveTokenPoolMismatchReverts() (gas: 615980)
-EVM2EVMOnRamp_constructor:testConstructorSuccess() (gas: 5731911)
+EVM2EVMOnRamp_constructor:testConstructorSuccess() (gas: 5731888)
 EVM2EVMOnRamp_forwardFromRouter:testCannotSendZeroTokensReverts() (gas: 31534)
 EVM2EVMOnRamp_forwardFromRouter:testForwardFromRouterSuccess() (gas: 126626)
 EVM2EVMOnRamp_forwardFromRouter:testForwardFromRouterSuccessCustomExtraArgs() (gas: 126938)
@@ -252,13 +252,13 @@ EVM2EVMOnRamp_withdrawNonLinkFees:testNonOwnerOrAdminReverts() (gas: 19431)
 EVM2EVMOnRamp_withdrawNonLinkFees:testSettlingBalanceSuccess() (gas: 244561)
 EVM2EVMOnRamp_withdrawNonLinkFees:testWithdrawNonLinkFeesSuccess() (gas: 50082)
 EVM2EVMOnRamp_withdrawNonLinkFees:testWithdrawToZeroAddressReverts() (gas: 12891)
-LockReleaseTokenPool_addLiquidity:testLiquidityNotAcceptedReverts() (gas: 2509153)
-LockReleaseTokenPool_canAcceptLiquidity:test_CanAcceptLiquiditySuccess() (gas: 2509647)
+LockReleaseTokenPool_addLiquidity:testLiquidityNotAcceptedReverts() (gas: 2523406)
+LockReleaseTokenPool_canAcceptLiquidity:test_CanAcceptLiquiditySuccess() (gas: 2523878)
 LockReleaseTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 21718)
 LockReleaseTokenPool_lockOrBurn:testLockOrBurnWithAllowListSuccess() (gas: 60504)
 LockReleaseTokenPool_lockOrBurn:testPoolBurnRevertNotHealthyReverts() (gas: 64707)
-LockReleaseTokenPool_releaseOrMint:testPoolMintNotHealthyReverts() (gas: 57674)
-LockReleaseTokenPool_removeLiquidity:testInsufficientLiquidityReverts() (gas: 83061)
+LockReleaseTokenPool_releaseOrMint:testPoolMintNotHealthyReverts() (gas: 57696)
+LockReleaseTokenPool_removeLiquidity:testInsufficientLiquidityReverts() (gas: 83083)
 LockReleaseTokenPool_supportsInterface:testSupportsInterfaceSuccess() (gas: 8326)
 MerkleMultiProofTest:testCVE_2023_34459() (gas: 5458)
 MerkleMultiProofTest:testEmptyLeafReverts() (gas: 3575)
@@ -336,9 +336,9 @@ Router_applyRampUpdates:testOffRampMismatchReverts() (gas: 108518)
 Router_applyRampUpdates:testOnRampDisable() (gas: 52147)
 Router_applyRampUpdates:testOnlyOwnerReverts() (gas: 12224)
 Router_ccipSend:testCCIPSendLinkFeeNoTokenSuccess_gas() (gas: 110158)
-Router_ccipSend:testCCIPSendLinkFeeOneTokenSuccess_gas() (gas: 188494)
+Router_ccipSend:testCCIPSendLinkFeeOneTokenSuccess_gas() (gas: 188556)
 Router_ccipSend:testCCIPSendNativeFeeNoTokenSuccess_gas() (gas: 122209)
-Router_ccipSend:testCCIPSendNativeFeeOneTokenSuccess_gas() (gas: 200546)
+Router_ccipSend:testCCIPSendNativeFeeOneTokenSuccess_gas() (gas: 200608)
 Router_ccipSend:testFeeTokenAmountTooLowReverts() (gas: 61287)
 Router_ccipSend:testInvalidMsgValue() (gas: 31860)
 Router_ccipSend:testNativeFeeTokenInsufficientValue() (gas: 63758)
@@ -366,9 +366,9 @@ Router_routeMessage:testManualExecSuccess() (gas: 31211)
 Router_routeMessage:testOnlyOffRampReverts() (gas: 22025)
 Router_routeMessage:testWhenNotHealthyReverts() (gas: 45570)
 Router_setWrappedNative:testOnlyOwnerReverts() (gas: 10976)
-ThirdPartyBurnMintTokenPool_applyRampUpdates:testInvalidOffRampReverts() (gas: 23375)
-ThirdPartyBurnMintTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 21732)
-ThirdPartyBurnMintTokenPool_lockOrBurn:testLockOrBurnWithAllowListSuccess() (gas: 99869)
+ThirdPartyBurnMintTokenPool_applyRampUpdates:testInvalidOffRampReverts() (gas: 23397)
+ThirdPartyBurnMintTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 21754)
+ThirdPartyBurnMintTokenPool_lockOrBurn:testLockOrBurnWithAllowListSuccess() (gas: 99993)
 TokenPoolWithAllowList_applyAllowListUpdates:testOnlyOwnerReverts() (gas: 12072)
 TokenPoolWithAllowList_applyAllowListUpdates:testSetAllowListSkipsZeroSuccess() (gas: 20409)
 TokenPoolWithAllowList_applyAllowListUpdates:testSetAllowListSuccess() (gas: 175191)
@@ -384,26 +384,26 @@ TokenPool_setOnRampRateLimiterConfig:testOnlyOwnerReverts() (gas: 17999)
 TokenProxy_ccipSend:testCcipSendGasShouldBeZeroReverts() (gas: 17053)
 TokenProxy_ccipSend:testCcipSendInsufficientAllowanceReverts() (gas: 127459)
 TokenProxy_ccipSend:testCcipSendInvalidTokenReverts() (gas: 15839)
-TokenProxy_ccipSend:testCcipSendNativeSuccess() (gas: 229505)
+TokenProxy_ccipSend:testCcipSendNativeSuccess() (gas: 229567)
 TokenProxy_ccipSend:testCcipSendNoDataAllowedReverts() (gas: 16167)
-TokenProxy_ccipSend:testCcipSendSuccess() (gas: 249462)
+TokenProxy_ccipSend:testCcipSendSuccess() (gas: 249512)
 TokenProxy_constructor:testConstructor() (gas: 10651)
 TokenProxy_getFee:testGetFeeGasShouldBeZeroReverts() (gas: 16734)
 TokenProxy_getFee:testGetFeeInvalidTokenReverts() (gas: 12616)
 TokenProxy_getFee:testGetFeeNoDataAllowedReverts() (gas: 15763)
 TokenProxy_getFee:testGetFeeSuccess() (gas: 73961)
-USDCTokenPool__validateMessage:testValidateInvalidMessageReverts() (gas: 25129)
-USDCTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 21826)
-USDCTokenPool_lockOrBurn:testPermissionsErrorReverts() (gas: 12428)
-USDCTokenPool_lockOrBurn:testUnknownDomainReverts() (gas: 183236)
-USDCTokenPool_releaseOrMint:testReleaseOrMintRealTxSuccess() (gas: 55869)
-USDCTokenPool_releaseOrMint:testTokenMaxCapacityExceededReverts() (gas: 27768)
-USDCTokenPool_releaseOrMint:testUnlockingUSDCFailedReverts() (gas: 50610)
-USDCTokenPool_setConfig:testInvalidConfigReverts() (gas: 15041)
-USDCTokenPool_setConfig:testInvalidMessageVersionReverts() (gas: 11659)
-USDCTokenPool_setConfig:testInvalidTokenMessengerVersionReverts() (gas: 287366)
-USDCTokenPool_setConfig:testOnlyOwnerReverts() (gas: 15591)
-USDCTokenPool_setConfig:testSetConfigSuccess() (gas: 345070)
+USDCTokenPool__validateMessage:testValidateInvalidMessageReverts() (gas: 25239)
+USDCTokenPool_lockOrBurn:testLockOrBurnWithAllowListReverts() (gas: 21848)
+USDCTokenPool_lockOrBurn:testPermissionsErrorReverts() (gas: 12450)
+USDCTokenPool_lockOrBurn:testUnknownDomainReverts() (gas: 183254)
+USDCTokenPool_releaseOrMint:testReleaseOrMintRealTxSuccess() (gas: 55891)
+USDCTokenPool_releaseOrMint:testTokenMaxCapacityExceededReverts() (gas: 27790)
+USDCTokenPool_releaseOrMint:testUnlockingUSDCFailedReverts() (gas: 50632)
+USDCTokenPool_setConfig:testInvalidConfigReverts() (gas: 15085)
+USDCTokenPool_setConfig:testInvalidMessageVersionReverts() (gas: 11681)
+USDCTokenPool_setConfig:testInvalidTokenMessengerVersionReverts() (gas: 287388)
+USDCTokenPool_setConfig:testOnlyOwnerReverts() (gas: 15613)
+USDCTokenPool_setConfig:testSetConfigSuccess() (gas: 345224)
 USDCTokenPool_setDomains:testInvalidDomainReverts() (gas: 66025)
 USDCTokenPool_setDomains:testOnlyOwnerReverts() (gas: 15367)
-USDCTokenPool_supportsInterface:testSupportsInterfaceSuccess() (gas: 8414)
+USDCTokenPool_supportsInterface:testSupportsInterfaceSuccess() (gas: 8369)

contracts/src/v0.8/ccip/ARM.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
+import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 import {IARM} from "./interfaces/IARM.sol";
 
 import {OwnerIsCreator} from "./../shared/access/OwnerIsCreator.sol";
 
-contract ARM is IARM, OwnerIsCreator, TypeAndVersionInterface {
+contract ARM is IARM, OwnerIsCreator, ITypeAndVersion {
   // STATIC CONFIG
   // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
   string public constant override typeAndVersion = "ARM 1.0.0";
@@ -115,6 +115,7 @@ contract ARM is IARM, OwnerIsCreator, TypeAndVersionInterface {
 
   // EVENTS, ERRORS
   event ConfigSet(uint32 indexed configVersion, Config config);
+
   error InvalidConfig();
 
   event TaggedRootBlessed(uint32 indexed configVersion, IARM.TaggedRoot taggedRoot, uint16 accumulatedWeight);

contracts/src/v0.8/ccip/ARMProxy.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
+import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 
 import {OwnerIsCreator} from "./../shared/access/OwnerIsCreator.sol";
 
@@ -10,7 +10,7 @@ import {OwnerIsCreator} from "./../shared/access/OwnerIsCreator.sol";
 /// since each contract need not store an ARM address in storage. That way
 /// we can add ARM queries along many code paths for increased defense in depth
 /// with minimal additional cost.
-contract ARMProxy is OwnerIsCreator, TypeAndVersionInterface {
+contract ARMProxy is OwnerIsCreator, ITypeAndVersion {
   error ZeroAddressNotAllowed();
 
   event ARMSet(address arm);

contracts/src/v0.8/ccip/CommitStore.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
+import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 import {ICommitStore} from "./interfaces/ICommitStore.sol";
 import {IARM} from "./interfaces/IARM.sol";
 import {IPriceRegistry} from "./interfaces/IPriceRegistry.sol";
@@ -10,7 +10,7 @@ import {OCR2Base} from "./ocr/OCR2Base.sol";
 import {Internal} from "./libraries/Internal.sol";
 import {MerkleMultiProof} from "./libraries/MerkleMultiProof.sol";
 
-contract CommitStore is ICommitStore, TypeAndVersionInterface, OCR2Base {
+contract CommitStore is ICommitStore, ITypeAndVersion, OCR2Base {
   error StaleReport();
   error PausedError();
   error InvalidInterval(Interval interval);

contracts/src/v0.8/ccip/PriceRegistry.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
+import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 import {IPriceRegistry} from "./interfaces/IPriceRegistry.sol";
-import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
 
 import {OwnerIsCreator} from "./../shared/access/OwnerIsCreator.sol";
 import {Internal} from "./libraries/Internal.sol";
@@ -12,7 +12,7 @@ import {EnumerableSet} from "../vendor/openzeppelin-solidity/v4.8.0/contracts/ut
 
 /// @notice The PriceRegistry contract responsibility is to store the current gas price in USD for a given destination chain,
 /// and the price of a token in USD allowing the owner or priceUpdater to update this value.
-contract PriceRegistry is IPriceRegistry, OwnerIsCreator, TypeAndVersionInterface {
+contract PriceRegistry is IPriceRegistry, OwnerIsCreator, ITypeAndVersion {
   using EnumerableSet for EnumerableSet.AddressSet;
   using USDPriceWith18Decimals for uint224;
 

contracts/src/v0.8/ccip/Router.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {TypeAndVersionInterface} from "../interfaces/TypeAndVersionInterface.sol";
+import {ITypeAndVersion} from "../shared/interfaces/ITypeAndVersion.sol";
 import {IRouterClient} from "./interfaces/IRouterClient.sol";
 import {IRouter} from "./interfaces/IRouter.sol";
 import {IEVM2AnyOnRamp} from "./interfaces/IEVM2AnyOnRamp.sol";
@@ -19,7 +19,7 @@ import {IERC20} from "../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC
 /// @title Router
 /// @notice This is the entry point for the end user wishing to send data across chains.
 /// @dev This contract is used as a router for both on-ramps and off-ramps
-contract Router is IRouter, IRouterClient, TypeAndVersionInterface, OwnerIsCreator {
+contract Router is IRouter, IRouterClient, ITypeAndVersion, OwnerIsCreator {
   using SafeERC20 for IERC20;
   using EnumerableMap for EnumerableMap.AddressToUintMap;
 

contracts/src/v0.8/ccip/ocr/OCR2Abstract.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.0;
 
-import {TypeAndVersionInterface} from "../../interfaces/TypeAndVersionInterface.sol";
+import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
 
-abstract contract OCR2Abstract is TypeAndVersionInterface {
+abstract contract OCR2Abstract is ITypeAndVersion {
   // Maximum number of oracles the offchain reporting protocol is designed for
   uint256 internal constant MAX_NUM_ORACLES = 31;