diff --git a/contracts/base/connectors/authority/main.sol b/contracts/base/connectors/authority/main.sol
index 90483676..e7511544 100644
--- a/contracts/base/connectors/authority/main.sol
+++ b/contracts/base/connectors/authority/main.sol
@@ -10,7 +10,7 @@ import { AccountInterface } from "../../common/interfaces.sol";
 import { Helpers } from "./helpers.sol";
 import { Events } from "./events.sol";
 
-abstract contract AuthorityResolver is Events, Helpers {
+abstract contract AuthorityConnector is Events, Helpers {
     /**
      * @dev Add New authority
      * @notice Add an address as account authority
@@ -53,6 +53,6 @@ abstract contract AuthorityResolver is Events, Helpers {
     }
 }
 
-contract ConnectV2AuthBase is AuthorityResolver {
+contract ConnectV2AuthBase is AuthorityConnector {
     string public constant name = "Auth-v1.1";
 }
diff --git a/contracts/base/connectors/swap/helpers.sol b/contracts/base/connectors/swap/helpers.sol
index b9207a26..3b814f67 100644
--- a/contracts/base/connectors/swap/helpers.sol
+++ b/contracts/base/connectors/swap/helpers.sol
@@ -1,6 +1,6 @@
 //SPDX-License-Identifier: MIT
 pragma solidity ^0.7.0;
-pragma abicoder v2;
+pragma experimental ABIEncoderV2;
 
 import { InstaConnectors } from "../../common/interfaces.sol";