diff --git a/README.md b/README.md
index 5370ad8893..40695e4d13 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,3 @@
-# Puke: the working personal assistant chatbot
+# Bari, a personal assistant chatbot
 
-[![Build Status](https://travis-ci.com/Parcly-Taxel/duke.svg?branch=master)](https://travis-ci.com/Parcly-Taxel/duke)
-
-## Feedback, Bug Reports
-
-* If you have feedback or bug reports, please post in [se-edu/duke issue tracker](https://github.com/se-edu/duke/issues).
-* We welcome pull requests too.
+[![Build Status](https://travis-ci.com/Parcly-Taxel/duke.svg?branch=master)](https://travis-ci.com/Parcly-Taxel/duke)
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ebb61618a7..1924fb0206 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id 'org.openjfx.javafxplugin' version '0.0.8'
 }
 
-group "puke"
+group "bari"
 version "0.9.5"
 
 repositories {
@@ -27,14 +27,14 @@ javafx {
 }
 
 shadowJar {
-    archiveBaseName = "puke"
+    archiveBaseName = "bari"
     archiveVersion = "0.9.5"
     archiveClassifier = null
     archiveAppendix = null
 }
 
 application {
-    mainClassName = "puke.Main"
+    mainClassName = "bari.Main"
 }
 
 test {
diff --git a/settings.gradle b/settings.gradle
index 7a7724b8ae..1865c4ec4a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-rootProject.name = "puke"
+rootProject.name = "bari"
diff --git a/src/main/java/puke/Puke.java b/src/main/java/bari/Bari.java
similarity index 82%
rename from src/main/java/puke/Puke.java
rename to src/main/java/bari/Bari.java
index b863e28673..18d4a84f29 100644
--- a/src/main/java/puke/Puke.java
+++ b/src/main/java/bari/Bari.java
@@ -1,9 +1,9 @@
-package puke;
+package bari;
 
-import puke.command.Command;
-import puke.command.ResponseStrings;
-import puke.storage.Storage;
-import puke.task.TaskList;
+import bari.command.Command;
+import bari.command.ResponseStrings;
+import bari.storage.Storage;
+import bari.task.TaskList;
 import java.io.FileNotFoundException;
 
 import javafx.application.Application;
@@ -13,7 +13,7 @@
  * The main logical class, responsible for initialisation of data structures
  * and passing arguments to them for processing.
  */
-public class Puke extends Application {
+public class Bari extends Application {
     private TaskList tasks;
     private Storage storage;
 
@@ -27,7 +27,7 @@ String getResponse(String cmd) {
         }
     }
 
-    Puke() {
+    Bari() {
         try {
             storage = new Storage("tasks.txt");
             tasks = new TaskList(storage.read());
diff --git a/src/main/java/puke/DialogBox.java b/src/main/java/bari/DialogBox.java
similarity index 95%
rename from src/main/java/puke/DialogBox.java
rename to src/main/java/bari/DialogBox.java
index 39fa360a81..12e24fbe2c 100644
--- a/src/main/java/puke/DialogBox.java
+++ b/src/main/java/bari/DialogBox.java
@@ -1,4 +1,4 @@
-package puke;
+package bari;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -53,7 +53,7 @@ static DialogBox getUserDialog(String text, Image img) {
         return new DialogBox(text, img);
     }
 
-    static DialogBox getDukeDialog(String text, Image img) {
+    static DialogBox getBariDialog(String text, Image img) {
         var db = new DialogBox(text, img);
         db.flip();
         return db;
diff --git a/src/main/java/puke/Launcher.java b/src/main/java/bari/Launcher.java
similarity index 94%
rename from src/main/java/puke/Launcher.java
rename to src/main/java/bari/Launcher.java
index b2bcc145c1..725f5c7ddc 100644
--- a/src/main/java/puke/Launcher.java
+++ b/src/main/java/bari/Launcher.java
@@ -1,4 +1,4 @@
-package puke;
+package bari;
 
 import javafx.application.Application;
 
diff --git a/src/main/java/puke/Main.java b/src/main/java/bari/Main.java
similarity index 78%
rename from src/main/java/puke/Main.java
rename to src/main/java/bari/Main.java
index 91daa119b6..960929ca6f 100644
--- a/src/main/java/puke/Main.java
+++ b/src/main/java/bari/Main.java
@@ -1,4 +1,4 @@
-package puke;
+package bari;
 
 import java.io.IOException;
 import javafx.application.Application;
@@ -8,10 +8,10 @@
 import javafx.stage.Stage;
 
 /**
- * A GUI for Duke using FXML.
+ * A GUI for Bari using FXML.
  */
 public class Main extends Application {
-    private Puke puke = new Puke();
+    private Bari bari = new Bari();
 
     @Override
     public void start(Stage stage) {
@@ -20,8 +20,8 @@ public void start(Stage stage) {
             AnchorPane ap = fxmlLoader.load();
             Scene scene = new Scene(ap);
             stage.setScene(scene);
-            stage.setTitle("Puke");
-            fxmlLoader.<MainWindow>getController().setPuke(puke);
+            stage.setTitle("Bari");
+            fxmlLoader.<MainWindow>getController().setBari(bari);
             stage.show();
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/src/main/java/puke/MainWindow.java b/src/main/java/bari/MainWindow.java
similarity index 83%
rename from src/main/java/puke/MainWindow.java
rename to src/main/java/bari/MainWindow.java
index 167834520f..3f2dd2e304 100644
--- a/src/main/java/puke/MainWindow.java
+++ b/src/main/java/bari/MainWindow.java
@@ -1,4 +1,4 @@
-package puke;
+package bari;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -23,32 +23,32 @@ public class MainWindow extends AnchorPane {
     @FXML
     private Button sendButton;
 
-    private Puke puke;
+    private Bari bari;
 
     private Image userImage = new Image(this.getClass().getResourceAsStream("/images/DaUser.png"));
-    private Image pukeImage = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png"));
+    private Image bariImage = new Image(this.getClass().getResourceAsStream("/images/DaDuke.png"));
 
     @FXML
     public void initialize() {
         scrollPane.vvalueProperty().bind(dialogContainer.heightProperty());
     }
 
-    public void setPuke(Puke d) {
-        puke = d;
+    public void setBari(Bari d) {
+        bari = d;
     }
 
     /**
      * Creates two dialog boxes, one echoing user input and the other
-     * containing Puke's reply and then appends them to the dialog container.
+     * containing Bari's reply and then appends them to the dialog container.
      * Clears the user input after processing.
      */
     @FXML
     private void handleUserInput() {
         String input = userInput.getText();
-        String response = puke.getResponse(input);
+        String response = bari.getResponse(input);
         dialogContainer.getChildren().addAll(
                 DialogBox.getUserDialog(input, userImage),
-                DialogBox.getDukeDialog(response, pukeImage)
+                DialogBox.getBariDialog(response, bariImage)
         );
         userInput.clear();
         // This response is only produced by an ExitCommand
diff --git a/src/main/java/puke/command/AddCommand.java b/src/main/java/bari/command/AddCommand.java
similarity index 86%
rename from src/main/java/puke/command/AddCommand.java
rename to src/main/java/bari/command/AddCommand.java
index 0cf2b84e41..45c6f79af0 100644
--- a/src/main/java/puke/command/AddCommand.java
+++ b/src/main/java/bari/command/AddCommand.java
@@ -1,8 +1,8 @@
-package puke.command;
+package bari.command;
 
-import puke.storage.Storage;
-import puke.task.Task;
-import puke.task.TaskList;
+import bari.storage.Storage;
+import bari.task.Task;
+import bari.task.TaskList;
 
 /**
  * Class representing a command to add a new task.
diff --git a/src/main/java/puke/command/Command.java b/src/main/java/bari/command/Command.java
similarity index 92%
rename from src/main/java/puke/command/Command.java
rename to src/main/java/bari/command/Command.java
index 0db8f18179..08b03b7646 100644
--- a/src/main/java/puke/command/Command.java
+++ b/src/main/java/bari/command/Command.java
@@ -1,10 +1,10 @@
-package puke.command;
+package bari.command;
 
-import puke.storage.Storage;
-import puke.task.Deadline;
-import puke.task.Event;
-import puke.task.TaskList;
-import puke.task.Todo;
+import bari.storage.Storage;
+import bari.task.Deadline;
+import bari.task.Event;
+import bari.task.TaskList;
+import bari.task.Todo;
 
 /**
  * Abstract class representing individual commands.
diff --git a/src/main/java/puke/command/DeleteCommand.java b/src/main/java/bari/command/DeleteCommand.java
similarity index 90%
rename from src/main/java/puke/command/DeleteCommand.java
rename to src/main/java/bari/command/DeleteCommand.java
index 1c2f4101f5..be6bcf249d 100644
--- a/src/main/java/puke/command/DeleteCommand.java
+++ b/src/main/java/bari/command/DeleteCommand.java
@@ -1,7 +1,7 @@
-package puke.command;
+package bari.command;
 
-import puke.storage.Storage;
-import puke.task.TaskList;
+import bari.storage.Storage;
+import bari.task.TaskList;
 
 /**
  * Class representing a command to delete an item from the task list.
diff --git a/src/main/java/puke/command/DoneCommand.java b/src/main/java/bari/command/DoneCommand.java
similarity index 90%
rename from src/main/java/puke/command/DoneCommand.java
rename to src/main/java/bari/command/DoneCommand.java
index d45b22fca3..4765915801 100644
--- a/src/main/java/puke/command/DoneCommand.java
+++ b/src/main/java/bari/command/DoneCommand.java
@@ -1,7 +1,7 @@
-package puke.command;
+package bari.command;
 
-import puke.storage.Storage;
-import puke.task.TaskList;
+import bari.storage.Storage;
+import bari.task.TaskList;
 
 /**
  * Class representing a command to mark an item in the task list as done.
diff --git a/src/main/java/puke/command/ExitCommand.java b/src/main/java/bari/command/ExitCommand.java
similarity index 68%
rename from src/main/java/puke/command/ExitCommand.java
rename to src/main/java/bari/command/ExitCommand.java
index 719aae8156..36c1cf8689 100644
--- a/src/main/java/puke/command/ExitCommand.java
+++ b/src/main/java/bari/command/ExitCommand.java
@@ -1,10 +1,10 @@
-package puke.command;
+package bari.command;
 
-import puke.storage.Storage;
-import puke.task.TaskList;
+import bari.storage.Storage;
+import bari.task.TaskList;
 
 /**
- * Class representing a command to exit Duke.
+ * Class representing a command to exit the program.
  */
 public class ExitCommand extends Command {
     /**
diff --git a/src/main/java/puke/command/FindCommand.java b/src/main/java/bari/command/FindCommand.java
similarity index 89%
rename from src/main/java/puke/command/FindCommand.java
rename to src/main/java/bari/command/FindCommand.java
index 79c928929b..5f81c19b52 100644
--- a/src/main/java/puke/command/FindCommand.java
+++ b/src/main/java/bari/command/FindCommand.java
@@ -1,7 +1,7 @@
-package puke.command;
+package bari.command;
 
-import puke.storage.Storage;
-import puke.task.TaskList;
+import bari.storage.Storage;
+import bari.task.TaskList;
 
 /**
  * Class representing a command to find items in the task list matching some keyword,
diff --git a/src/main/java/puke/command/ListCommand.java b/src/main/java/bari/command/ListCommand.java
similarity index 81%
rename from src/main/java/puke/command/ListCommand.java
rename to src/main/java/bari/command/ListCommand.java
index 85475d36ed..1b14d64cac 100644
--- a/src/main/java/puke/command/ListCommand.java
+++ b/src/main/java/bari/command/ListCommand.java
@@ -1,7 +1,7 @@
-package puke.command;
+package bari.command;
 
-import puke.storage.Storage;
-import puke.task.TaskList;
+import bari.storage.Storage;
+import bari.task.TaskList;
 
 /**
  * Class representing a command to list items in a task list.
diff --git a/src/main/java/puke/command/ResponseStrings.java b/src/main/java/bari/command/ResponseStrings.java
similarity index 98%
rename from src/main/java/puke/command/ResponseStrings.java
rename to src/main/java/bari/command/ResponseStrings.java
index 8648c48214..6610ed6198 100644
--- a/src/main/java/puke/command/ResponseStrings.java
+++ b/src/main/java/bari/command/ResponseStrings.java
@@ -1,7 +1,7 @@
-package puke.command;
+package bari.command;
 
-import puke.storage.Storage;
-import puke.task.TaskList;
+import bari.storage.Storage;
+import bari.task.TaskList;
 import java.io.IOException;
 import java.util.ArrayList;
 
diff --git a/src/main/java/puke/command/SortCommand.java b/src/main/java/bari/command/SortCommand.java
similarity index 85%
rename from src/main/java/puke/command/SortCommand.java
rename to src/main/java/bari/command/SortCommand.java
index 8f87e08029..69f66b3d60 100644
--- a/src/main/java/puke/command/SortCommand.java
+++ b/src/main/java/bari/command/SortCommand.java
@@ -1,7 +1,7 @@
-package puke.command;
+package bari.command;
 
-import puke.storage.Storage;
-import puke.task.TaskList;
+import bari.storage.Storage;
+import bari.task.TaskList;
 
 /**
  * Class representing a command to sort the task list in-place.
diff --git a/src/main/java/puke/storage/Storage.java b/src/main/java/bari/storage/Storage.java
similarity index 98%
rename from src/main/java/puke/storage/Storage.java
rename to src/main/java/bari/storage/Storage.java
index 40481da8fb..46fd58cde6 100644
--- a/src/main/java/puke/storage/Storage.java
+++ b/src/main/java/bari/storage/Storage.java
@@ -1,4 +1,4 @@
-package puke.storage;
+package bari.storage;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/puke/task/Deadline.java b/src/main/java/bari/task/Deadline.java
similarity index 99%
rename from src/main/java/puke/task/Deadline.java
rename to src/main/java/bari/task/Deadline.java
index afe4147aaa..b2c1d5f84d 100644
--- a/src/main/java/puke/task/Deadline.java
+++ b/src/main/java/bari/task/Deadline.java
@@ -1,4 +1,4 @@
-package puke.task;
+package bari.task;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/puke/task/Event.java b/src/main/java/bari/task/Event.java
similarity index 99%
rename from src/main/java/puke/task/Event.java
rename to src/main/java/bari/task/Event.java
index 5639a30df8..9ac7ca94d7 100644
--- a/src/main/java/puke/task/Event.java
+++ b/src/main/java/bari/task/Event.java
@@ -1,4 +1,4 @@
-package puke.task;
+package bari.task;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/puke/task/Task.java b/src/main/java/bari/task/Task.java
similarity index 99%
rename from src/main/java/puke/task/Task.java
rename to src/main/java/bari/task/Task.java
index 37e92eb8fc..51a16a3e0a 100644
--- a/src/main/java/puke/task/Task.java
+++ b/src/main/java/bari/task/Task.java
@@ -1,4 +1,4 @@
-package puke.task;
+package bari.task;
 
 /**
  * A generic task, which can be marked as done.
diff --git a/src/main/java/puke/task/TaskList.java b/src/main/java/bari/task/TaskList.java
similarity index 99%
rename from src/main/java/puke/task/TaskList.java
rename to src/main/java/bari/task/TaskList.java
index 50cb224163..b2a420d3fe 100644
--- a/src/main/java/puke/task/TaskList.java
+++ b/src/main/java/bari/task/TaskList.java
@@ -1,4 +1,4 @@
-package puke.task;
+package bari.task;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/puke/task/Todo.java b/src/main/java/bari/task/Todo.java
similarity index 98%
rename from src/main/java/puke/task/Todo.java
rename to src/main/java/bari/task/Todo.java
index 4728a10075..4f0bb3f249 100644
--- a/src/main/java/puke/task/Todo.java
+++ b/src/main/java/bari/task/Todo.java
@@ -1,4 +1,4 @@
-package puke.task;
+package bari.task;
 
 /**
  * Class representing a task to be done, but not at any particular time.
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index cec4d14e87..55694255e5 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -8,7 +8,7 @@
 
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0"
             prefWidth="400.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="puke.MainWindow">
+            fx:controller="bari.MainWindow">
     <TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="324.0"
                AnchorPane.bottomAnchor="1.0"/>
     <Button fx:id="sendButton" layoutX="324.0" layoutY="558.0" mnemonicParsing="false" onAction="#handleUserInput"
diff --git a/src/test/java/puke/PukeTest.java b/src/test/java/bari/BariTest.java
similarity index 89%
rename from src/test/java/puke/PukeTest.java
rename to src/test/java/bari/BariTest.java
index 847fcb4217..9357e13340 100644
--- a/src/test/java/puke/PukeTest.java
+++ b/src/test/java/bari/BariTest.java
@@ -1,17 +1,17 @@
-package puke;
+package bari;
 
-import puke.command.AddCommand;
-import puke.command.Command;
-import puke.command.DeleteCommand;
-import puke.task.Deadline;
-import puke.task.Event;
-import puke.task.TaskList;
-import puke.task.Todo;
+import bari.command.AddCommand;
+import bari.command.Command;
+import bari.command.DeleteCommand;
+import bari.task.Deadline;
+import bari.task.Event;
+import bari.task.TaskList;
+import bari.task.Todo;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-class PukeTest {
+class BariTest {
     @Test
     void testTask() {
         Todo t1 = Todo.parse("dig a trench from the fence to lunchtime");
diff --git a/src/test/java/puke/ResponseStringsStub.java b/src/test/java/bari/ResponseStringsStub.java
similarity index 82%
rename from src/test/java/puke/ResponseStringsStub.java
rename to src/test/java/bari/ResponseStringsStub.java
index f3a5b1b86c..7fc1264cfa 100644
--- a/src/test/java/puke/ResponseStringsStub.java
+++ b/src/test/java/bari/ResponseStringsStub.java
@@ -1,7 +1,7 @@
-package puke;
+package bari;
 
-import puke.command.ResponseStrings;
-import puke.task.TaskList;
+import bari.command.ResponseStrings;
+import bari.task.TaskList;
 
 public class ResponseStringsStub extends ResponseStrings {
     @Override
diff --git a/src/test/java/puke/StorageStub.java b/src/test/java/bari/StorageStub.java
similarity index 86%
rename from src/test/java/puke/StorageStub.java
rename to src/test/java/bari/StorageStub.java
index 25887a8d2e..8a8145f928 100644
--- a/src/test/java/puke/StorageStub.java
+++ b/src/test/java/bari/StorageStub.java
@@ -1,6 +1,6 @@
-package puke;
+package bari;
 
-import puke.storage.Storage;
+import bari.storage.Storage;
 
 import java.util.ArrayList;
 
diff --git a/src/test/java/puke/TaskListStub.java b/src/test/java/bari/TaskListStub.java
similarity index 84%
rename from src/test/java/puke/TaskListStub.java
rename to src/test/java/bari/TaskListStub.java
index 0c07568cfa..a1bffd760f 100644
--- a/src/test/java/puke/TaskListStub.java
+++ b/src/test/java/bari/TaskListStub.java
@@ -1,7 +1,7 @@
-package puke;
+package bari;
 
-import puke.task.Task;
-import puke.task.TaskList;
+import bari.task.Task;
+import bari.task.TaskList;
 
 public class TaskListStub extends TaskList {
     private boolean isEmpty = true;
diff --git a/src/test/java/puke/TaskStub.java b/src/test/java/bari/TaskStub.java
similarity index 88%
rename from src/test/java/puke/TaskStub.java
rename to src/test/java/bari/TaskStub.java
index d8fcecfdd4..a7245ab664 100644
--- a/src/test/java/puke/TaskStub.java
+++ b/src/test/java/bari/TaskStub.java
@@ -1,6 +1,6 @@
-package puke;
+package bari;
 
-import puke.task.Task;
+import bari.task.Task;
 
 class TaskStub extends Task {
     TaskStub() {