diff --git a/incubator/ai-english-tutor/index.html b/incubator/iamteacher/index.html
similarity index 92%
rename from incubator/ai-english-tutor/index.html
rename to incubator/iamteacher/index.html
index 5b9355b..3b86b54 100644
--- a/incubator/ai-english-tutor/index.html
+++ b/incubator/iamteacher/index.html
@@ -6,7 +6,7 @@
     <meta http-equiv="content-Type" content="text/html; charset=UTF-8">
     <meta name="description" content="สร้างความตระหนักรู้เกี่ยวกับการบูลลี่ในสังคมไทย">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>AI English Tutor - TechTransThai</title>
+    <title>iAmTeacher - TechTransThai</title>
     <link rel="icon" type="image/webp" href="https://dl.techtransthai.org/resources/icons/ai-english-tutor.webp">
   </head>
   
@@ -35,7 +35,7 @@
       
       <div style="display: flex; justify-content: center; margin: 3vh;">
         <img src="https://dl.techtransthai.org/resources/icons/ai-english-tutor.webp" alt="eng-tutor" width="80" height="80" style="margin-right: 0.1cm;"> 
-        <div style="font-weight: bold; font-size: 24pt; display: flex; align-items: center;">AI English Tutor</div>
+        <div style="font-weight: bold; font-size: 24pt; display: flex; align-items: center;">iAmTeacher</div>
       </div>
       
       <div style="text-align: center;">
@@ -45,7 +45,7 @@
 
       <div class="quickbuttons" style="margin-top: 5vh; display: flex; justify-content: center;">
         <a class="button pill accent" target="_blank" rel="noopener noreferrer" href="https://ai-tutor-poc.techtransthai.org/">เปิดเว็บแอป Proof-of-Concept</a>
-        <a class="button pill" target="_blank" rel="noopener noreferrer" href="https://forge.techtransthai.org/techtransthai/ai-english-tutor-poc">ดูซอร์สโคด</a>
+        <a class="button pill" target="_blank" rel="noopener noreferrer" href="https://github.com/zymple/iamteacher">ดูซอร์สโคด</a>
       </div>
     
       <div style="margin-top: 5vh; margin-bottom: 1vh; text-align: center;">
diff --git a/index.html b/index.html
index 278b267..52ec34d 100644
--- a/index.html
+++ b/index.html
@@ -142,15 +142,6 @@
 
       <h3 style="margin-top: 5vh;">TechTransThai Incubator</h3>
       <div class="section">
-        <a class="itemcard" href="/incubator/ai-english-tutor/">
-          <div class="listaction">
-            <img src="https://dl.techtransthai.org/resources/icons/ai-english-tutor.webp" alt="ai-eng-tutor" width="80" height="80" style="margin: 0.3cm;"> 
-            <div>
-              <h3>AI English Tutor</h3>
-              <p>Improve your English while still having fun</p>
-            </div>
-          </div>
-        </a>
         <a class="itemcard" href="/incubator/fifty-shades-of-bully/">
           <div class="listaction">
             <img src="https://dl.techtransthai.org/resources/icons/fsob.webp" alt="fsob" width="80" height="80" style="margin: 0.3cm;"> 
@@ -160,6 +151,15 @@
             </div>
           </div>
         </a>
+        <a class="itemcard" href="/incubator/iamteacher/">
+          <div class="listaction">
+            <img src="https://dl.techtransthai.org/resources/icons/iamteacher.webp" alt="iamteacher" width="80" height="80" style="margin: 0.3cm;"> 
+            <div>
+              <h3>iAmTeacher</h3>
+              <p>Improve your English while still having fun</p>
+            </div>
+          </div>
+        </a>
         <a class="itemcard" href="/incubator/little-lines/">
           <div class="listaction">
             <img src="https://dl.techtransthai.org/resources/icons/ll.svg" alt="little-lines" width="80" height="80" style="margin: 0.3cm;">