diff --git a/examples/Components/SynEdit/Completion/Completion.ex-meta b/examples/Components/SynEdit/Completion/Completion.ex-meta
deleted file mode 100644
index 44aa3d52d9..0000000000
--- a/examples/Components/SynEdit/Completion/Completion.ex-meta
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "Completion" : {
-    "Category" : "General",
-    "Keywords" : [
-      "SynEdit",
-      "Auto Completion",
-      "TSynAutoComplete"
-    ],
-    "Description" : "Example for SynEdit's auto-completion features. As used in the Lazarus IDE, provides 2 different auto-completion features."
-  }
-}
diff --git a/examples/Components/SynEdit/Completion/SynEdit - Completion.ex-meta b/examples/Components/SynEdit/Completion/SynEdit - Completion.ex-meta
new file mode 100644
index 0000000000..65307d9d9e
--- /dev/null
+++ b/examples/Components/SynEdit/Completion/SynEdit - Completion.ex-meta	
@@ -0,0 +1,13 @@
+{
+  "SynEdit - Completion" : {
+    "Category" : "General",
+    "Keywords" : [
+      "TSynEdit",
+	  "TSynCompletion",
+	  "TSynAutoComplete",
+      "Text Completion",
+      "Word List"
+    ],
+    "Description" : "SynEdit has 2 \"auto-completion\" features.\r\n\r\n1) TSynCompletion (The word completion feature used by the IDE)\r\nDisplays a drop-down providing a list of completions (or replacements) for the current word. The completions, must be provided, and updated by the application.\r\nIf the user typed \"Sel\", then a list of words beginning with \"Sel\" may be displayed.\r\n\r\n2) TSynAutoComplete\r\nReplaces the current word/token, with a fixed pre-defined substitution.\r\nIf the user typed \"IB\", the replacement may be \"if foo then begin\"\r\n\r\n\r\n"
+  }
+}
diff --git a/examples/Components/SynEdit/NewHighlighterTutorial/NewHighlighterTutorial.ex-meta b/examples/Components/SynEdit/NewHighlighterTutorial/SynEdit - New Highlighter Tutorial.ex-meta
similarity index 87%
rename from examples/Components/SynEdit/NewHighlighterTutorial/NewHighlighterTutorial.ex-meta
rename to examples/Components/SynEdit/NewHighlighterTutorial/SynEdit - New Highlighter Tutorial.ex-meta
index 8a4644123d..cfb5a92bc3 100644
--- a/examples/Components/SynEdit/NewHighlighterTutorial/NewHighlighterTutorial.ex-meta
+++ b/examples/Components/SynEdit/NewHighlighterTutorial/SynEdit - New Highlighter Tutorial.ex-meta	
@@ -1,5 +1,5 @@
 {
-  "NewHighlighterTutorial" : {
+  "SynEdit - New Highlighter Tutorial" : {
     "Category" : "General",
     "Keywords" : [
       "TSynEdit",
diff --git a/examples/Components/SynEdit/SearchAndReplace/SearchAndReplace.ex-meta b/examples/Components/SynEdit/SearchAndReplace/SearchAndReplace.ex-meta
deleted file mode 100644
index f49a9aaab8..0000000000
--- a/examples/Components/SynEdit/SearchAndReplace/SearchAndReplace.ex-meta
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "SearchAndReplace" : {
-    "Category" : "General",
-    "Keywords" : [
-      "TSynEdit",
-      "SearchAndReplace"
-    ],
-    "Description" : "Demonstrates TSynEdit's Searc and Replace capability, and the range of options it can use."
-  }
-}
diff --git a/examples/Components/SynEdit/SearchAndReplace/SynEdit - Search And Replace.ex-meta b/examples/Components/SynEdit/SearchAndReplace/SynEdit - Search And Replace.ex-meta
new file mode 100644
index 0000000000..4b1e2d43e0
--- /dev/null
+++ b/examples/Components/SynEdit/SearchAndReplace/SynEdit - Search And Replace.ex-meta	
@@ -0,0 +1,12 @@
+{
+  "SynEdit - Search And Replace" : {
+    "Category" : "General",
+    "Keywords" : [
+      "TSynEdit",
+      "Search",
+      "Replace",
+      "SearchAndReplace"
+    ],
+    "Description" : "Demonstrates TSynEdit's Search and Replace capability, and the range of options it can use."
+  }
+}
diff --git a/examples/Components/SynEdit/SynAnyHighlighter/SynAnyHighlighter.ex-meta b/examples/Components/SynEdit/SynAnyHighlighter/SynAnyHighlighter.ex-meta
deleted file mode 100644
index 00a2cb6acc..0000000000
--- a/examples/Components/SynEdit/SynAnyHighlighter/SynAnyHighlighter.ex-meta
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "SynAnyHighlighter" : {
-    "Category" : "General",
-    "Keywords" : [
-      "TSynEdit",
-      "runtime"
-    ],
-    "Description" : "This example shows, how the the Keywords, Objects and Constants properties of the class TSynAnySyn can be controlled at runtime.  Text can be highlighted following a number of rules.\n\n"
-  }
-}
diff --git a/examples/Components/SynEdit/SynAnyHighlighter/SynEdit - SynAny Highlighter.ex-meta b/examples/Components/SynEdit/SynAnyHighlighter/SynEdit - SynAny Highlighter.ex-meta
new file mode 100644
index 0000000000..40c59457c8
--- /dev/null
+++ b/examples/Components/SynEdit/SynAnyHighlighter/SynEdit - SynAny Highlighter.ex-meta	
@@ -0,0 +1,10 @@
+{
+  "SynEdit - SynAny Highlighter" : {
+    "Category" : "General",
+    "Keywords" : [
+      "TSynEdit",
+      "runtime"
+    ],
+    "Description" : "TSynAnySyn allows one to highlight specific words in the text.\r\nIt can be used to highlight every occurrence of 'Lazarus' in a specific color.\r\nThis example shows, how the the Keywords, Objects and Constants properties of the class TSynAnySyn can be controlled at runtime.  Text can be highlighted following a number of rules.\r\n\r\n"
+  }
+}
diff --git a/examples/Components/SynEdit/SynGutterMarks/SynGutterMarks.ex-meta b/examples/Components/SynEdit/SynGutterMarks/SynEdit - GutterMarks.ex-meta
similarity index 51%
rename from examples/Components/SynEdit/SynGutterMarks/SynGutterMarks.ex-meta
rename to examples/Components/SynEdit/SynGutterMarks/SynEdit - GutterMarks.ex-meta
index ea3ed97ec0..d7a9c3e1e3 100644
--- a/examples/Components/SynEdit/SynGutterMarks/SynGutterMarks.ex-meta
+++ b/examples/Components/SynEdit/SynGutterMarks/SynEdit - GutterMarks.ex-meta	
@@ -1,11 +1,11 @@
 {
-  "SynGutterMarks" : {
+  "SynEdit - GutterMarks" : {
     "Category" : "General",
     "Keywords" : [
       "TSynEdit",
       "Gutter",
       "Bookmarks"
     ],
-    "Description" : "Example for SynEdit's Bookmarks, SynEdit is the editor used by the Lazarus IDE. This example shows how to display Bookmarks and other marks/icons in the gutter of the editor."
+    "Description" : "Example for SynEdit's Bookmarks, SynEdit is the editor used by the Lazarus IDE.\r\n\r\nThis example shows how to display Bookmarks and other marks/icons in the gutter of the editor."
   }
 }
diff --git a/examples/Components/SynEdit/SynPositionHighlighter/SynEdit - SynPosition Highlighter.ex-meta b/examples/Components/SynEdit/SynPositionHighlighter/SynEdit - SynPosition Highlighter.ex-meta
new file mode 100644
index 0000000000..683e488a9a
--- /dev/null
+++ b/examples/Components/SynEdit/SynPositionHighlighter/SynEdit - SynPosition Highlighter.ex-meta	
@@ -0,0 +1,10 @@
+{
+  "SynEdit - SynPosition Highlighter" : {
+    "Category" : "General",
+    "Keywords" : [
+      "TSynEdit",
+      "TSynPositionHighlighter"
+    ],
+    "Description" : "Example for SynEdit's Highlighter: TSynPositionHighlighter. SynEdit is the editor used by the IDE.\r\n\r\nTSynPositionHighlighter allows one to highlight text at one or more fixed position(s). For example, it can be used to highlight the first 3 letters of the 2nd line of text, in a specific color."
+  }
+}
diff --git a/examples/Components/SynEdit/SynPositionHighlighter/SynPositionHighlighter.ex-meta b/examples/Components/SynEdit/SynPositionHighlighter/SynPositionHighlighter.ex-meta
deleted file mode 100644
index d3cc950bd2..0000000000
--- a/examples/Components/SynEdit/SynPositionHighlighter/SynPositionHighlighter.ex-meta
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "SynPositionHighlighter" : {
-    "Category" : "General",
-    "Keywords" : [
-      "TSynEdit",
-      "TSynPositionHighlighter"
-    ],
-    "Description" : "Example for SynEdit's Highlighter: TSynPositionHighlighter. SynEdit is the editor used by the IDE.\n\nTSynPositionHighlighter allows one to highlight text at one or more fixed position(s). For example, it can be used to highlight the first 3 letters of the 2nd line of text, in a specific color."
-  }
-}