rename to UpgradeSafe

contracts/GSN/Context.sol

@@ -11,7 +11,7 @@ import "../Initializable.sol";
  *
  * This contract is only required for intermediate, library-like contracts.
  */
-contract ContextUpgradeable is Initializable {
+contract ContextUpgradeSafe is Initializable {
     // Empty internal constructor, to prevent people from mistakenly deploying
     // an instance of this contract, which should be used via inheritance.
 

contracts/GSN/GSNRecipient.sol

@@ -16,7 +16,7 @@ import "../Initializable.sol";
  * information on how to use the pre-built {GSNRecipientSignature} and
  * {GSNRecipientERC20Fee}, or how to write your own.
  */
-abstract contract GSNRecipientUpgradeable is Initializable, IRelayRecipient, ContextUpgradeable {
+abstract contract GSNRecipientUpgradeSafe is Initializable, IRelayRecipient, ContextUpgradeSafe {
     function __GSNRecipient_init() internal initializer {
         __Context_init_unchained();
         __GSNRecipient_init_unchained();

contracts/GSN/GSNRecipientERC20Fee.sol

@@ -16,7 +16,7 @@ import "../Initializable.sol";
  * whose only minter is the recipient, so the strategy must be implemented in a derived contract, making use of the
  * internal {_mint} function.
  */
-contract GSNRecipientERC20FeeUpgradeable is Initializable, GSNRecipientUpgradeable {
+contract GSNRecipientERC20FeeUpgradeSafe is Initializable, GSNRecipientUpgradeSafe {
     using SafeERC20 for __unstable__ERC20Owned;
     using SafeMath for uint256;
 
@@ -125,7 +125,7 @@ contract GSNRecipientERC20FeeUpgradeable is Initializable, GSNRecipientUpgradeab
  * outside of this context.
  */
 // solhint-disable-next-line contract-name-camelcase
-contract __unstable__ERC20Owned is Initializable, ERC20Upgradeable, OwnableUpgradeable {
+contract __unstable__ERC20Owned is Initializable, ERC20UpgradeSafe, OwnableUpgradeSafe {
     uint256 private constant _UINT256_MAX = 2**256 - 1;
 
 

contracts/GSN/GSNRecipientSignature.sol

@@ -10,7 +10,7 @@ import "../Initializable.sol";
  * performs validations off-chain. Note that nothing is charged to the user in this scheme. Thus, the server should make
  * sure to account for this in their economic and threat model.
  */
-contract GSNRecipientSignatureUpgradeable is Initializable, GSNRecipientUpgradeable {
+contract GSNRecipientSignatureUpgradeSafe is Initializable, GSNRecipientUpgradeSafe {
     using ECDSA for bytes32;
 
     address private _trustedSigner;

contracts/access/AccessControl.sol

@@ -36,7 +36,7 @@ import "../Initializable.sol";
  * roles. More complex role relationships can be created by using
  * {_setRoleAdmin}.
  */
-abstract contract AccessControlUpgradeable is Initializable, ContextUpgradeable {
+abstract contract AccessControlUpgradeSafe is Initializable, ContextUpgradeSafe {
     function __AccessControl_init() internal initializer {
         __Context_init_unchained();
         __AccessControl_init_unchained();

contracts/access/Ownable.sol

@@ -14,7 +14,7 @@ import "../Initializable.sol";
  * `onlyOwner`, which can be applied to your functions to restrict their use to
  * the owner.
  */
-contract OwnableUpgradeable is Initializable, ContextUpgradeable {
+contract OwnableUpgradeSafe is Initializable, ContextUpgradeSafe {
     address private _owner;
 
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);

contracts/drafts/TokenVesting.sol

@@ -11,7 +11,7 @@ import "../Initializable.sol";
  * typical vesting scheme, with a cliff and vesting period. Optionally revocable by the
  * owner.
  */
-contract TokenVestingUpgradeable is Initializable, OwnableUpgradeable {
+contract TokenVestingUpgradeSafe is Initializable, OwnableUpgradeSafe {
     // The vesting schedule is time-based (i.e. using block timestamps as opposed to e.g. block numbers), and is
     // therefore sensitive to timestamp manipulation (which is something miners can do, to a certain degree). Therefore,
     // it is recommended to avoid using short time durations (less than a minute). Typical vesting schemes, with a

contracts/introspection/ERC165.sol

@@ -9,7 +9,7 @@ import "../Initializable.sol";
  * Contracts may inherit from this and call {_registerInterface} to declare
  * their support of an interface.
  */
-contract ERC165Upgradeable is Initializable, IERC165 {
+contract ERC165UpgradeSafe is Initializable, IERC165 {
     /*
      * bytes4(keccak256('supportsInterface(bytes4)')) == 0x01ffc9a7
      */

contracts/introspection/ERC1820Implementer.sol

@@ -11,7 +11,7 @@ import "../Initializable.sol";
  * {IERC1820Registry-setInterfaceImplementer} should then be called for the
  * registration to be complete.
  */
-contract ERC1820ImplementerUpgradeable is Initializable, IERC1820Implementer {
+contract ERC1820ImplementerUpgradeSafe is Initializable, IERC1820Implementer {
     function __ERC1820Implementer_init() internal initializer {
         __ERC1820Implementer_init_unchained();
     }

contracts/mocks/AccessControlMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../access/AccessControl.sol";
 import "../Initializable.sol";
 
-contract AccessControlMockUpgradeable is Initializable, AccessControlUpgradeable {
+contract AccessControlMockUpgradeSafe is Initializable, AccessControlUpgradeSafe {
 
     constructor() public  {
         __AccessControlMock_init();

contracts/mocks/AddressImpl.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../utils/Address.sol";
 import "../Initializable.sol";
 
-contract AddressMockUpgradeable is Initializable {
+contract AddressMockUpgradeSafe is Initializable {
     constructor() public  {
         __AddressMock_init();
     }

contracts/mocks/ArraysImpl.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../utils/Arrays.sol";
 import "../Initializable.sol";
 
-contract ArraysMockUpgradeable is Initializable {
+contract ArraysMockUpgradeSafe is Initializable {
     using Arrays for uint256[];
 
     uint256[] private _array;

contracts/mocks/ConditionalEscrowMock.sol

@@ -4,7 +4,7 @@ import "../payment/escrow/ConditionalEscrow.sol";
 import "../Initializable.sol";
 
 // mock class using ConditionalEscrow
-contract ConditionalEscrowMockUpgradeable is Initializable, ConditionalEscrowUpgradeable {
+contract ConditionalEscrowMockUpgradeSafe is Initializable, ConditionalEscrowUpgradeSafe {
     constructor() public  {
         __ConditionalEscrowMock_init();
     }

contracts/mocks/ContextMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../GSN/Context.sol";
 import "../Initializable.sol";
 
-contract ContextMockUpgradeable is Initializable, ContextUpgradeable {
+contract ContextMockUpgradeSafe is Initializable, ContextUpgradeSafe {
     constructor() public  {
         __ContextMock_init();
     }
@@ -33,7 +33,7 @@ contract ContextMockUpgradeable is Initializable, ContextUpgradeable {
     uint256[50] private __gap;
 }
 
-contract ContextMockCallerUpgradeable is Initializable {
+contract ContextMockCallerUpgradeSafe is Initializable {
     constructor() public  {
         __ContextMockCaller_init();
     }
@@ -47,11 +47,11 @@ contract ContextMockCallerUpgradeable is Initializable {
 
     }
 
-    function callSender(ContextMockUpgradeable context) public {
+    function callSender(ContextMockUpgradeSafe context) public {
         context.msgSender();
     }
 
-    function callData(ContextMockUpgradeable context, uint256 integerValue, string memory stringValue) public {
+    function callData(ContextMockUpgradeSafe context, uint256 integerValue, string memory stringValue) public {
         context.msgData(integerValue, stringValue);
     }
 

contracts/mocks/CountersImpl.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../utils/Counters.sol";
 import "../Initializable.sol";
 
-contract CountersMockUpgradeable is Initializable {
+contract CountersMockUpgradeSafe is Initializable {
     constructor() public  {
         __CountersMock_init();
     }

contracts/mocks/Create2Impl.sol

@@ -4,7 +4,7 @@ import "../utils/Create2.sol";
 import "../introspection/ERC1820Implementer.sol";
 import "../Initializable.sol";
 
-contract Create2MockUpgradeable is Initializable {
+contract Create2MockUpgradeSafe is Initializable {
     constructor() public  {
         __Create2Mock_init();
     }
@@ -24,7 +24,7 @@ contract Create2MockUpgradeable is Initializable {
 
     function deployERC1820Implementer(uint256 value, bytes32 salt) public {
         // solhint-disable-next-line indent
-        Create2.deploy(value, salt, type(ERC1820ImplementerUpgradeable).creationCode);
+        Create2.deploy(value, salt, type(ERC1820ImplementerUpgradeSafe).creationCode);
     }
 
     function computeAddress(bytes32 salt, bytes32 codeHash) public view returns (address) {

contracts/mocks/ECDSAMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../cryptography/ECDSA.sol";
 import "../Initializable.sol";
 
-contract ECDSAMockUpgradeable is Initializable {
+contract ECDSAMockUpgradeSafe is Initializable {
     constructor() public  {
         __ECDSAMock_init();
     }

contracts/mocks/ERC165/ERC165InterfacesSupported.sol

@@ -13,7 +13,7 @@ import "../../Initializable.sol";
  * therefore, because this contract is staticcall'd we need to not emit events (which is how solidity-coverage works)
  * solidity-coverage ignores the /mocks folder, so we duplicate its implementation here to avoid instrumenting it
  */
-contract SupportsInterfaceWithLookupMockUpgradeable is Initializable, IERC165 {
+contract SupportsInterfaceWithLookupMockUpgradeSafe is Initializable, IERC165 {
     /*
      * bytes4(keccak256('supportsInterface(bytes4)')) == 0x01ffc9a7
      */
@@ -63,7 +63,7 @@ contract SupportsInterfaceWithLookupMockUpgradeable is Initializable, IERC165 {
     uint256[49] private __gap;
 }
 
-contract ERC165InterfacesSupportedUpgradeable is Initializable, SupportsInterfaceWithLookupMockUpgradeable {
+contract ERC165InterfacesSupportedUpgradeSafe is Initializable, SupportsInterfaceWithLookupMockUpgradeSafe {
 
     constructor(bytes4[] memory interfaceIds) public  {
         __ERC165InterfacesSupported_init(interfaceIds);

contracts/mocks/ERC165/ERC165NotSupported.sol

 pragma solidity ^0.6.0;
 import "../../Initializable.sol";
 
-contract ERC165NotSupportedUpgradeable is Initializable {
+contract ERC165NotSupportedUpgradeSafe is Initializable {
     constructor() public  {
         __ERC165NotSupported_init();
     }

contracts/mocks/ERC165CheckerMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../introspection/ERC165Checker.sol";
 import "../Initializable.sol";
 
-contract ERC165CheckerMockUpgradeable is Initializable {
+contract ERC165CheckerMockUpgradeSafe is Initializable {
     constructor() public  {
         __ERC165CheckerMock_init();
     }

contracts/mocks/ERC165Mock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../introspection/ERC165.sol";
 import "../Initializable.sol";
 
-contract ERC165MockUpgradeable is Initializable, ERC165Upgradeable {
+contract ERC165MockUpgradeSafe is Initializable, ERC165UpgradeSafe {
     constructor() public  {
         __ERC165Mock_init();
     }

contracts/mocks/ERC1820ImplementerMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../introspection/ERC1820Implementer.sol";
 import "../Initializable.sol";
 
-contract ERC1820ImplementerMockUpgradeable is Initializable, ERC1820ImplementerUpgradeable {
+contract ERC1820ImplementerMockUpgradeSafe is Initializable, ERC1820ImplementerUpgradeSafe {
     constructor() public  {
         __ERC1820ImplementerMock_init();
     }

contracts/mocks/ERC20BurnableMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../token/ERC20/ERC20Burnable.sol";
 import "../Initializable.sol";
 
-contract ERC20BurnableMockUpgradeable is Initializable, ERC20BurnableUpgradeable {
+contract ERC20BurnableMockUpgradeSafe is Initializable, ERC20BurnableUpgradeSafe {
 
     constructor(
         string memory name,

contracts/mocks/ERC20CappedMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../token/ERC20/ERC20Capped.sol";
 import "../Initializable.sol";
 
-contract ERC20CappedMockUpgradeable is Initializable, ERC20CappedUpgradeable {
+contract ERC20CappedMockUpgradeSafe is Initializable, ERC20CappedUpgradeSafe {
 
     constructor(string memory name, string memory symbol, uint256 cap) public  {
         __ERC20CappedMock_init(name, symbol, cap);

contracts/mocks/ERC20DecimalsMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../token/ERC20/ERC20.sol";
 import "../Initializable.sol";
 
-contract ERC20DecimalsMockUpgradeable is Initializable, ERC20Upgradeable {
+contract ERC20DecimalsMockUpgradeSafe is Initializable, ERC20UpgradeSafe {
 
     constructor(string memory name, string memory symbol, uint8 decimals) public  {
         __ERC20DecimalsMock_init(name, symbol, decimals);

contracts/mocks/ERC20Mock.sol

@@ -4,7 +4,7 @@ import "../token/ERC20/ERC20.sol";
 import "../Initializable.sol";
 
 // mock class using ERC20
-contract ERC20MockUpgradeable is Initializable, ERC20Upgradeable {
+contract ERC20MockUpgradeSafe is Initializable, ERC20UpgradeSafe {
 
     constructor(
         string memory name,

contracts/mocks/ERC20PausableMock.sol

@@ -4,7 +4,7 @@ import "../token/ERC20/ERC20Pausable.sol";
 import "../Initializable.sol";
 
 // mock class using ERC20Pausable
-contract ERC20PausableMockUpgradeable is Initializable, ERC20PausableUpgradeable {
+contract ERC20PausableMockUpgradeSafe is Initializable, ERC20PausableUpgradeSafe {
 
     constructor(
         string memory name,

contracts/mocks/ERC20PresetMinterPauserMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import '../presets/ERC20PresetMinterPauser.sol';
 import "../Initializable.sol";
 
-contract ERC20PresetMinterPauserMockUpgradeable is Initializable, ERC20PresetMinterPauserUpgradeable {
+contract ERC20PresetMinterPauserMockUpgradeSafe is Initializable, ERC20PresetMinterPauserUpgradeSafe {
 
     constructor(string memory name, string memory symbol) public payable {
         __ERC20PresetMinterPauserMock_init(name, symbol);

contracts/mocks/ERC20SnapshotMock.sol

@@ -4,7 +4,7 @@ import "../token/ERC20/ERC20Snapshot.sol";
 import "../Initializable.sol";
 
 
-contract ERC20SnapshotMockUpgradeable is Initializable, ERC20SnapshotUpgradeable {
+contract ERC20SnapshotMockUpgradeSafe is Initializable, ERC20SnapshotUpgradeSafe {
 
     constructor(
         string memory name,

contracts/mocks/ERC721BurnableMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../token/ERC721/ERC721Burnable.sol";
 import "../Initializable.sol";
 
-contract ERC721BurnableMockUpgradeable is Initializable, ERC721BurnableUpgradeable {
+contract ERC721BurnableMockUpgradeSafe is Initializable, ERC721BurnableUpgradeSafe {
 
     constructor(string memory name, string memory symbol) public  {
         __ERC721BurnableMock_init(name, symbol);

contracts/mocks/ERC721GSNRecipientMock.sol

@@ -9,7 +9,7 @@ import "../Initializable.sol";
  * @title ERC721GSNRecipientMock
  * A simple ERC721 mock that has GSN support enabled
  */
-contract ERC721GSNRecipientMockUpgradeable is Initializable, ERC721Upgradeable, GSNRecipientUpgradeable, GSNRecipientSignatureUpgradeable {
+contract ERC721GSNRecipientMockUpgradeSafe is Initializable, ERC721UpgradeSafe, GSNRecipientUpgradeSafe, GSNRecipientSignatureUpgradeSafe {
 
     constructor(string memory name, string memory symbol, address trustedSigner) public  {
         __ERC721GSNRecipientMock_init(name, symbol, trustedSigner);
@@ -34,12 +34,12 @@ contract ERC721GSNRecipientMockUpgradeable is Initializable, ERC721Upgradeable,
         _mint(_msgSender(), tokenId);
     }
 
-    function _msgSender() internal view override(ContextUpgradeable, GSNRecipientUpgradeable) returns (address payable) {
-        return GSNRecipientUpgradeable._msgSender();
+    function _msgSender() internal view override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) returns (address payable) {
+        return GSNRecipientUpgradeSafe._msgSender();
     }
 
-    function _msgData() internal view override(ContextUpgradeable, GSNRecipientUpgradeable) returns (bytes memory) {
-        return GSNRecipientUpgradeable._msgData();
+    function _msgData() internal view override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) returns (bytes memory) {
+        return GSNRecipientUpgradeSafe._msgData();
     }
 
     uint256[50] private __gap;

contracts/mocks/ERC721Mock.sol

@@ -7,7 +7,7 @@ import "../Initializable.sol";
  * @title ERC721Mock
  * This mock just provides a public safeMint, mint, and burn functions for testing purposes
  */
-contract ERC721MockUpgradeable is Initializable, ERC721Upgradeable {
+contract ERC721MockUpgradeSafe is Initializable, ERC721UpgradeSafe {
 
     constructor(string memory name, string memory symbol) public  {
         __ERC721Mock_init(name, symbol);

contracts/mocks/ERC721PausableMock.sol

@@ -7,7 +7,7 @@ import "../Initializable.sol";
  * @title ERC721PausableMock
  * This mock just provides a public mint, burn and exists functions for testing purposes
  */
-contract ERC721PausableMockUpgradeable is Initializable, ERC721PausableUpgradeable {
+contract ERC721PausableMockUpgradeSafe is Initializable, ERC721PausableUpgradeSafe {
 
     constructor(string memory name, string memory symbol) public  {
         __ERC721PausableMock_init(name, symbol);

contracts/mocks/ERC721PresetMinterPauserAutoIdMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import '../presets/ERC721PresetMinterPauserAutoId.sol';
 import "../Initializable.sol";
 
-contract ERC721PresetMinterPauserAutoIdMockUpgradeable is Initializable, ERC721PresetMinterPauserAutoIdUpgradeable {
+contract ERC721PresetMinterPauserAutoIdMockUpgradeSafe is Initializable, ERC721PresetMinterPauserAutoIdUpgradeSafe {
 
     constructor(string memory name, string memory symbol, string memory baseURI) public payable {
         __ERC721PresetMinterPauserAutoIdMock_init(name, symbol, baseURI);

contracts/mocks/ERC721ReceiverMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../token/ERC721/IERC721Receiver.sol";
 import "../Initializable.sol";
 
-contract ERC721ReceiverMockUpgradeable is Initializable, IERC721Receiver {
+contract ERC721ReceiverMockUpgradeSafe is Initializable, IERC721Receiver {
     bytes4 private _retval;
     bool private _reverts;
 

contracts/mocks/ERC777Mock.sol

@@ -4,7 +4,7 @@ import "../GSN/Context.sol";
 import "../token/ERC777/ERC777.sol";
 import "../Initializable.sol";
 
-contract ERC777MockUpgradeable is Initializable, ContextUpgradeable, ERC777Upgradeable {
+contract ERC777MockUpgradeSafe is Initializable, ContextUpgradeSafe, ERC777UpgradeSafe {
 
     constructor(
         address initialHolder,

contracts/mocks/ERC777SenderRecipientMock.sol

@@ -8,7 +8,7 @@ import "../introspection/IERC1820Registry.sol";
 import "../introspection/ERC1820Implementer.sol";
 import "../Initializable.sol";
 
-contract ERC777SenderRecipientMockUpgradeable is Initializable, ContextUpgradeable, IERC777Sender, IERC777Recipient, ERC1820ImplementerUpgradeable {
+contract ERC777SenderRecipientMockUpgradeSafe is Initializable, ContextUpgradeSafe, IERC777Sender, IERC777Recipient, ERC1820ImplementerUpgradeSafe {
     constructor() public  {
         __ERC777SenderRecipientMock_init();
     }

contracts/mocks/EnumerableMapMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../utils/EnumerableMap.sol";
 import "../Initializable.sol";
 
-contract EnumerableMapMockUpgradeable is Initializable {
+contract EnumerableMapMockUpgradeSafe is Initializable {
     constructor() public  {
         __EnumerableMapMock_init();
     }

contracts/mocks/EnumerableSetMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../utils/EnumerableSet.sol";
 import "../Initializable.sol";
 
-contract EnumerableSetMockUpgradeable is Initializable {
+contract EnumerableSetMockUpgradeSafe is Initializable {
     constructor() public  {
         __EnumerableSetMock_init();
     }

contracts/mocks/EscrowMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import '../payment/escrow/Escrow.sol';
 import "../Initializable.sol";
 
-contract EscrowMockUpgradeable is Initializable, EscrowUpgradeable {
+contract EscrowMockUpgradeSafe is Initializable, EscrowUpgradeSafe {
     constructor() public  {
         __EscrowMock_init();
     }

contracts/mocks/EtherReceiverMock.sol

 pragma solidity ^0.6.0;
 import "../Initializable.sol";
 
-contract EtherReceiverMockUpgradeable is Initializable {
+contract EtherReceiverMockUpgradeSafe is Initializable {
     constructor() public  {
         __EtherReceiverMock_init();
     }

contracts/mocks/GSNRecipientERC20FeeMock.sol

@@ -4,7 +4,7 @@ import "../GSN/GSNRecipient.sol";
 import "../GSN/GSNRecipientERC20Fee.sol";
 import "../Initializable.sol";
 
-contract GSNRecipientERC20FeeMockUpgradeable is Initializable, GSNRecipientUpgradeable, GSNRecipientERC20FeeUpgradeable {
+contract GSNRecipientERC20FeeMockUpgradeSafe is Initializable, GSNRecipientUpgradeSafe, GSNRecipientERC20FeeUpgradeSafe {
 
     constructor(string memory name, string memory symbol) public  {
         __GSNRecipientERC20FeeMock_init(name, symbol);

contracts/mocks/GSNRecipientMock.sol

@@ -5,7 +5,7 @@ import "../GSN/GSNRecipient.sol";
 import "../Initializable.sol";
 
 // By inheriting from GSNRecipient, Context's internal functions are overridden automatically
-contract GSNRecipientMockUpgradeable is Initializable, ContextMockUpgradeable, GSNRecipientUpgradeable {
+contract GSNRecipientMockUpgradeSafe is Initializable, ContextMockUpgradeSafe, GSNRecipientUpgradeSafe {
     constructor() public  {
         __GSNRecipientMock_init();
     }
@@ -43,12 +43,12 @@ contract GSNRecipientMockUpgradeable is Initializable, ContextMockUpgradeable, G
         return _upgradeRelayHub(newRelayHub);
     }
 
-    function _msgSender() internal override(ContextUpgradeable, GSNRecipientUpgradeable) view virtual returns (address payable) {
-        return GSNRecipientUpgradeable._msgSender();
+    function _msgSender() internal override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) view virtual returns (address payable) {
+        return GSNRecipientUpgradeSafe._msgSender();
     }
 
-    function _msgData() internal override(ContextUpgradeable, GSNRecipientUpgradeable) view virtual returns (bytes memory) {
-        return GSNRecipientUpgradeable._msgData();
+    function _msgData() internal override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) view virtual returns (bytes memory) {
+        return GSNRecipientUpgradeSafe._msgData();
     }
 
     uint256[50] private __gap;

contracts/mocks/GSNRecipientSignatureMock.sol

@@ -4,7 +4,7 @@ import "../GSN/GSNRecipient.sol";
 import "../GSN/GSNRecipientSignature.sol";
 import "../Initializable.sol";
 
-contract GSNRecipientSignatureMockUpgradeable is Initializable, GSNRecipientUpgradeable, GSNRecipientSignatureUpgradeable {
+contract GSNRecipientSignatureMockUpgradeSafe is Initializable, GSNRecipientUpgradeSafe, GSNRecipientSignatureUpgradeSafe {
 
     constructor(address trustedSigner) public  {
         __GSNRecipientSignatureMock_init(trustedSigner);

contracts/mocks/MathMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../math/Math.sol";
 import "../Initializable.sol";
 
-contract MathMockUpgradeable is Initializable {
+contract MathMockUpgradeSafe is Initializable {
     constructor() public  {
         __MathMock_init();
     }

contracts/mocks/MerkleProofWrapper.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import { MerkleProof } from "../cryptography/MerkleProof.sol";
 import "../Initializable.sol";
 
-contract MerkleProofWrapperUpgradeable is Initializable {
+contract MerkleProofWrapperUpgradeSafe is Initializable {
     constructor() public  {
         __MerkleProofWrapper_init();
     }

contracts/mocks/OwnableMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../access/Ownable.sol";
 import "../Initializable.sol";
 
-contract OwnableMockUpgradeable is Initializable, OwnableUpgradeable {
+contract OwnableMockUpgradeSafe is Initializable, OwnableUpgradeSafe {
     constructor() public  {
         __OwnableMock_init();
     }

contracts/mocks/PausableMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../utils/Pausable.sol";
 import "../Initializable.sol";
 
-contract PausableMockUpgradeable is Initializable, PausableUpgradeable {
+contract PausableMockUpgradeSafe is Initializable, PausableUpgradeSafe {
     bool public drasticMeasureTaken;
     uint256 public count;
 

contracts/mocks/PaymentSplitterMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import '../payment/PaymentSplitter.sol';
 import "../Initializable.sol";
 
-contract PaymentSplitterMockUpgradeable is Initializable, PaymentSplitterUpgradeable {
+contract PaymentSplitterMockUpgradeSafe is Initializable, PaymentSplitterUpgradeSafe {
 
     constructor(address[] memory payees, uint256[] memory shares) public payable {
         __PaymentSplitterMock_init(payees, shares);

contracts/mocks/PullPaymentMock.sol

@@ -4,7 +4,7 @@ import "../payment/PullPayment.sol";
 import "../Initializable.sol";
 
 // mock class using PullPayment
-contract PullPaymentMockUpgradeable is Initializable, PullPaymentUpgradeable {
+contract PullPaymentMockUpgradeSafe is Initializable, PullPaymentUpgradeSafe {
 
     constructor() public payable {
         __PullPaymentMock_init();

contracts/mocks/ReentrancyAttack.sol

@@ -2,7 +2,7 @@ pragma solidity ^0.6.0;
 
 import "../GSN/Context.sol";
 import "../Initializable.sol";
-contract ReentrancyAttackUpgradeable is Initializable, ContextUpgradeable {
+contract ReentrancyAttackUpgradeSafe is Initializable, ContextUpgradeSafe {
     constructor() public  {
         __ReentrancyAttack_init();
     }

contracts/mocks/ReentrancyMock.sol

@@ -4,7 +4,7 @@ import "../utils/ReentrancyGuard.sol";
 import "./ReentrancyAttack.sol";
 import "../Initializable.sol";
 
-contract ReentrancyMockUpgradeable is Initializable, ReentrancyGuardUpgradeable {
+contract ReentrancyMockUpgradeSafe is Initializable, ReentrancyGuardUpgradeSafe {
     uint256 public counter;
 
 
@@ -45,7 +45,7 @@ contract ReentrancyMockUpgradeable is Initializable, ReentrancyGuardUpgradeable
         }
     }
 
-    function countAndCall(ReentrancyAttackUpgradeable attacker) public nonReentrant {
+    function countAndCall(ReentrancyAttackUpgradeSafe attacker) public nonReentrant {
         _count();
         bytes4 func = bytes4(keccak256("callback()"));
         attacker.callSender(func);

contracts/mocks/RefundEscrowMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import '../payment/escrow/RefundEscrow.sol';
 import "../Initializable.sol";
 
-contract RefundEscrowMockUpgradeable is Initializable, RefundEscrowUpgradeable {
+contract RefundEscrowMockUpgradeSafe is Initializable, RefundEscrowUpgradeSafe {
 
     constructor(address payable beneficiary) public payable {
         __RefundEscrowMock_init(beneficiary);

contracts/mocks/SafeCastMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../utils/SafeCast.sol";
 import "../Initializable.sol";
 
-contract SafeCastMockUpgradeable is Initializable {
+contract SafeCastMockUpgradeSafe is Initializable {
     constructor() public  {
         __SafeCastMock_init();
     }

contracts/mocks/SafeERC20Helper.sol

@@ -5,7 +5,7 @@ import "../token/ERC20/IERC20.sol";
 import "../token/ERC20/SafeERC20.sol";
 import "../Initializable.sol";
 
-contract ERC20ReturnFalseMockUpgradeable is Initializable, ContextUpgradeable {
+contract ERC20ReturnFalseMockUpgradeSafe is Initializable, ContextUpgradeSafe {
     constructor() public  {
         __ERC20ReturnFalseMock_init();
     }
@@ -49,7 +49,7 @@ contract ERC20ReturnFalseMockUpgradeable is Initializable, ContextUpgradeable {
     uint256[48] private __gap;
 }
 
-contract ERC20ReturnTrueMockUpgradeable is Initializable, ContextUpgradeable {
+contract ERC20ReturnTrueMockUpgradeSafe is Initializable, ContextUpgradeSafe {
     constructor() public  {
         __ERC20ReturnTrueMock_init();
     }
@@ -96,7 +96,7 @@ contract ERC20ReturnTrueMockUpgradeable is Initializable, ContextUpgradeable {
     uint256[48] private __gap;
 }
 
-contract ERC20NoReturnMockUpgradeable is Initializable, ContextUpgradeable {
+contract ERC20NoReturnMockUpgradeSafe is Initializable, ContextUpgradeSafe {
     constructor() public  {
         __ERC20NoReturnMock_init();
     }
@@ -140,7 +140,7 @@ contract ERC20NoReturnMockUpgradeable is Initializable, ContextUpgradeable {
     uint256[48] private __gap;
 }
 
-contract SafeERC20MockUpgradeable is Initializable, ContextUpgradeable {
+contract SafeERC20MockUpgradeSafe is Initializable, ContextUpgradeSafe {
     using SafeERC20 for IERC20;
 
     IERC20 private _token;
@@ -184,7 +184,7 @@ contract SafeERC20MockUpgradeable is Initializable, ContextUpgradeable {
     }
 
     function setAllowance(uint256 allowance_) public {
-        ERC20ReturnTrueMockUpgradeable(address(_token)).setAllowance(allowance_);
+        ERC20ReturnTrueMockUpgradeSafe(address(_token)).setAllowance(allowance_);
     }
 
     function allowance() public view returns (uint256) {

contracts/mocks/SafeMathMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../math/SafeMath.sol";
 import "../Initializable.sol";
 
-contract SafeMathMockUpgradeable is Initializable {
+contract SafeMathMockUpgradeSafe is Initializable {
     constructor() public  {
         __SafeMathMock_init();
     }

contracts/mocks/SignedSafeMathMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../math/SignedSafeMath.sol";
 import "../Initializable.sol";
 
-contract SignedSafeMathMockUpgradeable is Initializable {
+contract SignedSafeMathMockUpgradeSafe is Initializable {
     constructor() public  {
         __SignedSafeMathMock_init();
     }

contracts/mocks/StringsMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "../utils/Strings.sol";
 import "../Initializable.sol";
 
-contract StringsMockUpgradeable is Initializable {
+contract StringsMockUpgradeSafe is Initializable {
     constructor() public  {
         __StringsMock_init();
     }

contracts/mocks/TokenTimelockMock.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import '../token/ERC20/TokenTimelock.sol';
 import "../Initializable.sol";
 
-contract TokenTimelockMockUpgradeable is Initializable, TokenTimelockUpgradeable {
+contract TokenTimelockMockUpgradeSafe is Initializable, TokenTimelockUpgradeSafe {
 
     constructor(IERC20 token, address beneficiary, uint256 releaseTime) public  {
         __TokenTimelockMock_init(token, beneficiary, releaseTime);

contracts/payment/PaymentSplitter.sol

@@ -17,7 +17,7 @@ import "../Initializable.sol";
  * accounts but kept in this contract, and the actual transfer is triggered as a separate step by calling the {release}
  * function.
  */
-contract PaymentSplitterUpgradeable is Initializable, ContextUpgradeable {
+contract PaymentSplitterUpgradeSafe is Initializable, ContextUpgradeSafe {
     using SafeMath for uint256;
 
     event PayeeAdded(address account, uint256 shares);

contracts/payment/PullPayment.sol

@@ -21,8 +21,8 @@ import "../Initializable.sol";
  * instead of Solidity's `transfer` function. Payees can query their due
  * payments with {payments}, and retrieve them with {withdrawPayments}.
  */
-contract PullPaymentUpgradeable is Initializable {
-    EscrowUpgradeable private _escrow;
+contract PullPaymentUpgradeSafe is Initializable {
+    EscrowUpgradeSafe private _escrow;
 
 
     function __PullPayment_init() internal initializer {
@@ -32,7 +32,7 @@ contract PullPaymentUpgradeable is Initializable {
     function __PullPayment_init_unchained() internal initializer {
 
 
-        _escrow = new EscrowUpgradeable();
+        _escrow = new EscrowUpgradeSafe();
         _escrow.initialize();
     }
 

contracts/payment/escrow/ConditionalEscrow.sol

@@ -8,7 +8,7 @@ import "../../Initializable.sol";
  * @dev Base abstract escrow to only allow withdrawal if a condition is met.
  * @dev Intended usage: See {Escrow}. Same usage guidelines apply here.
  */
-abstract contract ConditionalEscrowUpgradeable is Initializable, EscrowUpgradeable {
+abstract contract ConditionalEscrowUpgradeSafe is Initializable, EscrowUpgradeSafe {
     function __ConditionalEscrow_init() internal initializer {
         __Context_init_unchained();
         __Ownable_init_unchained();

contracts/payment/escrow/Escrow.sol

@@ -18,7 +18,7 @@ import "../../Initializable.sol";
   * payment method should be its owner, and provide public methods redirecting
   * to the escrow's deposit and withdraw.
   */
-contract EscrowUpgradeable is Initializable, OwnableUpgradeable {
+contract EscrowUpgradeSafe is Initializable, OwnableUpgradeSafe {
     function initialize() public {
         __Escrow_init();
     }

contracts/payment/escrow/RefundEscrow.sol

@@ -13,7 +13,7 @@ import "../../Initializable.sol";
  * withdrawal by the beneficiary, or refunds to the depositors. All interactions
  * with `RefundEscrow` will be made through the owner contract.
  */
-contract RefundEscrowUpgradeable is Initializable, ConditionalEscrowUpgradeable {
+contract RefundEscrowUpgradeSafe is Initializable, ConditionalEscrowUpgradeSafe {
     enum State { Active, Refunding, Closed }
 
     event RefundsClosed();

contracts/presets/ERC20PresetMinterPauser.sol

@@ -21,7 +21,7 @@ import "../Initializable.sol";
  * roles, as well as the default admin role, which will let it grant both minter
  * and pauser roles to aother accounts
  */
-contract ERC20PresetMinterPauserUpgradeable is Initializable, ContextUpgradeable, AccessControlUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable {
+contract ERC20PresetMinterPauserUpgradeSafe is Initializable, ContextUpgradeSafe, AccessControlUpgradeSafe, ERC20BurnableUpgradeSafe, ERC20PausableUpgradeSafe {
     bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
     bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");
 
@@ -99,7 +99,7 @@ contract ERC20PresetMinterPauserUpgradeable is Initializable, ContextUpgradeable
         _unpause();
     }
 
-    function _beforeTokenTransfer(address from, address to, uint256 amount) internal override(ERC20Upgradeable, ERC20PausableUpgradeable) {
+    function _beforeTokenTransfer(address from, address to, uint256 amount) internal override(ERC20UpgradeSafe, ERC20PausableUpgradeSafe) {
         super._beforeTokenTransfer(from, to, amount);
     }
 

contracts/presets/ERC721PresetMinterPauserAutoId.sol

@@ -23,7 +23,7 @@ import "../Initializable.sol";
  * roles, as well as the default admin role, which will let it grant both minter
  * and pauser roles to aother accounts
  */
-contract ERC721PresetMinterPauserAutoIdUpgradeable is Initializable, ContextUpgradeable, AccessControlUpgradeable, ERC721BurnableUpgradeable, ERC721PausableUpgradeable {
+contract ERC721PresetMinterPauserAutoIdUpgradeSafe is Initializable, ContextUpgradeSafe, AccessControlUpgradeSafe, ERC721BurnableUpgradeSafe, ERC721PausableUpgradeSafe {
     using Counters for Counters.Counter;
 
     bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
@@ -115,7 +115,7 @@ contract ERC721PresetMinterPauserAutoIdUpgradeable is Initializable, ContextUpgr
         _unpause();
     }
 
-    function _beforeTokenTransfer(address from, address to, uint256 tokenId) internal override(ERC721Upgradeable, ERC721PausableUpgradeable) {
+    function _beforeTokenTransfer(address from, address to, uint256 tokenId) internal override(ERC721UpgradeSafe, ERC721PausableUpgradeSafe) {
         super._beforeTokenTransfer(from, to, tokenId);
     }
 

contracts/token/ERC20/ERC20.sol

@@ -30,7 +30,7 @@ import "../../Initializable.sol";
  * functions have been added to mitigate the well-known issues around setting
  * allowances. See {IERC20-approve}.
  */
-contract ERC20Upgradeable is Initializable, ContextUpgradeable, IERC20 {
+contract ERC20UpgradeSafe is Initializable, ContextUpgradeSafe, IERC20 {
     using SafeMath for uint256;
     using Address for address;
 

contracts/token/ERC20/ERC20Burnable.sol

@@ -9,7 +9,7 @@ import "../../Initializable.sol";
  * tokens and those that they have an allowance for, in a way that can be
  * recognized off-chain (via event analysis).
  */
-abstract contract ERC20BurnableUpgradeable is Initializable, ContextUpgradeable, ERC20Upgradeable {
+abstract contract ERC20BurnableUpgradeSafe is Initializable, ContextUpgradeSafe, ERC20UpgradeSafe {
     function __ERC20Burnable_init() internal initializer {
         __Context_init_unchained();
         __ERC20Burnable_init_unchained();

contracts/token/ERC20/ERC20Capped.sol

@@ -6,7 +6,7 @@ import "../../Initializable.sol";
 /**
  * @dev Extension of {ERC20} that adds a cap to the supply of tokens.
  */
-abstract contract ERC20CappedUpgradeable is Initializable, ERC20Upgradeable {
+abstract contract ERC20CappedUpgradeSafe is Initializable, ERC20UpgradeSafe {
     uint256 private _cap;
 
     /**

contracts/token/ERC20/ERC20Pausable.sol

@@ -11,7 +11,7 @@ import "../../Initializable.sol";
  * period, or having an emergency switch for freezing all token transfers in the
  * event of a large bug.
  */
-abstract contract ERC20PausableUpgradeable is Initializable, ERC20Upgradeable, PausableUpgradeable {
+abstract contract ERC20PausableUpgradeSafe is Initializable, ERC20UpgradeSafe, PausableUpgradeSafe {
     function __ERC20Pausable_init() internal initializer {
         __Context_init_unchained();
         __Pausable_init_unchained();

contracts/token/ERC20/ERC20Snapshot.sol

@@ -30,7 +30,7 @@ import "../../Initializable.sol";
  * only significant for the first transfer that immediately follows a snapshot for a particular account. Subsequent
  * transfers will have normal cost until the next snapshot, and so on.
  */
-abstract contract ERC20SnapshotUpgradeable is Initializable, ERC20Upgradeable {
+abstract contract ERC20SnapshotUpgradeSafe is Initializable, ERC20UpgradeSafe {
     function __ERC20Snapshot_init() internal initializer {
         __Context_init_unchained();
         __ERC20Snapshot_init_unchained();

contracts/token/ERC20/TokenTimelock.sol

@@ -12,7 +12,7 @@ import "../../Initializable.sol";
  *
  * For a more complete vesting schedule, see {TokenVesting}.
  */
-contract TokenTimelockUpgradeable is Initializable {
+contract TokenTimelockUpgradeSafe is Initializable {
     using SafeERC20 for IERC20;
 
     // ERC20 basic token contract being held

contracts/token/ERC721/ERC721.sol

@@ -17,7 +17,7 @@ import "../../Initializable.sol";
  * @title ERC721 Non-Fungible Token Standard basic implementation
  * @dev see https://eips.ethereum.org/EIPS/eip-721
  */
-contract ERC721Upgradeable is Initializable, ContextUpgradeable, ERC165Upgradeable, IERC721, IERC721Metadata, IERC721Enumerable {
+contract ERC721UpgradeSafe is Initializable, ContextUpgradeSafe, ERC165UpgradeSafe, IERC721, IERC721Metadata, IERC721Enumerable {
     using SafeMath for uint256;
     using Address for address;
     using EnumerableSet for EnumerableSet.UintSet;

contracts/token/ERC721/ERC721Burnable.sol

@@ -8,7 +8,7 @@ import "../../Initializable.sol";
  * @title ERC721 Burnable Token
  * @dev ERC721 Token that can be irreversibly burned (destroyed).
  */
-abstract contract ERC721BurnableUpgradeable is Initializable, ContextUpgradeable, ERC721Upgradeable {
+abstract contract ERC721BurnableUpgradeSafe is Initializable, ContextUpgradeSafe, ERC721UpgradeSafe {
     function __ERC721Burnable_init() internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();

contracts/token/ERC721/ERC721Holder.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.6.0;
 import "./IERC721Receiver.sol";
 import "../../Initializable.sol";
 
-contract ERC721HolderUpgradeable is Initializable, IERC721Receiver {
+contract ERC721HolderUpgradeSafe is Initializable, IERC721Receiver {
     function __ERC721Holder_init() internal initializer {
         __ERC721Holder_init_unchained();
     }

contracts/token/ERC721/ERC721Pausable.sol

@@ -11,7 +11,7 @@ import "../../Initializable.sol";
  * period, or having an emergency switch for freezing all token transfers in the
  * event of a large bug.
  */
-abstract contract ERC721PausableUpgradeable is Initializable, ERC721Upgradeable, PausableUpgradeable {
+abstract contract ERC721PausableUpgradeSafe is Initializable, ERC721UpgradeSafe, PausableUpgradeSafe {
     function __ERC721Pausable_init() internal initializer {
         __Context_init_unchained();
         __ERC165_init_unchained();

contracts/token/ERC777/ERC777.sol

@@ -25,7 +25,7 @@ import "../../Initializable.sol";
  * are no special restrictions in the amount of tokens that created, moved, or
  * destroyed. This makes integration with ERC20 applications seamless.
  */
-contract ERC777Upgradeable is Initializable, ContextUpgradeable, IERC777, IERC20 {
+contract ERC777UpgradeSafe is Initializable, ContextUpgradeSafe, IERC777, IERC20 {
     using SafeMath for uint256;
     using Address for address;
 

contracts/utils/Pausable.sol

@@ -12,7 +12,7 @@ import "../Initializable.sol";
  * the functions of your contract. Note that they will not be pausable by
  * simply including this module, only once the modifiers are put in place.
  */
-contract PausableUpgradeable is Initializable, ContextUpgradeable {
+contract PausableUpgradeSafe is Initializable, ContextUpgradeSafe {
     /**
      * @dev Emitted when the pause is triggered by `account`.
      */

contracts/utils/ReentrancyGuard.sol

@@ -17,7 +17,7 @@ import "../Initializable.sol";
  * to protect against it, check out our blog post
  * https://blog.openzeppelin.com/reentrancy-after-istanbul/[Reentrancy After Istanbul].
  */
-contract ReentrancyGuardUpgradeable is Initializable {
+contract ReentrancyGuardUpgradeSafe is Initializable {
     bool private _notEntered;
 
 

patches/00-fix-references.patch

@@ -2,17 +2,17 @@ diff --git a/contracts/mocks/ContextMock.sol b/contracts/mocks/ContextMock.sol
 index ae989969..5975438f 100644
 --- a/contracts/mocks/ContextMock.sol
 +++ b/contracts/mocks/ContextMock.sol
-@@ -45,11 +45,11 @@ contract ContextMockCallerUpgradeable is Initializable {
+@@ -45,11 +45,11 @@ contract ContextMockCallerUpgradeSafe is Initializable {
          
      }
  
 -    function callSender(ContextMock context) public {
-+    function callSender(ContextMockUpgradeable context) public {
++    function callSender(ContextMockUpgradeSafe context) public {
          context.msgSender();
      }
  
 -    function callData(ContextMock context, uint256 integerValue, string memory stringValue) public {
-+    function callData(ContextMockUpgradeable context, uint256 integerValue, string memory stringValue) public {
++    function callData(ContextMockUpgradeSafe context, uint256 integerValue, string memory stringValue) public {
          context.msgData(integerValue, stringValue);
      }
  }
@@ -20,12 +20,12 @@ diff --git a/contracts/mocks/Create2Impl.sol b/contracts/mocks/Create2Impl.sol
 index 5661a5ea..216f0266 100644
 --- a/contracts/mocks/Create2Impl.sol
 +++ b/contracts/mocks/Create2Impl.sol
-@@ -24,7 +24,7 @@ contract Create2MockUpgradeable is Initializable {
+@@ -24,7 +24,7 @@ contract Create2MockUpgradeSafe is Initializable {
  
      function deployERC1820Implementer(uint256 value, bytes32 salt) public {
          // solhint-disable-next-line indent
 -        Create2.deploy(value, salt, type(ERC1820Implementer).creationCode);
-+        Create2.deploy(value, salt, type(ERC1820ImplementerUpgradeable).creationCode);
++        Create2.deploy(value, salt, type(ERC1820ImplementerUpgradeSafe).creationCode);
      }
  
      function computeAddress(bytes32 salt, bytes32 codeHash) public view returns (address) {
@@ -33,46 +33,46 @@ diff --git a/contracts/mocks/ERC721GSNRecipientMock.sol b/contracts/mocks/ERC721
 index 322ba7ca..1b75ceb8 100644
 --- a/contracts/mocks/ERC721GSNRecipientMock.sol
 +++ b/contracts/mocks/ERC721GSNRecipientMock.sol
-@@ -35,10 +35,10 @@ contract ERC721GSNRecipientMockUpgradeable is Initializable, ERC721Upgradeable,
+@@ -35,10 +35,10 @@ contract ERC721GSNRecipientMockUpgradeSafe is Initializable, ERC721UpgradeSafe,
      }
  
-     function _msgSender() internal view override(ContextUpgradeable, GSNRecipientUpgradeable) returns (address payable) {
+     function _msgSender() internal view override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) returns (address payable) {
 -        return GSNRecipient._msgSender();
-+        return GSNRecipientUpgradeable._msgSender();
++        return GSNRecipientUpgradeSafe._msgSender();
      }
  
-     function _msgData() internal view override(ContextUpgradeable, GSNRecipientUpgradeable) returns (bytes memory) {
+     function _msgData() internal view override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) returns (bytes memory) {
 -        return GSNRecipient._msgData();
-+        return GSNRecipientUpgradeable._msgData();
++        return GSNRecipientUpgradeSafe._msgData();
      }
  }
 diff --git a/contracts/mocks/GSNRecipientMock.sol b/contracts/mocks/GSNRecipientMock.sol
 index 4f29dec0..95ea1db1 100644
 --- a/contracts/mocks/GSNRecipientMock.sol
 +++ b/contracts/mocks/GSNRecipientMock.sol
-@@ -44,10 +44,10 @@ contract GSNRecipientMockUpgradeable is Initializable, ContextMockUpgradeable, G
+@@ -44,10 +44,10 @@ contract GSNRecipientMockUpgradeSafe is Initializable, ContextMockUpgradeSafe, G
      }
  
-     function _msgSender() internal override(ContextUpgradeable, GSNRecipientUpgradeable) view virtual returns (address payable) {
+     function _msgSender() internal override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) view virtual returns (address payable) {
 -        return GSNRecipient._msgSender();
-+        return GSNRecipientUpgradeable._msgSender();
++        return GSNRecipientUpgradeSafe._msgSender();
      }
  
-     function _msgData() internal override(ContextUpgradeable, GSNRecipientUpgradeable) view virtual returns (bytes memory) {
+     function _msgData() internal override(ContextUpgradeSafe, GSNRecipientUpgradeSafe) view virtual returns (bytes memory) {
 -        return GSNRecipient._msgData();
-+        return GSNRecipientUpgradeable._msgData();
++        return GSNRecipientUpgradeSafe._msgData();
      }
  }
 diff --git a/contracts/mocks/ReentrancyMock.sol b/contracts/mocks/ReentrancyMock.sol
 index 4884937f..4fe0b398 100644
 --- a/contracts/mocks/ReentrancyMock.sol
 +++ b/contracts/mocks/ReentrancyMock.sol
-@@ -45,7 +45,7 @@ contract ReentrancyMockUpgradeable is Initializable, ReentrancyGuardUpgradeable
+@@ -45,7 +45,7 @@ contract ReentrancyMockUpgradeSafe is Initializable, ReentrancyGuardUpgradeSafe
          }
      }
  
 -    function countAndCall(ReentrancyAttack attacker) public nonReentrant {
-+    function countAndCall(ReentrancyAttackUpgradeable attacker) public nonReentrant {
++    function countAndCall(ReentrancyAttackUpgradeSafe attacker) public nonReentrant {
          _count();
          bytes4 func = bytes4(keccak256("callback()"));
          attacker.callSender(func);
@@ -80,12 +80,12 @@ diff --git a/contracts/mocks/SafeERC20Helper.sol b/contracts/mocks/SafeERC20Help
 index 53828632..9fcf9cc6 100644
 --- a/contracts/mocks/SafeERC20Helper.sol
 +++ b/contracts/mocks/SafeERC20Helper.sol
-@@ -178,7 +178,7 @@ contract SafeERC20MockUpgradeable is Initializable, ContextUpgradeable {
+@@ -178,7 +178,7 @@ contract SafeERC20MockUpgradeSafe is Initializable, ContextUpgradeSafe {
      }
  
      function setAllowance(uint256 allowance_) public {
 -        ERC20ReturnTrueMock(address(_token)).setAllowance(allowance_);
-+        ERC20ReturnTrueMockUpgradeable(address(_token)).setAllowance(allowance_);
++        ERC20ReturnTrueMockUpgradeSafe(address(_token)).setAllowance(allowance_);
      }
  
      function allowance() public view returns (uint256) {
@@ -96,18 +96,18 @@ index 9decf658..3763f2dc 100644
 @@ -22,7 +22,7 @@ import "../Initializable.sol";
   * payments with {payments}, and retrieve them with {withdrawPayments}.
   */
- contract PullPaymentUpgradeable is Initializable {
+ contract PullPaymentUpgradeSafe is Initializable {
 -    Escrow private _escrow;
-+    EscrowUpgradeable private _escrow;
++    EscrowUpgradeSafe private _escrow;
  
      
      function __PullPayment_init() internal initializer {
-@@ -32,7 +32,7 @@ contract PullPaymentUpgradeable is Initializable {
+@@ -32,7 +32,7 @@ contract PullPaymentUpgradeSafe is Initializable {
      function __PullPayment_init_unchained() internal initializer {
          
          
 -        _escrow = new Escrow();
-+        _escrow = new EscrowUpgradeable();
++        _escrow = new EscrowUpgradeSafe();
      
      }
  

patches/01-initialize-escrow.patch

@@ -2,10 +2,10 @@ diff --git a/contracts/payment/PullPayment.sol b/contracts/payment/PullPayment.s
 index 69d2fc5c..f71282d3 100644
 --- a/contracts/payment/PullPayment.sol
 +++ b/contracts/payment/PullPayment.sol
-@@ -33,7 +33,7 @@ contract PullPaymentUpgradeable is Initializable {
+@@ -33,7 +33,7 @@ contract PullPaymentUpgradeSafe is Initializable {
          
          
-         _escrow = new EscrowUpgradeable();
+         _escrow = new EscrowUpgradeSafe();
 -    
 +        _escrow.initialize();
      }

scripts/upgrade-safe.sh

@@ -17,7 +17,7 @@ git checkout $(git ls-files -d)
 
 # git add contracts
 
-rs "contract\.fromArtifact\('([^I].*?)'\)" "contract.fromArtifact('\${1}Upgradeable')" test
+rs "contract\.fromArtifact\('([^I].*?)'\)" "contract.fromArtifact('\${1}UpgradeSafe')" test
 
 cat patches/* | patch -p1
 

test/GSN/Context.behavior.js

@@ -2,7 +2,7 @@ const { contract } = require('@openzeppelin/test-environment');
 
 const { BN, expectEvent } = require('@openzeppelin/test-helpers');
 
-const ContextMock = contract.fromArtifact('ContextMockUpgradeable');
+const ContextMock = contract.fromArtifact('ContextMockUpgradeSafe');
 
 function shouldBehaveLikeRegularContext (sender) {
   describe('msgSender', function () {

test/GSN/Context.test.js

@@ -2,8 +2,8 @@ const { accounts, contract } = require('@openzeppelin/test-environment');
 
 require('@openzeppelin/test-helpers');
 
-const ContextMock = contract.fromArtifact('ContextMockUpgradeable');
-const ContextMockCaller = contract.fromArtifact('ContextMockCallerUpgradeable');
+const ContextMock = contract.fromArtifact('ContextMockUpgradeSafe');
+const ContextMockCaller = contract.fromArtifact('ContextMockCallerUpgradeSafe');
 
 const { shouldBehaveLikeRegularContext } = require('./Context.behavior');
 

test/GSN/ERC721GSNRecipientMock.test.js

@@ -6,7 +6,7 @@ const gsn = require('@openzeppelin/gsn-helpers');
 const { fixSignature } = require('../helpers/sign');
 const { utils: { toBN } } = require('web3');
 
-const ERC721GSNRecipientMock = contract.fromArtifact('ERC721GSNRecipientMockUpgradeable');
+const ERC721GSNRecipientMock = contract.fromArtifact('ERC721GSNRecipientMockUpgradeSafe');
 
 describe('ERC721GSNRecipient (integration)', function () {
   const [ signer, sender ] = accounts;

test/GSN/GSNRecipient.test.js

@@ -7,8 +7,8 @@ const gsn = require('@openzeppelin/gsn-helpers');
 
 const { expect } = require('chai');
 
-const GSNRecipientMock = contract.fromArtifact('GSNRecipientMockUpgradeable');
-const ContextMockCaller = contract.fromArtifact('ContextMockCallerUpgradeable');
+const GSNRecipientMock = contract.fromArtifact('GSNRecipientMockUpgradeSafe');
+const ContextMockCaller = contract.fromArtifact('ContextMockCallerUpgradeSafe');
 
 const { shouldBehaveLikeRegularContext } = require('./Context.behavior');
 

test/GSN/GSNRecipientERC20Fee.test.js

@@ -5,8 +5,8 @@ const gsn = require('@openzeppelin/gsn-helpers');
 
 const { expect } = require('chai');
 
-const GSNRecipientERC20FeeMock = contract.fromArtifact('GSNRecipientERC20FeeMockUpgradeable');
-const ERC20 = contract.fromArtifact('ERC20Upgradeable');
+const GSNRecipientERC20FeeMock = contract.fromArtifact('GSNRecipientERC20FeeMockUpgradeSafe');
+const ERC20 = contract.fromArtifact('ERC20UpgradeSafe');
 const IRelayHub = contract.fromArtifact('IRelayHub');
 
 describe('GSNRecipientERC20Fee', function () {

test/GSN/GSNRecipientSignature.test.js

@@ -6,7 +6,7 @@ const { fixSignature } = require('../helpers/sign');
 const { utils: { toBN } } = require('web3');
 const { ZERO_ADDRESS } = constants;
 
-const GSNRecipientSignatureMock = contract.fromArtifact('GSNRecipientSignatureMockUpgradeable');
+const GSNRecipientSignatureMock = contract.fromArtifact('GSNRecipientSignatureMockUpgradeSafe');
 
 describe('GSNRecipientSignature', function () {
   const [ signer, other ] = accounts;

test/access/AccessControl.test.js

@@ -4,7 +4,7 @@ const { expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const AccessControlMock = contract.fromArtifact('AccessControlMockUpgradeable');
+const AccessControlMock = contract.fromArtifact('AccessControlMockUpgradeSafe');
 
 describe('AccessControl', function () {
   const [ admin, authorized, otherAuthorized, other, otherAdmin ] = accounts;

test/access/Ownable.test.js

@@ -4,7 +4,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const Ownable = contract.fromArtifact('OwnableMockUpgradeable');
+const Ownable = contract.fromArtifact('OwnableMockUpgradeSafe');
 
 describe('Ownable', function () {
   const [ owner, other ] = accounts;

test/cryptography/ECDSA.test.js

@@ -5,7 +5,7 @@ const { toEthSignedMessageHash, fixSignature } = require('../helpers/sign');
 
 const { expect } = require('chai');
 
-const ECDSAMock = contract.fromArtifact('ECDSAMockUpgradeable');
+const ECDSAMock = contract.fromArtifact('ECDSAMockUpgradeSafe');
 
 const TEST_MESSAGE = web3.utils.sha3('OpenZeppelin');
 const WRONG_MESSAGE = web3.utils.sha3('Nope');

test/cryptography/MerkleProof.test.js

@@ -7,7 +7,7 @@ const { keccak256, bufferToHex } = require('ethereumjs-util');
 
 const { expect } = require('chai');
 
-const MerkleProofWrapper = contract.fromArtifact('MerkleProofWrapperUpgradeable');
+const MerkleProofWrapper = contract.fromArtifact('MerkleProofWrapperUpgradeSafe');
 
 describe('MerkleProof', function () {
   beforeEach(async function () {

test/introspection/ERC165.test.js

@@ -3,7 +3,7 @@ const { expectRevert } = require('@openzeppelin/test-helpers');
 
 const { shouldSupportInterfaces } = require('./SupportsInterface.behavior');
 
-const ERC165Mock = contract.fromArtifact('ERC165MockUpgradeable');
+const ERC165Mock = contract.fromArtifact('ERC165MockUpgradeSafe');
 
 describe('ERC165', function () {
   beforeEach(async function () {

test/introspection/ERC165Checker.test.js

@@ -3,9 +3,9 @@ require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const ERC165CheckerMock = contract.fromArtifact('ERC165CheckerMockUpgradeable');
-const ERC165NotSupported = contract.fromArtifact('ERC165NotSupportedUpgradeable');
-const ERC165InterfacesSupported = contract.fromArtifact('ERC165InterfacesSupportedUpgradeable');
+const ERC165CheckerMock = contract.fromArtifact('ERC165CheckerMockUpgradeSafe');
+const ERC165NotSupported = contract.fromArtifact('ERC165NotSupportedUpgradeSafe');
+const ERC165InterfacesSupported = contract.fromArtifact('ERC165InterfacesSupportedUpgradeSafe');
 
 const DUMMY_ID = '0xdeadbeef';
 const DUMMY_ID_2 = '0xcafebabe';

test/introspection/ERC1820Implementer.test.js

@@ -5,7 +5,7 @@ const { bufferToHex, keccak256 } = require('ethereumjs-util');
 
 const { expect } = require('chai');
 
-const ERC1820ImplementerMock = contract.fromArtifact('ERC1820ImplementerMockUpgradeable');
+const ERC1820ImplementerMock = contract.fromArtifact('ERC1820ImplementerMockUpgradeSafe');
 
 describe('ERC1820Implementer', function () {
   const [ registryFunder, implementee, other ] = accounts;

test/math/Math.test.js

@@ -3,7 +3,7 @@ const { BN } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const MathMock = contract.fromArtifact('MathMockUpgradeable');
+const MathMock = contract.fromArtifact('MathMockUpgradeSafe');
 
 describe('Math', function () {
   const min = new BN('1234');

test/math/SafeMath.test.js

@@ -4,7 +4,7 @@ const { MAX_UINT256 } = constants;
 
 const { expect } = require('chai');
 
-const SafeMathMock = contract.fromArtifact('SafeMathMockUpgradeable');
+const SafeMathMock = contract.fromArtifact('SafeMathMockUpgradeSafe');
 
 describe('SafeMath', function () {
   beforeEach(async function () {

test/math/SignedSafeMath.test.js

@@ -5,7 +5,7 @@ const { MAX_INT256, MIN_INT256 } = constants;
 
 const { expect } = require('chai');
 
-const SignedSafeMathMock = contract.fromArtifact('SignedSafeMathMockUpgradeable');
+const SignedSafeMathMock = contract.fromArtifact('SignedSafeMathMockUpgradeSafe');
 
 describe('SignedSafeMath', function () {
   beforeEach(async function () {

test/payment/PaymentSplitter.test.js

@@ -5,7 +5,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const PaymentSplitter = contract.fromArtifact('PaymentSplitterMockUpgradeable');
+const PaymentSplitter = contract.fromArtifact('PaymentSplitterMockUpgradeSafe');
 
 describe('PaymentSplitter', function () {
   const [ owner, payee1, payee2, payee3, nonpayee1, payer1 ] = accounts;

test/payment/PullPayment.test.js

@@ -4,7 +4,7 @@ const { balance, ether } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const PullPaymentMock = contract.fromArtifact('PullPaymentMockUpgradeable');
+const PullPaymentMock = contract.fromArtifact('PullPaymentMockUpgradeSafe');
 
 describe('PullPayment', function () {
   const [ payer, payee1, payee2 ] = accounts;

test/payment/escrow/ConditionalEscrow.test.js

@@ -3,7 +3,7 @@ const { accounts, contract } = require('@openzeppelin/test-environment');
 const { ether, expectRevert } = require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeEscrow } = require('./Escrow.behavior');
 
-const ConditionalEscrowMock = contract.fromArtifact('ConditionalEscrowMockUpgradeable');
+const ConditionalEscrowMock = contract.fromArtifact('ConditionalEscrowMockUpgradeSafe');
 
 describe('ConditionalEscrow', function () {
   const [ owner, payee, ...otherAccounts ] = accounts;

test/payment/escrow/Escrow.test.js

@@ -3,7 +3,7 @@ const { accounts, contract } = require('@openzeppelin/test-environment');
 require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeEscrow } = require('./Escrow.behavior');
 
-const Escrow = contract.fromArtifact('EscrowMockUpgradeable');
+const Escrow = contract.fromArtifact('EscrowMockUpgradeSafe');
 
 describe('Escrow', function () {
   const [ owner, ...otherAccounts ] = accounts;

test/payment/escrow/RefundEscrow.test.js

@@ -5,7 +5,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const RefundEscrow = contract.fromArtifact('RefundEscrowMockUpgradeable');
+const RefundEscrow = contract.fromArtifact('RefundEscrowMockUpgradeSafe');
 
 describe('RefundEscrow', function () {
   const [ owner, beneficiary, refundee1, refundee2 ] = accounts;

test/presets/ERC20PresetMinterPauser.test.js

@@ -5,7 +5,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const ERC20PresetMinterPauser = contract.fromArtifact('ERC20PresetMinterPauserMockUpgradeable');
+const ERC20PresetMinterPauser = contract.fromArtifact('ERC20PresetMinterPauserMockUpgradeSafe');
 
 describe('ERC20PresetMinterPauser', function () {
   const [ deployer, other ] = accounts;

test/presets/ERC721PresetMinterPauserAutoId.js

@@ -5,7 +5,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const ERC721PresetMinterPauserAutoId = contract.fromArtifact('ERC721PresetMinterPauserAutoIdMockUpgradeable');
+const ERC721PresetMinterPauserAutoId = contract.fromArtifact('ERC721PresetMinterPauserAutoIdMockUpgradeSafe');
 
 describe('ERC721PresetMinterPauserAutoId', function () {
   const [ deployer, other ] = accounts;

test/token/ERC20/ERC20.test.js

@@ -10,8 +10,8 @@ const {
   shouldBehaveLikeERC20Approve,
 } = require('./ERC20.behavior');
 
-const ERC20Mock = contract.fromArtifact('ERC20MockUpgradeable');
-const ERC20DecimalsMock = contract.fromArtifact('ERC20DecimalsMockUpgradeable');
+const ERC20Mock = contract.fromArtifact('ERC20MockUpgradeSafe');
+const ERC20DecimalsMock = contract.fromArtifact('ERC20DecimalsMockUpgradeSafe');
 
 describe('ERC20', function () {
   const [ initialHolder, recipient, anotherAccount ] = accounts;

test/token/ERC20/ERC20Burnable.test.js

@@ -3,7 +3,7 @@ const { accounts, contract } = require('@openzeppelin/test-environment');
 const { BN } = require('@openzeppelin/test-helpers');
 
 const { shouldBehaveLikeERC20Burnable } = require('./behaviors/ERC20Burnable.behavior');
-const ERC20BurnableMock = contract.fromArtifact('ERC20BurnableMockUpgradeable');
+const ERC20BurnableMock = contract.fromArtifact('ERC20BurnableMockUpgradeSafe');
 
 describe('ERC20Burnable', function () {
   const [ owner, ...otherAccounts ] = accounts;

test/token/ERC20/ERC20Capped.test.js

@@ -3,7 +3,7 @@ const { accounts, contract } = require('@openzeppelin/test-environment');
 const { BN, ether, expectRevert } = require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeERC20Capped } = require('./behaviors/ERC20Capped.behavior');
 
-const ERC20Capped = contract.fromArtifact('ERC20CappedMockUpgradeable');
+const ERC20Capped = contract.fromArtifact('ERC20CappedMockUpgradeSafe');
 
 describe('ERC20Capped', function () {
   const [ minter, ...otherAccounts ] = accounts;

test/token/ERC20/ERC20Pausable.test.js

@@ -4,7 +4,7 @@ const { BN, expectRevert } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const ERC20PausableMock = contract.fromArtifact('ERC20PausableMockUpgradeable');
+const ERC20PausableMock = contract.fromArtifact('ERC20PausableMockUpgradeSafe');
 
 describe('ERC20Pausable', function () {
   const [ holder, recipient, anotherAccount ] = accounts;

test/token/ERC20/ERC20Snapshot.test.js

 const { accounts, contract } = require('@openzeppelin/test-environment');
 
 const { BN, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
-const ERC20SnapshotMock = contract.fromArtifact('ERC20SnapshotMockUpgradeable');
+const ERC20SnapshotMock = contract.fromArtifact('ERC20SnapshotMockUpgradeSafe');
 
 const { expect } = require('chai');
 

test/token/ERC20/SafeERC20.test.js

@@ -2,10 +2,10 @@ const { accounts, contract } = require('@openzeppelin/test-environment');
 
 const { expectRevert } = require('@openzeppelin/test-helpers');
 
-const ERC20ReturnFalseMock = contract.fromArtifact('ERC20ReturnFalseMockUpgradeable');
-const ERC20ReturnTrueMock = contract.fromArtifact('ERC20ReturnTrueMockUpgradeable');
-const ERC20NoReturnMock = contract.fromArtifact('ERC20NoReturnMockUpgradeable');
-const SafeERC20Mock = contract.fromArtifact('SafeERC20MockUpgradeable');
+const ERC20ReturnFalseMock = contract.fromArtifact('ERC20ReturnFalseMockUpgradeSafe');
+const ERC20ReturnTrueMock = contract.fromArtifact('ERC20ReturnTrueMockUpgradeSafe');
+const ERC20NoReturnMock = contract.fromArtifact('ERC20NoReturnMockUpgradeSafe');
+const SafeERC20Mock = contract.fromArtifact('SafeERC20MockUpgradeSafe');
 
 describe('SafeERC20', function () {
   const [ hasNoCode ] = accounts;

test/token/ERC20/TokenTimelock.test.js

@@ -4,8 +4,8 @@ const { BN, expectRevert, time } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const ERC20Mock = contract.fromArtifact('ERC20MockUpgradeable');
-const TokenTimelock = contract.fromArtifact('TokenTimelockMockUpgradeable');
+const ERC20Mock = contract.fromArtifact('ERC20MockUpgradeSafe');
+const TokenTimelock = contract.fromArtifact('TokenTimelockMockUpgradeSafe');
 
 describe('TokenTimelock', function () {
   const [ beneficiary ] = accounts;

test/token/ERC721/ERC721.test.js

@@ -7,8 +7,8 @@ const { expect } = require('chai');
 
 const { shouldSupportInterfaces } = require('../../introspection/SupportsInterface.behavior');
 
-const ERC721Mock = contract.fromArtifact('ERC721MockUpgradeable');
-const ERC721ReceiverMock = contract.fromArtifact('ERC721ReceiverMockUpgradeable');
+const ERC721Mock = contract.fromArtifact('ERC721MockUpgradeSafe');
+const ERC721ReceiverMock = contract.fromArtifact('ERC721ReceiverMockUpgradeSafe');
 
 describe('ERC721', function () {
   const [owner, newOwner, approved, anotherApproved, operator, other] = accounts;

test/token/ERC721/ERC721Burnable.test.js

@@ -5,7 +5,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const ERC721BurnableMock = contract.fromArtifact('ERC721BurnableMockUpgradeable');
+const ERC721BurnableMock = contract.fromArtifact('ERC721BurnableMockUpgradeSafe');
 
 describe('ERC721Burnable', function () {
   const [owner, approved] = accounts;

test/token/ERC721/ERC721Holder.test.js

@@ -4,8 +4,8 @@ const { BN } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const ERC721Holder = contract.fromArtifact('ERC721HolderUpgradeable');
-const ERC721Mock = contract.fromArtifact('ERC721MockUpgradeable');
+const ERC721Holder = contract.fromArtifact('ERC721HolderUpgradeSafe');
+const ERC721Mock = contract.fromArtifact('ERC721MockUpgradeSafe');
 
 describe('ERC721Holder', function () {
   const [ owner ] = accounts;

test/token/ERC721/ERC721Pausable.test.js

@@ -5,7 +5,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const ERC721PausableMock = contract.fromArtifact('ERC721PausableMockUpgradeable');
+const ERC721PausableMock = contract.fromArtifact('ERC721PausableMockUpgradeSafe');
 
 describe('ERC721Pausable', function () {
   const [ owner, receiver, operator ] = accounts;

test/token/ERC777/ERC777.behavior.js

@@ -4,7 +4,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-const ERC777SenderRecipientMock = contract.fromArtifact('ERC777SenderRecipientMockUpgradeable');
+const ERC777SenderRecipientMock = contract.fromArtifact('ERC777SenderRecipientMockUpgradeSafe');
 
 function shouldBehaveLikeERC777DirectSendBurn (holder, recipient, data) {
   shouldBehaveLikeERC777DirectSend(holder, recipient, data);

test/token/ERC777/ERC777.test.js

@@ -17,8 +17,8 @@ const {
   shouldBehaveLikeERC20,
 } = require('../ERC20/ERC20.behavior');
 
-const ERC777 = contract.fromArtifact('ERC777MockUpgradeable');
-const ERC777SenderRecipientMock = contract.fromArtifact('ERC777SenderRecipientMockUpgradeable');
+const ERC777 = contract.fromArtifact('ERC777MockUpgradeSafe');
+const ERC777SenderRecipientMock = contract.fromArtifact('ERC777SenderRecipientMockUpgradeSafe');
 
 describe('ERC777', function () {
   const [ registryFunder, holder, defaultOperatorA, defaultOperatorB, newOperator, anyone ] = accounts;

test/utils/Address.test.js

@@ -3,8 +3,8 @@ const { accounts, contract } = require('@openzeppelin/test-environment');
 const { balance, ether, expectRevert, send } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');
 
-const AddressMock = contract.fromArtifact('AddressMockUpgradeable');
-const EtherReceiver = contract.fromArtifact('EtherReceiverMockUpgradeable');
+const AddressMock = contract.fromArtifact('AddressMockUpgradeSafe');
+const EtherReceiver = contract.fromArtifact('EtherReceiverMockUpgradeSafe');
 
 describe('Address', function () {
   const [ recipient, other ] = accounts;

test/utils/Arrays.test.js

@@ -3,7 +3,7 @@ require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const ArraysMock = contract.fromArtifact('ArraysMockUpgradeable');
+const ArraysMock = contract.fromArtifact('ArraysMockUpgradeSafe');
 
 describe('Arrays', function () {
   context('Even number of elements', function () {

test/utils/Counters.test.js

@@ -3,7 +3,7 @@ const { expectRevert } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const CountersMock = contract.fromArtifact('CountersMockUpgradeable');
+const CountersMock = contract.fromArtifact('CountersMockUpgradeSafe');
 
 describe('Counters', function () {
   beforeEach(async function () {

test/utils/Create2.test.js

@@ -3,9 +3,9 @@ const { balance, BN, ether, expectRevert, send } = require('@openzeppelin/test-h
 
 const { expect } = require('chai');
 
-const Create2Mock = contract.fromArtifact('Create2MockUpgradeable');
-const ERC20Mock = contract.fromArtifact('ERC20MockUpgradeable');
-const ERC1820Implementer = contract.fromArtifact('ERC1820ImplementerUpgradeable');
+const Create2Mock = contract.fromArtifact('Create2MockUpgradeSafe');
+const ERC20Mock = contract.fromArtifact('ERC20MockUpgradeSafe');
+const ERC1820Implementer = contract.fromArtifact('ERC1820ImplementerUpgradeSafe');
 
 describe('Create2', function () {
   const [deployerAccount] = accounts;

test/utils/EnumerableMap.test.js

@@ -4,7 +4,7 @@ const { expect } = require('chai');
 
 const zip = require('lodash.zip');
 
-const EnumerableMapMock = contract.fromArtifact('EnumerableMapMockUpgradeable');
+const EnumerableMapMock = contract.fromArtifact('EnumerableMapMockUpgradeSafe');
 
 describe('EnumerableMap', function () {
   const [ accountA, accountB, accountC ] = accounts;

test/utils/EnumerableSet.test.js

@@ -2,7 +2,7 @@ const { accounts, contract } = require('@openzeppelin/test-environment');
 const { expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');
 
-const EnumerableSetMock = contract.fromArtifact('EnumerableSetMockUpgradeable');
+const EnumerableSetMock = contract.fromArtifact('EnumerableSetMockUpgradeSafe');
 
 describe('EnumerableSet', function () {
   const [ accountA, accountB, accountC ] = accounts;

test/utils/Pausable.test.js

@@ -4,7 +4,7 @@ const { expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const PausableMock = contract.fromArtifact('PausableMockUpgradeable');
+const PausableMock = contract.fromArtifact('PausableMockUpgradeSafe');
 
 describe('Pausable', function () {
   const [ pauser ] = accounts;

test/utils/ReentrancyGuard.test.js

@@ -3,8 +3,8 @@ const { expectRevert } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const ReentrancyMock = contract.fromArtifact('ReentrancyMockUpgradeable');
-const ReentrancyAttack = contract.fromArtifact('ReentrancyAttackUpgradeable');
+const ReentrancyMock = contract.fromArtifact('ReentrancyMockUpgradeSafe');
+const ReentrancyAttack = contract.fromArtifact('ReentrancyAttackUpgradeSafe');
 
 describe('ReentrancyGuard', function () {
   beforeEach(async function () {

test/utils/SafeCast.test.js

@@ -3,7 +3,7 @@ const { BN, expectRevert } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const SafeCastMock = contract.fromArtifact('SafeCastMockUpgradeable');
+const SafeCastMock = contract.fromArtifact('SafeCastMockUpgradeSafe');
 
 describe('SafeCast', async () => {
   beforeEach(async function () {

test/utils/Strings.test.js

@@ -3,7 +3,7 @@ const { constants } = require('@openzeppelin/test-helpers');
 
 const { expect } = require('chai');
 
-const StringsMock = contract.fromArtifact('StringsMockUpgradeable');
+const StringsMock = contract.fromArtifact('StringsMockUpgradeSafe');
 
 describe('Strings', function () {
   beforeEach(async function () {