diff --git a/jc/parsers/proc_cpuinfo.py b/jc/parsers/proc_cpuinfo.py
index 16c93892..5e826e99 100644
--- a/jc/parsers/proc_cpuinfo.py
+++ b/jc/parsers/proc_cpuinfo.py
@@ -42,12 +42,10 @@ option.
         "cache size":                 string,
         "cache_size_num":             integer,
         "cache_size_unit":            string,
-        "flags":                      string,
-        "flag_list": [
+        "flags": [
                                       string
         ],
-        "bugs":                       string,
-        "bug_list": [
+        "bugs": [
                                       string
         ],
         "bogomips":                   float,
@@ -78,8 +76,6 @@ Examples:
         "fpu_exception": true,
         "cpuid level": 22,
         "wp": true,
-        "flags": "fpu vme de pse tsc msr pae mce cx8 apic sep mtrr ...",
-        "bugs": "cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass ...",
         "bogomips": 4800.0,
         "clflush size": 64,
         "cache_alignment": 64,
@@ -89,7 +85,7 @@ Examples:
         "address_size_virtual": 48,
         "cache_size_num": 6144,
         "cache_size_unit": "KB",
-        "flag_list": [
+        "flags": [
           "fpu",
           "vme",
           "de",
@@ -173,7 +169,7 @@ Examples:
           "flush_l1d",
           "arch_capabilities"
         ],
-        "bug_list": [
+        "bugs": [
           "cpu_meltdown",
           "spectre_v1",
           "spectre_v2",
@@ -283,12 +279,10 @@ def _process(proc_data: List[Dict]) -> List[Dict]:
             entry['cache_size_unit'] = unit
 
         if 'flags' in entry:
-            flag_list = entry['flags'].split()
-            entry['flag_list'] = flag_list
+            entry['flags'] = entry['flags'].split()
 
         if 'bugs' in entry:
-            bug_list = entry['bugs'].split()
-            entry['bug_list'] = bug_list
+            entry['bugs'] = entry['bugs'].split()
 
     return proc_data