diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b034767f4d..c09c10bc25d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,14 @@
  * Tokens: Wrap definitely safe subtractions in `unchecked` blocks. 
  * `Math`: Add a `ceilDiv` method for performing ceiling division.
 
+ ### Breaking Changes
+ 
+ * `ERC20FlashMint` is no longer a Draft ERC. ([#2673](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2673)))
+ 
+**How to update:** Change your import paths by removing the `draft-` prefix from `@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20FlashMint.sol`.
+
+> See [Releases and Stability: Drafts](https://docs.openzeppelin.com/contracts/4.x/releases-stability#drafts).
+
 ## 4.1.0 (2021-04-29)
 
  * `IERC20Metadata`: add a new extended interface that includes the optional `name()`, `symbol()` and `decimals()` functions. ([#2561](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2561))
diff --git a/contracts/mocks/ERC3156Mock.sol b/contracts/mocks/ERC20FlashMintMock.sol
similarity index 84%
rename from contracts/mocks/ERC3156Mock.sol
rename to contracts/mocks/ERC20FlashMintMock.sol
index ccc344141af..33dba245d94 100644
--- a/contracts/mocks/ERC3156Mock.sol
+++ b/contracts/mocks/ERC20FlashMintMock.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 
-import "../token/ERC20/extensions/draft-ERC20FlashMint.sol";
+import "../token/ERC20/extensions/ERC20FlashMint.sol";
 
 contract ERC20FlashMintMock is ERC20FlashMint {
     constructor (
diff --git a/contracts/mocks/ERC20VotesMock.sol b/contracts/mocks/ERC20VotesMock.sol
index f7f45bf94d6..27affad7c67 100644
--- a/contracts/mocks/ERC20VotesMock.sol
+++ b/contracts/mocks/ERC20VotesMock.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 
-import "../token/ERC20/extensions/draft-ERC20Votes.sol";
+import "../token/ERC20/extensions/ERC20Votes.sol";
 
 contract ERC20VotesMock is ERC20Votes {
     constructor (
diff --git a/contracts/token/ERC20/extensions/draft-ERC20FlashMint.sol b/contracts/token/ERC20/extensions/ERC20FlashMint.sol
similarity index 100%
rename from contracts/token/ERC20/extensions/draft-ERC20FlashMint.sol
rename to contracts/token/ERC20/extensions/ERC20FlashMint.sol
diff --git a/contracts/token/ERC20/extensions/draft-ERC20Votes.sol b/contracts/token/ERC20/extensions/ERC20Votes.sol
similarity index 99%
rename from contracts/token/ERC20/extensions/draft-ERC20Votes.sol
rename to contracts/token/ERC20/extensions/ERC20Votes.sol
index d4b3a094ee3..c0fada30fae 100644
--- a/contracts/token/ERC20/extensions/draft-ERC20Votes.sol
+++ b/contracts/token/ERC20/extensions/ERC20Votes.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 import "./draft-ERC20Permit.sol";
-import "./draft-IERC20Votes.sol";
+import "./IERC20Votes.sol";
 import "../../../utils/math/Math.sol";
 import "../../../utils/math/SafeCast.sol";
 import "../../../utils/cryptography/ECDSA.sol";
diff --git a/contracts/token/ERC20/extensions/draft-IERC20Votes.sol b/contracts/token/ERC20/extensions/IERC20Votes.sol
similarity index 100%
rename from contracts/token/ERC20/extensions/draft-IERC20Votes.sol
rename to contracts/token/ERC20/extensions/IERC20Votes.sol