app/src/main/java/godau/fynn/dsbdirect/table/Shortcode.java

@@ -61,7 +61,7 @@ public class Shortcode {
      * @return The String where shortcode is replaced with teacher name
      */
     public String replace(String s) {
-        return s.replaceAll(shortcode, teacherName);
+        return s.replaceAll("\\b" + shortcode + "\\b", teacherName);
     }
 
     /**