diff --git a/contracts/proxy/ERC1967/ERC1967Upgrade.sol b/contracts/proxy/ERC1967/ERC1967Upgrade.sol
index 3628d72e486..3832e3b1ec5 100644
--- a/contracts/proxy/ERC1967/ERC1967Upgrade.sol
+++ b/contracts/proxy/ERC1967/ERC1967Upgrade.sol
@@ -69,9 +69,8 @@ abstract contract ERC1967Upgrade is ERC1967Storage {
             Address.functionDelegateCall(
                 newImplementation,
                 abi.encodeWithSignature(
-                    "upgradeToAndCall(address,bytes)",
-                    oldImplementation,
-                    bytes("")
+                    "upgradeTo(address)",
+                    oldImplementation
                 )
             );
             upgradePending.value = false;
diff --git a/test/proxy/UUPS/Proxiable.test.js b/test/proxy/UUPS/Proxiable.test.js
index 8aeb9bcf3e4..069ebc7eb9c 100644
--- a/test/proxy/UUPS/Proxiable.test.js
+++ b/test/proxy/UUPS/Proxiable.test.js
@@ -5,7 +5,7 @@ const ProxiableMock = artifacts.require('ProxiableMock');
 const ProxiableUnsafeMock = artifacts.require('ProxiableUnsafeMock');
 const ProxiableBrokenMock = artifacts.require('ProxiableBrokenMock');
 
-contract('ERC1967Upgrade', function (accounts) {
+contract('Proxiable', function (accounts) {
   before(async function () {
     this.testimpl0 = await ProxiableMock.new();
     this.testimpl1 = await ProxiableMock.new();