diff --git a/docs/UserGuide.adoc b/docs/UserGuide.adoc
index a58886fe817d..270d79d62b24 100644
--- a/docs/UserGuide.adoc
+++ b/docs/UserGuide.adoc
@@ -203,14 +203,6 @@ Example:
 * `filter /region north /type HDB /status spoiled`
 * `filter /year 1987-2018 /status in-use`
 
-=== Updating equipment details: `update-e`
-Update details of a equipment.
-Format: `update equipment [equipment id] /[fieldname to be updated] [value to be updated to]`
-
-Example:
-
-* `Update equipment 68912 /status spoiled`
-
 === Autocomplete: kbd:[tab]
 If you have forgotten how to type a command, do not worry!  By typing in the first letter of the command in the command and pressing the kbd:[tab] key, it will display the full format of the command.
 
diff --git a/src/main/java/seedu/address/logic/commands/AddCommand.java b/src/main/java/seedu/address/logic/commands/AddCommand.java
index be4ca3539f0d..b69246022758 100644
--- a/src/main/java/seedu/address/logic/commands/AddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/AddCommand.java
@@ -15,7 +15,7 @@ public class AddCommand extends Command {
 
     public static final String COMMAND_WORD = "add-e";
 
-    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an equipment to the address book. "
+    public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an equipment to the Equipment Manager. "
             + "Parameters: "
             + CliSyntax.PREFIX_NAME + "NAME "
             + CliSyntax.PREFIX_PHONE + "PHONE "
diff --git a/src/main/java/seedu/address/logic/commands/ClearCommand.java b/src/main/java/seedu/address/logic/commands/ClearCommand.java
index 0dbd692cf33f..da135b9f7f82 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 = "Address book has been cleared!";
+    public static final String MESSAGE_SUCCESS = "Equipment Manager has been cleared!";
 
 
     @Override
diff --git a/src/main/java/seedu/address/logic/commands/DeleteCommand.java b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
index b9900f3f9cf8..3db05df96435 100644
--- a/src/main/java/seedu/address/logic/commands/DeleteCommand.java
+++ b/src/main/java/seedu/address/logic/commands/DeleteCommand.java
@@ -12,11 +12,11 @@
 import seedu.address.model.equipment.Equipment;
 
 /**
- * Deletes a equipment identified using it's displayed index from the address book.
+ * Deletes an equipment identified using it's displayed index from the Equipment Manager.
  */
 public class DeleteCommand extends Command {
 
-    public static final String COMMAND_WORD = "delete";
+    public static final String COMMAND_WORD = "delete-e";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD
             + ": Deletes the equipment identified by the index number used in the displayed equipment list.\n"
diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java
index 8d6ff6a43b9a..c36e9cf8b310 100644
--- a/src/main/java/seedu/address/logic/commands/EditCommand.java
+++ b/src/main/java/seedu/address/logic/commands/EditCommand.java
@@ -25,11 +25,11 @@
 import seedu.address.model.tag.Tag;
 
 /**
- * Edits the details of an existing equipment in the address book.
+ * Edits the details of an existing equipment in the equipment manager.
  */
 public class EditCommand extends Command {
 
-    public static final String COMMAND_WORD = "edit";
+    public static final String COMMAND_WORD = "edit-e";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the equipment identified "
             + "by the index number used in the displayed equipment list. "
@@ -47,7 +47,7 @@ public class EditCommand extends Command {
 
     public static final String MESSAGE_EDIT_PERSON_SUCCESS = "Edited Equipment: %1$s";
     public static final String MESSAGE_NOT_EDITED = "At least one field to edit must be provided.";
-    public static final String MESSAGE_DUPLICATE_PERSON = "This equipment already exists in the address book.";
+    public static final String MESSAGE_DUPLICATE_PERSON = "This equipment already exists in the Equipment Manager.";
 
     private final Index index;
     private final EditPersonDescriptor editPersonDescriptor;
diff --git a/src/main/java/seedu/address/logic/commands/ExitCommand.java b/src/main/java/seedu/address/logic/commands/ExitCommand.java
index 2240a3e4be1f..35ff4a7c9bd6 100644
--- a/src/main/java/seedu/address/logic/commands/ExitCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ExitCommand.java
@@ -10,7 +10,7 @@ public class ExitCommand extends Command {
 
     public static final String COMMAND_WORD = "exit";
 
-    public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Address Book as requested ...";
+    public static final String MESSAGE_EXIT_ACKNOWLEDGEMENT = "Exiting Equipment Manager as requested ...";
 
     @Override
     public CommandResult execute(Model model, CommandHistory history) {
diff --git a/src/main/java/seedu/address/logic/commands/ListCommand.java b/src/main/java/seedu/address/logic/commands/ListCommand.java
index 6d44824c7d1b..38b1cf9c2976 100644
--- a/src/main/java/seedu/address/logic/commands/ListCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ListCommand.java
@@ -7,13 +7,13 @@
 import seedu.address.model.Model;
 
 /**
- * Lists all persons in the address book to the user.
+ * Lists all equipments in the equipment manager to the user.
  */
 public class ListCommand extends Command {
 
-    public static final String COMMAND_WORD = "list";
+    public static final String COMMAND_WORD = "list-e";
 
-    public static final String MESSAGE_SUCCESS = "Listed all persons";
+    public static final String MESSAGE_SUCCESS = "Listed all equipment";
 
 
     @Override
diff --git a/src/main/java/seedu/address/logic/commands/RedoCommand.java b/src/main/java/seedu/address/logic/commands/RedoCommand.java
index 227771a4eef6..7b0946456bcb 100644
--- a/src/main/java/seedu/address/logic/commands/RedoCommand.java
+++ b/src/main/java/seedu/address/logic/commands/RedoCommand.java
@@ -8,7 +8,7 @@
 import seedu.address.model.Model;
 
 /**
- * Reverts the {@code model}'s address book to its previously undone state.
+ * Reverts the {@code model}'s equipment manager to its previously undone state.
  */
 public class RedoCommand extends Command {
 
diff --git a/src/main/java/seedu/address/logic/commands/SortCommand.java b/src/main/java/seedu/address/logic/commands/SortCommand.java
index 5078cb0cfcb0..e5289bd91098 100644
--- a/src/main/java/seedu/address/logic/commands/SortCommand.java
+++ b/src/main/java/seedu/address/logic/commands/SortCommand.java
@@ -7,7 +7,7 @@
 import seedu.address.model.Model;
 
 /**
- * Lists all persons in the address book to the user.
+ * Lists all equipment in the equipment manager to the user.
  */
 public class SortCommand extends Command {
 
diff --git a/src/main/java/seedu/address/logic/commands/UndoCommand.java b/src/main/java/seedu/address/logic/commands/UndoCommand.java
index a54efbcba7c1..f1e49b0e71c4 100644
--- a/src/main/java/seedu/address/logic/commands/UndoCommand.java
+++ b/src/main/java/seedu/address/logic/commands/UndoCommand.java
@@ -7,7 +7,7 @@
 import seedu.address.model.Model;
 
 /**
- * Reverts the {@code model}'s address book to its previous state.
+ * Reverts the {@code model}'s equipment manager to its previous state.
  */
 public class UndoCommand extends Command {
 
diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/seedu/address/logic/LogicManagerTest.java
index 2ee304d17407..2ec9d0bc26fb 100644
--- a/src/test/java/seedu/address/logic/LogicManagerTest.java
+++ b/src/test/java/seedu/address/logic/LogicManagerTest.java
@@ -66,7 +66,7 @@ public void execute_invalidCommandFormat_throwsParseException() {
 
     @Test
     public void execute_commandExecutionError_throwsCommandException() {
-        String deleteCommand = "delete 9";
+        String deleteCommand = "delete-e 9";
         assertCommandException(deleteCommand, MESSAGE_INVALID_EQUIPMENT_DISPLAYED_INDEX);
         assertHistoryCorrect(deleteCommand);
     }
diff --git a/src/test/java/seedu/address/ui/CommandBoxTest.java b/src/test/java/seedu/address/ui/CommandBoxTest.java
index b58d1d7eba2f..6417b9fffa6d 100644
--- a/src/test/java/seedu/address/ui/CommandBoxTest.java
+++ b/src/test/java/seedu/address/ui/CommandBoxTest.java
@@ -93,7 +93,7 @@ public void handleKeyPress_startingWithUp() {
 
         // insert command in the middle of retrieving previous commands
         guiRobot.push(KeyCode.UP);
-        String thirdCommand = "list";
+        String thirdCommand = "list-e";
         commandBoxHandle.run(thirdCommand);
         assertInputHistory(KeyCode.UP, thirdCommand);
         assertInputHistory(KeyCode.UP, COMMAND_THAT_FAILS);