diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
index e65597f03c8..a0b33a3ec83 100644
--- a/docs/DeveloperGuide.md
+++ b/docs/DeveloperGuide.md
@@ -532,7 +532,7 @@ The following legend describes the symbols used in this section:
 
 #### Use case 1: Delete a student
 
-[[ main-success-scenario-mss:MSS ]]:
+MSS:
 
 1.  TA requests to list students
 2.  ClassMonitor shows a list of students
@@ -555,7 +555,7 @@ Extensions:
 
 #### Use case 2: Add a student
 
-[[ main-success-scenario-mss:MSS ]]:
+MSS:
 
 1. TA requests to add a student in the list
 2. TA includes the relevant student's info
@@ -572,7 +572,7 @@ Extensions:
 
 #### Use case 3: Add a tag to a student
 
-[[ main-success-scenario-mss:MSS ]]:
+MSS:
 
 1.  TA requests to list students
 2.  ClassMonitor shows a list of students
@@ -595,7 +595,7 @@ Extensions:
 
 #### Use case 4: Find a student by name
 
-[[ main-success-scenario-mss:MSS ]]:
+MSS:
 
 1.  TA requests to list students
 2.  ClassMonitor shows a list of students
@@ -618,7 +618,7 @@ Extensions:
 
 #### Use case 5: Add a star/bolt to a student
 
-[[ main-success-scenario-mss:MSS ]]:
+MSS:
 
 1.  TA requests to list students
 2.  ClassMonitor shows a list of students
@@ -635,7 +635,7 @@ Extensions:
 
 #### Use case 6: Find students by a specific field
 
-[[ main-success-scenario-mss:MSS ]]:
+MSS:
 
 1.  TA requests to list students
 2.  ClassMonitor shows a list of students
@@ -658,7 +658,7 @@ Extensions:
 
 #### Use case 7: Sort list of students by a specific field
 
-[[ main-success-scenario-mss:MSS ]]:
+MSS:
 
 1.  TA requests to list students
 2.  ClassMonitor shows a list of students
diff --git a/docs/diagrams/StarCommentModelClassDiagram.puml b/docs/diagrams/StarCommentModelClassDiagram.puml
index 3444861a61e..89b81604b52 100644
--- a/docs/diagrams/StarCommentModelClassDiagram.puml
+++ b/docs/diagrams/StarCommentModelClassDiagram.puml
@@ -11,7 +11,7 @@ hide empty members
 skinparam ClassAttributeFontColor #FFFFFF
 
 package Model as ModelPackage <<Rectangle>>{
-    Class Person {
+    Class Student {
         name
         phone
         major
@@ -28,14 +28,14 @@ package Model as ModelPackage <<Rectangle>>{
 ' Create an invisible class in the diagram to draw the arrow representing
 ' the external user of the model
 class HiddenOutside #FFFFFF
-HiddenOutside ..> Person
+HiddenOutside ..> Student
 
-Person *-right-> Stars
+Student *-right-> Stars
 Stars *-right> "*" Comment
 
 
-'Person -[hidden]up--> I
-'UniquePersonList -[hidden]right-> I
+'Student -[hidden]up--> I
+'UniqueStudentList -[hidden]right-> I
 
-'ModelManager --> "~* filtered" Person
+'ModelManager --> "~* filtered" Student
 @enduml
diff --git a/docs/images/StarCommentModelClassDiagram.png b/docs/images/StarCommentModelClassDiagram.png
index bd56c7884bc..1742c0f192c 100644
Binary files a/docs/images/StarCommentModelClassDiagram.png and b/docs/images/StarCommentModelClassDiagram.png differ