diff --git a/modules/editor/file-templates/templates/org-mode/__ b/modules/editor/file-templates/templates/org-mode/__
index 23d7b522d..08836b2b2 100644
--- a/modules/editor/file-templates/templates/org-mode/__
+++ b/modules/editor/file-templates/templates/org-mode/__
@@ -1,6 +1,20 @@
 # -*- mode: snippet -*-
 # name: Org template
 # --
-#+TITLE: ${1:`(file-name-base buffer-file-name)`}
+#+TITLE: ${1:`
+(string-join
+ (mapcar #'capitalize
+         ;; Replace -,_... with space
+         (split-string
+          (let (case-fold-search)
+            ;; Seperating lower from upper: hello|World
+            (replace-regexp-in-string
+             "\\([[:lower:]]\\)\\([[:upper:]]\\)" "\\1 \\2"
+             ;; Separating upper from (upper and lower): HTTP|Server
+             (replace-regexp-in-string "\\([[:upper:]]\\)\\([[:upper:]][0-9[:lower:]]\\)"
+                                       "\\1 \\2" (file-name-base buffer-file-name))))
+          "[^[:word:]0-9]+"
+          )) " " )
+`}
 
 $0
\ No newline at end of file