diff --git a/build.gradle b/build.gradle
index 91fffd027d..f3fc6cfbd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,11 +29,11 @@ test {
 }
 
 application {
-    mainClassName = "seedu.duke.Duke"
+    mainClassName = "seedu.duke.Click"
 }
 
 shadowJar {
-    archiveBaseName = "duke"
+    archiveBaseName = "click"
     archiveClassifier = null
 }
 
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
index 19e86fe56e..3ae745f984 100644
--- a/src/main/java/META-INF/MANIFEST.MF
+++ b/src/main/java/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: seedu.duke.Duke
+Main-Class: seedu.duke.Click
 
diff --git a/src/main/java/seedu/duke/Duke.java b/src/main/java/seedu/duke/Click.java
similarity index 90%
rename from src/main/java/seedu/duke/Duke.java
rename to src/main/java/seedu/duke/Click.java
index 9528337451..4e5d1618fa 100644
--- a/src/main/java/seedu/duke/Duke.java
+++ b/src/main/java/seedu/duke/Click.java
@@ -1,14 +1,11 @@
 package seedu.duke;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.nio.file.FileAlreadyExistsException;
 import java.util.Scanner;
 import java.util.logging.Logger;
 
 import seedu.duke.exceptions.ClickException;
 import seedu.duke.logger.ClickLogger;
-import seedu.duke.task.TaskList;
 import seedu.duke.exceptions.ExceptionHandler;
 
 import seedu.duke.ui.Ui;
@@ -16,7 +13,7 @@
 import seedu.duke.storage.Storage;
 import seedu.duke.parser.Parser;
 
-public class Duke {
+public class Click {
 
     private static Ui ui = new Ui();
     private static ExceptionHandler exceptionHandler = new ExceptionHandler();
@@ -64,7 +61,7 @@ private static void run() {
      * @param args Unused params.
      */
     public static void main(String[] args) {
-        new Duke();
-        Duke.run();
+        new Click();
+        Click.run();
     }
 }
diff --git a/src/test/java/seedu/duke/DukeTest.java b/src/test/java/seedu/duke/ClickTest.java
similarity index 91%
rename from src/test/java/seedu/duke/DukeTest.java
rename to src/test/java/seedu/duke/ClickTest.java
index 2dda5fd651..3f98c05d9a 100644
--- a/src/test/java/seedu/duke/DukeTest.java
+++ b/src/test/java/seedu/duke/ClickTest.java
@@ -4,7 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 
-class DukeTest {
+class ClickTest {
     @Test
     public void sampleTest() {
         assertTrue(true);