diff --git a/contracts/ERC20/ERC20Upgradeable.sol b/contracts/ERC20/ERC20Initializable.sol
similarity index 59%
rename from contracts/ERC20/ERC20Upgradeable.sol
rename to contracts/ERC20/ERC20Initializable.sol
index 3353a01..3162261 100644
--- a/contracts/ERC20/ERC20Upgradeable.sol
+++ b/contracts/ERC20/ERC20Initializable.sol
@@ -2,23 +2,21 @@
 
 pragma solidity ^0.6.0;
 
-import "@openzeppelin/upgrades-core/contracts/Initializable.sol";
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
 
 /**
  * @dev Easy configurable and upgradeable token
  */
-contract ERC20Upgradeable is Initializable, ERC20 {
+contract ERC20Initializable is ERC20Upgradeable {
 
     /// @dev Token constructor
-    initialize(
+    function initialize(
       string memory name,
       string memory symbol,
       uint8 decimals,
       uint256 supply
     ) public initializer {
-        _name = name;
-        _symbol = symbol;
+        __ERC20_init(name, symbol);
         _setupDecimals(decimals);
         _mint(msg.sender, supply);
     }
diff --git a/package-lock.json b/package-lock.json
index db29bd4..5da84e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@windingtree/smart-contracts-libraries",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -303,9 +303,14 @@
       }
     },
     "@openzeppelin/contracts": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.3.0.tgz",
-      "integrity": "sha512-AemZEsQYtUp1WRkcmZm1div5ORfTpLquLaziCIrSagjxyKdmObxuaY1yjQ5SHFMctR8rLwp706NXTbiIRJg7pw=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.4.0.tgz",
+      "integrity": "sha512-qh+EiHWzfY/9CORr+eRUkeEUP1WiFUcq3974bLHwyYzLBUtK6HPaMkIUHi74S1rDTZ0sNz42DwPc5A4IJvN3rg=="
+    },
+    "@openzeppelin/contracts-upgradeable": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-3.4.0.tgz",
+      "integrity": "sha512-7wBcbukDqWZt/B1zjb7zyeWq+AC7rx7nGln7/hPxHdKd8PAiiteXd51Cp2KmGP8qaY0/TXh/fQLsA082LWp8Zw=="
     },
     "@openzeppelin/upgrades-core": {
       "version": "1.5.0",
@@ -2928,9 +2933,9 @@
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz",
-      "integrity": "sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
@@ -3323,9 +3328,9 @@
       "dev": true
     },
     "is-callable": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
       "dev": true
     },
     "is-date-object": {
@@ -3409,11 +3414,12 @@
       "dev": true
     },
     "is-regex": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "has-symbols": "^1.0.1"
       }
     },
@@ -5520,9 +5526,9 @@
       }
     },
     "truffle": {
-      "version": "5.1.63",
-      "resolved": "https://registry.npmjs.org/truffle/-/truffle-5.1.63.tgz",
-      "integrity": "sha512-gqji8h0nnZ8AGaFqLaRCVECdP2k52H/V1TtjO9v4oLwSfXo5iO1V2+9yBo2NaQQZc3q6vSgZXlcIFEoneKAswQ==",
+      "version": "5.1.64",
+      "resolved": "https://registry.npmjs.org/truffle/-/truffle-5.1.64.tgz",
+      "integrity": "sha512-qobAgDRRK8rUr6SjH8gmacp1a50XJFD2zX1tCtxdk3RXl3yCSEBxHP1srW+jPoPzL6Ua6C0vbbbjVbemrTrtAQ==",
       "dev": true,
       "requires": {
         "app-module-path": "^2.2.0",
diff --git a/package.json b/package.json
index f5a0023..b2077f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@windingtree/smart-contracts-libraries",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Libraries and utilities for smart contracts",
   "publishConfig": {
     "access": "public"
@@ -28,13 +28,14 @@
   },
   "homepage": "https://github.com/windingtree/smart-contracts-libraries#readme",
   "dependencies": {
-    "@openzeppelin/contracts": "3.3.0",
+    "@openzeppelin/contracts": "3.4.0",
+    "@openzeppelin/contracts-upgradeable": "3.4.0",
     "@openzeppelin/upgrades-core": "1.5.0"
   },
   "devDependencies": {
     "solc": "0.8.1",
     "solhint": "3.3.2",
-    "truffle": "5.1.63",
+    "truffle": "5.1.64",
     "@truffle/hdwallet-provider": "1.2.1"
   }
 }