diff --git a/src/base/faucet/Index.svelte b/src/base/faucet/Index.svelte
index 9395d9af8..9524da1f0 100644
--- a/src/base/faucet/Index.svelte
+++ b/src/base/faucet/Index.svelte
@@ -5,7 +5,7 @@
   import type { ethers } from "ethers";
   import { onMount } from "svelte";
   import { navigate } from "svelte-routing";
-  import { getMaxWithdrawAmount, lastWithdrawalByUser, calculateTimeLock } from "./Faucet";
+  import { getMaxWithdrawAmount, lastWithdrawalByUser, calculateTimeLock } from "./lib";
 
   export let config: Config;
 
@@ -16,7 +16,7 @@
 
   async function withdraw() {
     const [state, message] = await isAbleToWithdraw(amountBN);
-    if (state === true) navigate("/faucet/submit", { state: { amount } });
+    if (state === true) navigate("/faucet/withdraw", { state: { amount } });
     else error = message;
   }
 
diff --git a/src/base/faucet/Routes.svelte b/src/base/faucet/Routes.svelte
index 9a220b3c1..e13f4a38b 100644
--- a/src/base/faucet/Routes.svelte
+++ b/src/base/faucet/Routes.svelte
@@ -2,7 +2,7 @@
   import { Route } from "svelte-routing";
   import Index from "@app/base/faucet/Index.svelte";
   import type { Config } from "@app/config";
-  import Submit from "./Submit.svelte";
+  import Withdraw from "./Withdraw.svelte";
 
   export let config: Config;
 </script>
@@ -11,6 +11,6 @@
   <Index {config} />
 </Route>
 
-<Route path="faucet/submit">
-  <Submit {config} />
+<Route path="faucet/withdraw">
+  <Withdraw {config} />
 </Route>
diff --git a/src/base/faucet/Submit.svelte b/src/base/faucet/Withdraw.svelte
similarity index 93%
rename from src/base/faucet/Submit.svelte
rename to src/base/faucet/Withdraw.svelte
index dfac92d0a..a22cc6223 100644
--- a/src/base/faucet/Submit.svelte
+++ b/src/base/faucet/Withdraw.svelte
@@ -6,7 +6,7 @@
   import Modal from "@app/Modal.svelte";
   import Err from "@app/Error.svelte";
   import { Status, State } from "@app/utils";
-  import { withdraw } from "./Faucet";
+  import { withdraw } from "./lib";
   import { session } from '@app/session';
 
   export let config: Config;
@@ -47,7 +47,7 @@
   <Err
     title="Transaction failed"
     message={error.message}
-    on:close={() => navigate("/faucet")}
+    on:close={back}
   />
 {:else}
   <Modal>
@@ -79,7 +79,7 @@
 
     <span slot="actions">
       {#if state.status === Status.Success}
-        <button on:click={back} class="register"> Back </button>
+        <button on:click={back}> Back </button>
       {/if}
     </span>
   </Modal>
diff --git a/src/base/faucet/Faucet.ts b/src/base/faucet/lib.ts
similarity index 100%
rename from src/base/faucet/Faucet.ts
rename to src/base/faucet/lib.ts