diff --git a/README.md b/README.md
index 33ed7ebb34c..ef203e70fdc 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,6 @@
 * This is a project done by Software Engineering (SE) students.<br>
 * The project is an adaptation of an ongoing software project for a desktop application (called _AddressBook_) used for managing contact details.
 * This is **written in OOP fashion**.
-* This is named `AgentAssist` (`AA` for short) because this is designed to help Banking Agents manage the contact details of its customers.
+* This is named `AgentAssist` (`AA` for short) because this is designed to help Banking Agents manage the contact details of its clients.
 * For the detailed documentation of this project, see the **[AgentAssist Product Website](https://ay2425s1-cs2103t-t14-4.github.io/tp/)**.
 * This project is based on the AddressBook-Level3 project created by the [SE-EDU initiative](https://se-education.org).
diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/ClearCommand.java
index 483ff2576a4..8376cf4df02 100644
--- a/src/main/java/seedu/address/logic/commands/ClearCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ClearCommand.java
@@ -12,7 +12,7 @@ public class ClearCommand extends Command {
 
     public static final String COMMAND_WORD = "clear";
     public static final String MESSAGE_SUCCESS = "AgentAssist's contacts have been cleared!";
-    public static final String MESSAGE_CLEAR_CONFIRMATION = "This will permanently clear all contacts. "
+    public static final String MESSAGE_CLEAR_CONFIRMATION = "This will permanently clear all clients' contacts. "
             + "Are you sure you want to execute this command? (y/n)";
 
     private static final boolean requiresConfirmation = true;
diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
index 8500e3519a3..cfb2ad15435 100644
--- a/src/main/java/seedu/address/logic/commands/DeleteCommand.java
+++ b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
@@ -24,7 +24,7 @@ public class DeleteCommand extends Command {
             + "Example: '" + COMMAND_WORD + " 1'";
 
     public static final String MESSAGE_DELETE_CLIENT_SUCCESS = "Deleted Client: %1$s";
-    public static final String MESSAGE_DELETE_CONFIRMATION = "This will permanently delete this contact. "
+    public static final String MESSAGE_DELETE_CONFIRMATION = "This will permanently delete this client's contact. "
             + "Are you sure you want to execute this command? (y/n)";
 
     private static final boolean requiresConfirmation = true;
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
index 817bb1f7da4..27d89d68e60 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -55,7 +55,7 @@ public class EditCommand extends Command {
             + PREFIX_PHONE + "91234567 "
             + PREFIX_EMAIL + "johndoe@example.com'";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the person identified "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the client identified "
             + "by the index number used in the displayed client list. "
             + "Existing values will be overwritten by the input values. Any fields unspecified will not be modified.\n"
             + "Required Parameters: INDEX (must be a positive integer)\n"
diff --git a/src/main/java/seedu/address/logic/commands/FilterCommand.java b/src/main/java/seedu/address/logic/commands/FilterCommand.java
index 730613aaea5..3e1d6768435 100644
--- a/src/main/java/seedu/address/logic/commands/FilterCommand.java
+++ b/src/main/java/seedu/address/logic/commands/FilterCommand.java
@@ -17,7 +17,7 @@ public class FilterCommand extends Command {
 
     public static final String COMMAND_WORD = "filter";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Searches for all customers whose specified field "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Searches for all clients whose specified field "
             + "contains the given substring (case-insensitive) and displays the results in a numbered list.\n"
             + "Parameters: <FLAG>/ <SEARCH TERM>\n"
             + "Flags: n/ NAME, p/ PHONE, e/ EMAIL, a/ ADDRESS, j/ JOB, r/ REMARK i/ (=/</>) INCOME s/ STATUS\n"