diff --git a/build.gradle b/build.gradle
index d3713150cb8..28e003da658 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,7 +66,7 @@ dependencies {
 }
 
 shadowJar {
-    archiveFileName = 'addressbook.jar'
+    archiveFileName = 'tuteez.jar'
 }
 
 defaultTasks 'clean', 'test'
diff --git a/src/main/java/tuteez/model/util/SampleDataUtil.java b/src/main/java/tuteez/model/util/SampleDataUtil.java
index 02324aa7e0e..428c02cb400 100644
--- a/src/main/java/tuteez/model/util/SampleDataUtil.java
+++ b/src/main/java/tuteez/model/util/SampleDataUtil.java
@@ -26,19 +26,19 @@ public static Person[] getSamplePersons() {
                 getTagSet("Chemistry"), getLessonSet("monday 0900-1000")),
             new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("berniceyu@example.com"),
                 new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"), TelegramUsername.of("bernice_yu"),
-                getTagSet("Physics", "Sec 4"), getLessonSet("tuesday 1000-1100")),
+                getTagSet("Physics"), getLessonSet("tuesday 1000-1100")),
             new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("charlotte@example.com"),
                 new Address("Blk 11 Ang Mo Kio Street 74, #11-04"), TelegramUsername.of("charlotte_oliveiro"),
-                getTagSet("Primary 6"), getLessonSet("wednesday 1000-1200")),
+                getTagSet("Math"), getLessonSet("wednesday 1000-1200")),
             new Person(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
                 new Address("Blk 436 Serangoon Gardens Street 26, #16-43"), TelegramUsername.of("david_li"),
-                getTagSet("JC math"), getLessonSet("friday 1000-1100")),
+                getTagSet("English"), getLessonSet("friday 1000-1100")),
             new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
                 new Address("Blk 47 Tampines Street 20, #17-35"), TelegramUsername.of("irfan_ibrahim"),
-                getTagSet("Uni math"), getLessonSet("saturday 0900-1100")),
+                getTagSet("Biology"), getLessonSet("saturday 0900-1100")),
             new Person(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("royb@example.com"),
                 new Address("Blk 45 Aljunied Street 85, #11-31"), TelegramUsername.of("roy_balakrishnan"),
-                getTagSet("secondary science"), getLessonSet("sunday 0900-1100"))
+                getTagSet("Science"), getLessonSet("sunday 0900-1100"))
         };
     }