diff --git a/DESIGN.md b/DESIGN.md
index 11dc7c35..a8f4e98a 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -30,9 +30,9 @@ Most projects that look to go cross-chain nowadays have more complex needs that
 - Mint/Burn: This `TokenManager` will burn/mint tokens from/to the user to initiate/fulfill cross-chain transfers. Tokens used with this kind of `TokenManager` need to be properly permissioned to allow for this behavior.
 - Liquidity Pool: This `TokenManager` functions exactly like a Lock/Unlock one, except the balance is kept at a separate, pre-specified account. This allows for deployers to have more control over the bridged funds.
 
-## Linker Router
+## Interchain Address Tracker
 
-We plan to finalize the design of the `InterchainTokenService` but we want to be able to support new chains as they get added to the Axelar Network. For this purpose, the service will ask a separate contract, the [`InterchainAddressTracker`](./contracts/interchainAddressTracker/InterchainAddressTracker.sol) to obtain the destination address for outgoing messages, and for validation of incoming messages. This contract might eventually stop being upgradable but it will probably be able to support new addresses for new chains indefinitely.
+We plan to finalize the design of the `InterchainTokenService` but we want to be able to support new chains as they get added to the Axelar Network. For this purpose, the service will ask a separate contract, the [`InterchainAddressTracker`](https://github.com/axelarnetwork/axelar-gmp-sdk-solidity/blob/main/contracts/utils/InterchainAddressTracker.sol) to obtain the destination address for outgoing messages, and for validation of incoming messages. This contract might eventually stop being upgradable but it will probably be able to support new addresses for new chains indefinitely.
 
 ## Interchain Token
 
diff --git a/contracts/utils/Imports.sol b/contracts/test/Imports.sol
similarity index 90%
rename from contracts/utils/Imports.sol
rename to contracts/test/Imports.sol
index 62cf7817..5b72166f 100644
--- a/contracts/utils/Imports.sol
+++ b/contracts/test/Imports.sol
@@ -2,5 +2,6 @@
 
 pragma solidity ^0.8.0;
 
+// solhint-disable no-unused-import
 import { InterchainAddressTracker } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/utils/InterchainAddressTracker.sol';
 import { InterchainAddressTrackerProxy } from '@axelar-network/axelar-gmp-sdk-solidity/contracts/utils/InterchainAddressTrackerProxy.sol';
diff --git a/contracts/token-registrars/StandardizedTokenRegistrar.sol b/contracts/token-registrars/StandardizedTokenRegistrar.sol
index 27228252..b340f945 100644
--- a/contracts/token-registrars/StandardizedTokenRegistrar.sol
+++ b/contracts/token-registrars/StandardizedTokenRegistrar.sol
@@ -149,7 +149,7 @@ contract StandardizedTokenRegistrar is IStandardizedTokenRegistrar, ITokenManage
             tokenSymbol,
             tokenDecimals,
             distributor,
-            '',
+            distributor,
             mintAmount,
             operator,
             destinationChain,