diff --git a/README.md b/README.md
index 1fa1288bf..d1b03e367 100644
--- a/README.md
+++ b/README.md
@@ -182,7 +182,7 @@ function MappedTable({ data, propertyNames }) {
 ```
 #### Notes
 
-This component does not work with nested objects and will break if there are nested objects inside any of the properties specified in `propertyNames`.,<!-tags: array,object,functional -->,<!-expertise: 1 -->
+This component does not work with nested objects and will break if there are nested objects inside any of the properties specified in `propertyNames`.,<!-tags: array,object -->,<!-expertise: 1 -->
 
 <details>
 <summary>Examples</summary>
diff --git a/data/snippet_data.json b/data/snippet_data.json
index 3b19501ad..c984e6cdc 100644
--- a/data/snippet_data.json
+++ b/data/snippet_data.json
@@ -11,7 +11,7 @@
     "tags": [
       "string",
       "fragment",
-      "functional"
+      "regexp"
     ],
     "notes": []
   },
@@ -28,7 +28,7 @@
       "visual",
       "children",
       "state",
-      "class"
+      "effect"
     ],
     "notes": []
   },
@@ -44,8 +44,7 @@
     "tags": [
       "visual",
       "children",
-      "state",
-      "class"
+      "state"
     ],
     "notes": []
   },
@@ -59,8 +58,7 @@
     ],
     "expertise": 0,
     "tags": [
-      "array",
-      "functional"
+      "array"
     ],
     "notes": []
   },
@@ -74,8 +72,7 @@
     ],
     "expertise": 0,
     "tags": [
-      "array",
-      "functional"
+      "array"
     ],
     "notes": []
   },
@@ -93,7 +90,7 @@
       "visual",
       "input",
       "state",
-      "class"
+      "effect"
     ],
     "notes": []
   },
@@ -107,8 +104,7 @@
     ],
     "expertise": 0,
     "tags": [
-      "input",
-      "functional"
+      "input"
     ],
     "notes": []
   },
@@ -124,7 +120,7 @@
     "tags": [
       "input",
       "state",
-      "class"
+      "effect"
     ],
     "notes": []
   },
@@ -138,8 +134,7 @@
     ],
     "expertise": 0,
     "tags": [
-      "visual",
-      "functional"
+      "visual"
     ],
     "notes": []
   },
@@ -154,12 +149,11 @@
     "expertise": 1,
     "tags": [
       "array",
-      "object",
-      "functional"
+      "object"
     ],
     "notes": [
       "This component does not work with nested objects and will break if there are nested objects inside any of the properties specified in `propertyNames`.",
-      "<!-tags: array,object,functional -->",
+      "<!-tags: array,object -->",
       "<!-expertise: 1 -->"
     ]
   },
@@ -174,8 +168,7 @@
     "expertise": 0,
     "tags": [
       "input",
-      "state",
-      "class"
+      "state"
     ],
     "notes": []
   },
@@ -189,8 +182,7 @@
     ],
     "expertise": 0,
     "tags": [
-      "input",
-      "functional"
+      "input"
     ],
     "notes": []
   },
@@ -207,8 +199,7 @@
       "visual",
       "children",
       "input",
-      "state",
-      "class"
+      "state"
     ],
     "notes": []
   },
@@ -224,8 +215,8 @@
     "expertise": 1,
     "tags": [
       "visual",
-      "children",
-      "class"
+      "state",
+      "children"
     ],
     "notes": []
   },
@@ -239,8 +230,7 @@
     ],
     "expertise": 0,
     "tags": [
-      "input",
-      "functional"
+      "input"
     ],
     "notes": []
   },
@@ -255,8 +245,7 @@
     "expertise": 1,
     "tags": [
       "visual",
-      "state",
-      "class"
+      "state"
     ],
     "notes": []
   },
@@ -271,8 +260,7 @@
     "expertise": 0,
     "tags": [
       "visual",
-      "state",
-      "class"
+      "state"
     ],
     "notes": []
   },
@@ -289,8 +277,7 @@
     "tags": [
       "visual",
       "state",
-      "children",
-      "class"
+      "children"
     ],
     "notes": []
   },
@@ -307,9 +294,8 @@
     "tags": [
       "object",
       "visual",
-      "children",
       "state",
-      "class"
+      "recursion"
     ],
     "notes": []
   }
diff --git a/snippets/AutoLink.md b/snippets/AutoLink.md
index 275cfe352..acfc046f2 100644
--- a/snippets/AutoLink.md
+++ b/snippets/AutoLink.md
@@ -33,6 +33,6 @@ ReactDOM.render(
 );
 ```
 
-<!-- tags: string,fragment,functional -->
+<!-- tags: string,fragment,regexp -->
 
 <!-- expertise: 2 -->
diff --git a/snippets/Carousel.md b/snippets/Carousel.md
index cb25268e3..ccf51ded0 100644
--- a/snippets/Carousel.md
+++ b/snippets/Carousel.md
@@ -61,7 +61,7 @@ ReactDOM.render(
 );
  ```
 
-<!-- tags: visual,children,state,class -->
+<!-- tags: visual,children,state,effect -->
 
 <!-- expertise: 2 -->
  
diff --git a/snippets/Collapse.md b/snippets/Collapse.md
index 04dd27182..a1f664798 100644
--- a/snippets/Collapse.md
+++ b/snippets/Collapse.md
@@ -55,6 +55,6 @@ ReactDOM.render(
 );
 ```
 
-<!-- tags: visual,children,state,class -->
+<!-- tags: visual,children,state -->
 
 <!-- expertise: 2 -->
diff --git a/snippets/DataList.md b/snippets/DataList.md
index 99ee8980b..17cb6ccd3 100644
--- a/snippets/DataList.md
+++ b/snippets/DataList.md
@@ -21,6 +21,6 @@ ReactDOM.render(<DataList data={names}/>, document.getElementById('root'));
 ReactDOM.render(<DataList data={names} isOrdered/>, document.getElementById('root'));
 ```
 
-<!-- tags: array,functional -->
+<!-- tags: array -->
 
 <!-- expertise: 0 -->
diff --git a/snippets/DataTable.md b/snippets/DataTable.md
index 93dfce73e..53324bba3 100644
--- a/snippets/DataTable.md
+++ b/snippets/DataTable.md
@@ -36,6 +36,6 @@ ReactDOM.render(
 );
 ```
 
-<!-- tags: array,functional -->
+<!-- tags: array -->
 
 <!-- expertise: 0 -->
diff --git a/snippets/FileDrop.md b/snippets/FileDrop.md
index 7fefbb103..6f6a0daf9 100644
--- a/snippets/FileDrop.md
+++ b/snippets/FileDrop.md
@@ -101,6 +101,6 @@ function FileDrop(props) {
 ReactDOM.render(<FileDrop handleDrop={console.log}/>, document.getElementById('root'));
 ```
 
-<!-- tags: visual,input,state,class -->
+<!-- tags: visual,input,state,effect -->
 
 <!-- expertise: 2 -->
diff --git a/snippets/Input.md b/snippets/Input.md
index d7734e36a..3278850eb 100644
--- a/snippets/Input.md
+++ b/snippets/Input.md
@@ -26,6 +26,6 @@ ReactDOM.render(
 );
 ```
 
-<!-- tags: input,functional -->
+<!-- tags: input -->
 
 <!-- expertise: 0 -->
diff --git a/snippets/LimitedTextarea.md b/snippets/LimitedTextarea.md
index 937746e81..e4be1428e 100644
--- a/snippets/LimitedTextarea.md
+++ b/snippets/LimitedTextarea.md
@@ -41,7 +41,7 @@ ReactDOM.render(
   document.getElementById('root')
 );
 ```
-<!-- tags: input,state,class -->
+<!-- tags: input,state,effect -->
 
 <!-- expertise: 0 -->
 
diff --git a/snippets/Mailto.md b/snippets/Mailto.md
index df3412efc..5b9b78fe3 100644
--- a/snippets/Mailto.md
+++ b/snippets/Mailto.md
@@ -24,6 +24,6 @@ ReactDOM.render(
 );
 ```
 
-<!-- tags: visual,functional -->
+<!-- tags: visual -->
 
 <!-- expertise: 0 -->
diff --git a/snippets/MappedTable.md b/snippets/MappedTable.md
index aada05e50..c97ec1b56 100644
--- a/snippets/MappedTable.md
+++ b/snippets/MappedTable.md
@@ -46,6 +46,6 @@ ReactDOM.render(
 #### Notes:
 * This component does not work with nested objects and will break if there are nested objects inside any of the properties specified in `propertyNames`.
 
-<!-- tags: array,object,functional -->
+<!-- tags: array,object -->
 
 <!-- expertise: 1 -->
diff --git a/snippets/PasswordRevealer.md b/snippets/PasswordRevealer.md
index 7e27c3e09..b00b0da53 100644
--- a/snippets/PasswordRevealer.md
+++ b/snippets/PasswordRevealer.md
@@ -26,7 +26,7 @@ function PasswordRevealer({ value }) {
 ReactDOM.render(<PasswordRevealer />, document.getElementById('root'));
 ```
 
-<!--tags: input,state,class -->
+<!--tags: input,state -->
 
 <!--expertise: 0 -->
 
diff --git a/snippets/Select.md b/snippets/Select.md
index db4562517..114928c3c 100644
--- a/snippets/Select.md
+++ b/snippets/Select.md
@@ -33,6 +33,6 @@ ReactDOM.render(
 );
 ```
 
-<!-- tags: input,functional -->
+<!-- tags: input -->
 
 <!-- expertise: 0 -->
diff --git a/snippets/StarRating.md b/snippets/StarRating.md
index 60fe1309b..d1be76cad 100644
--- a/snippets/StarRating.md
+++ b/snippets/StarRating.md
@@ -53,6 +53,6 @@ ReactDOM.render(<StarRating/>, document.getElementById('root'));
 ReactDOM.render(<StarRating rating={2} />, document.getElementById('root'));
 ```
 
-<!-- tags: visual,children,input,state,class -->
+<!-- tags: visual,children,input,state -->
 
 <!-- expertise: 2 -->
diff --git a/snippets/Tabs.md b/snippets/Tabs.md
index e1847e625..d5d0268ae 100644
--- a/snippets/Tabs.md
+++ b/snippets/Tabs.md
@@ -77,6 +77,6 @@ ReactDOM.render(
 
 ```
 
-<!-- tags: visual,children,class -->
+<!-- tags: visual,state,children -->
 
 <!-- expertise: 1 -->
diff --git a/snippets/TextArea.md b/snippets/TextArea.md
index e67fac536..ac65e5943 100644
--- a/snippets/TextArea.md
+++ b/snippets/TextArea.md
@@ -27,6 +27,6 @@ ReactDOM.render(
 );
 ```
 
-<!-- tags: input,functional -->
+<!-- tags: input -->
 
 <!-- expertise: 0 -->
diff --git a/snippets/Ticker.md b/snippets/Ticker.md
index 06373cd78..3a6be6902 100644
--- a/snippets/Ticker.md
+++ b/snippets/Ticker.md
@@ -40,6 +40,6 @@ function Ticker(props) {
 ReactDOM.render(<Ticker times={5} interval={1000} />, document.getElementById('root'));
 ```
 
-<!-- tags: visual,state,class -->
+<!-- tags: visual,state -->
 
 <!-- expertise: 1 -->
\ No newline at end of file
diff --git a/snippets/Toggle.md b/snippets/Toggle.md
index fc28ef00d..589958903 100644
--- a/snippets/Toggle.md
+++ b/snippets/Toggle.md
@@ -33,6 +33,6 @@ function Toggle(props) {
 ReactDOM.render(<Toggle />, document.getElementById('root'));
 ```
 
-<!-- tags: visual,state,class  -->
+<!-- tags: visual,state  -->
 
 <!-- expertise: 0 -->
diff --git a/snippets/Tooltip.md b/snippets/Tooltip.md
index cf9e8285d..39a2448c0 100644
--- a/snippets/Tooltip.md
+++ b/snippets/Tooltip.md
@@ -55,6 +55,6 @@ function Tooltip({ children, text, ...rest }) {
  );
 ```
  
-<!-- tags: visual,state,children,class -->
+<!-- tags: visual,state,children -->
 
 <!-- expertise: 1 -->
diff --git a/snippets/TreeView.md b/snippets/TreeView.md
index 0a48dd5e2..6e8b7b8aa 100644
--- a/snippets/TreeView.md
+++ b/snippets/TreeView.md
@@ -123,6 +123,6 @@ let data = {
 ReactDOM.render(<TreeView data={data} name='data'/>, document.getElementById("root"));
 ```
 
-<!-- tags: object,visual,children,state,class -->
+<!-- tags: object,visual,state,recursion -->
 
 <!-- expertise: 2 -->