diff --git a/apps/etherscan/src/app/utils/utilities.ts b/apps/etherscan/src/app/utils/utilities.ts
index 748babf9e5..d7300806a3 100644
--- a/apps/etherscan/src/app/utils/utilities.ts
+++ b/apps/etherscan/src/app/utils/utilities.ts
@@ -13,9 +13,7 @@ export const getNetworkName = async (client: RemixClient) => {
   if (!network) {
     throw new Error("no known network to verify against")
   }
-  const name = network.name!.toLowerCase()
-  // TODO : remove that when https://github.com/ethereum/remix-ide/issues/2017 is fixe
-  return name === "görli" ? "goerli" : name
+  return network.name!.toLowerCase()
 }
 
 export const getReceiptStatus = async (
diff --git a/libs/remix-core-plugin/src/lib/compiler-metadata.ts b/libs/remix-core-plugin/src/lib/compiler-metadata.ts
index 9a69e616f4..403c22b90b 100644
--- a/libs/remix-core-plugin/src/lib/compiler-metadata.ts
+++ b/libs/remix-core-plugin/src/lib/compiler-metadata.ts
@@ -15,7 +15,7 @@ export class CompilerMetadata extends Plugin {
   innerPath: string
   constructor () {
     super(profile)
-    this.networks = ['VM:-', 'main:1', 'ropsten:3', 'rinkeby:4', 'kovan:42', 'görli:5', 'Custom']
+    this.networks = ['VM:-', 'main:1', 'ropsten:3', 'rinkeby:4', 'kovan:42', 'goerli:5', 'Custom']
     this.innerPath = 'artifacts'
   }