diff --git a/tests/inheritance/class_inherit.cc b/tests/inheritance/class_inherit.cc
index 82987de9..ce24077a 100644
--- a/tests/inheritance/class_inherit.cc
+++ b/tests/inheritance/class_inherit.cc
@@ -20,8 +20,6 @@ OUTPUT:
       "definition": "1:2:7",
       "parents": [0],
       "uses": ["*1:2:7"]
-    }],
-  "functions": [],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/inheritance/class_inherit_templated_parent.cc b/tests/inheritance/class_inherit_templated_parent.cc
index 027b7dbe..4976c913 100644
--- a/tests/inheritance/class_inherit_templated_parent.cc
+++ b/tests/inheritance/class_inherit_templated_parent.cc
@@ -57,8 +57,6 @@ OUTPUT:
       "definition": "1:13:7",
       "parents": [0, 1, 2, 3],
       "uses": ["*1:13:7", "*1:13:33", "*1:13:65"]
-    }],
-  "functions": [],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/inheritance/class_multiple_inherit.cc b/tests/inheritance/class_multiple_inherit.cc
index b564efbf..64f871eb 100644
--- a/tests/inheritance/class_multiple_inherit.cc
+++ b/tests/inheritance/class_multiple_inherit.cc
@@ -40,8 +40,6 @@ OUTPUT:
       "definition": "1:4:7",
       "parents": [1, 2],
       "uses": ["*1:4:7"]
-    }],
-  "functions": [],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/inheritance/function_override.cc b/tests/inheritance/function_override.cc
index eff050b4..ef4ab98e 100644
--- a/tests/inheritance/function_override.cc
+++ b/tests/inheritance/function_override.cc
@@ -27,7 +27,7 @@ OUTPUT:
       "funcs": [1],
       "uses": ["*1:4:7"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@S@Root@F@foo#",
       "short_name": "foo",
@@ -45,7 +45,6 @@ OUTPUT:
       "declaring_type": 1,
       "base": 0,
       "uses": ["1:5:8"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/inheritance/interface_pure_virtual.cc b/tests/inheritance/interface_pure_virtual.cc
index 29a5ba61..7d5fc58d 100644
--- a/tests/inheritance/interface_pure_virtual.cc
+++ b/tests/inheritance/interface_pure_virtual.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "funcs": [0],
       "uses": ["*1:1:7"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@S@IFoo@F@foo#",
       "short_name": "foo",
@@ -22,7 +22,6 @@ OUTPUT:
       "definition": "1:2:16",
       "declaring_type": 0,
       "uses": ["1:2:16"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/types/anonymous_struct.cc b/tests/types/anonymous_struct.cc
index c1557487..aff49c50 100644
--- a/tests/types/anonymous_struct.cc
+++ b/tests/types/anonymous_struct.cc
@@ -23,8 +23,7 @@ OUTPUT:
       "vars": [0, 1, 2],
       "uses": ["*1:2:3"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@U@vector3@Sa@FI@x",
       "short_name": "x",
@@ -58,4 +57,4 @@ OUTPUT:
       "uses": ["1:3:9"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/unions/union_decl.cc b/tests/unions/union_decl.cc
index 0afc3fa3..5aacf625 100644
--- a/tests/unions/union_decl.cc
+++ b/tests/unions/union_decl.cc
@@ -15,8 +15,7 @@ OUTPUT:
       "vars": [0, 1],
       "uses": ["*1:1:7"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@U@Foo@FI@a",
       "short_name": "a",
@@ -34,4 +33,4 @@ OUTPUT:
       "uses": ["1:3:8"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/unions/union_usage.cc b/tests/unions/union_usage.cc
index 709b53cf..40b15a85 100644
--- a/tests/unions/union_usage.cc
+++ b/tests/unions/union_usage.cc
@@ -21,7 +21,7 @@ OUTPUT:
       "vars": [0, 1],
       "uses": ["*1:1:7", "*1:6:1", "*1:8:10"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@act#*$@U@Foo#",
       "short_name": "act",
@@ -29,7 +29,7 @@ OUTPUT:
       "definition": "1:8:6",
       "uses": ["1:8:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@U@Foo@FI@a",
       "short_name": "a",
@@ -55,4 +55,4 @@ OUTPUT:
       "uses": ["1:6:5", "1:9:3"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/func_usage_addr_func.cc b/tests/usage/func_usage_addr_func.cc
index b14f8031..a4a496e6 100644
--- a/tests/usage/func_usage_addr_func.cc
+++ b/tests/usage/func_usage_addr_func.cc
@@ -10,8 +10,7 @@ void user() {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@consume#*v#",
       "short_name": "consume",
@@ -36,7 +35,7 @@ OUTPUT:
       "callees": ["1@1:6:13", "0@1:7:3", "1@1:7:12"],
       "uses": ["1:5:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:func_usage_addr_func.cc@61@F@user#@x",
       "short_name": "x",
@@ -45,4 +44,4 @@ OUTPUT:
       "uses": ["1:6:8"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/func_usage_addr_method.cc b/tests/usage/func_usage_addr_method.cc
index 8d1c3030..6a52a98f 100644
--- a/tests/usage/func_usage_addr_method.cc
+++ b/tests/usage/func_usage_addr_method.cc
@@ -19,7 +19,7 @@ OUTPUT:
       "funcs": [0],
       "uses": ["*1:1:8", "1:6:13"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@S@Foo@F@Used#",
       "short_name": "Used",
@@ -37,7 +37,7 @@ OUTPUT:
       "callees": ["0@1:6:18"],
       "uses": ["1:5:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:func_usage_addr_method.cc@53@F@user#@x",
       "short_name": "x",
@@ -46,4 +46,4 @@ OUTPUT:
       "uses": ["1:6:8"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/func_usage_call_func.cc b/tests/usage/func_usage_call_func.cc
index 400ea5cb..d50d63cb 100644
--- a/tests/usage/func_usage_call_func.cc
+++ b/tests/usage/func_usage_call_func.cc
@@ -6,8 +6,7 @@ void caller() {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@called#",
       "short_name": "called",
@@ -23,7 +22,6 @@ OUTPUT:
       "definition": "1:2:6",
       "callees": ["0@1:3:3"],
       "uses": ["1:2:6"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/func_usage_call_method.cc b/tests/usage/func_usage_call_method.cc
index 739c9e22..39b62784 100644
--- a/tests/usage/func_usage_call_method.cc
+++ b/tests/usage/func_usage_call_method.cc
@@ -19,7 +19,7 @@ OUTPUT:
       "funcs": [0],
       "uses": ["*1:1:8", "*1:6:3"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@S@Foo@F@Used#",
       "short_name": "Used",
@@ -37,7 +37,7 @@ OUTPUT:
       "callees": ["0@1:7:6"],
       "uses": ["1:5:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:func_usage_call_method.cc@53@F@user#@f",
       "short_name": "f",
@@ -47,4 +47,4 @@ OUTPUT:
       "uses": ["1:6:8", "1:7:3"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/func_usage_class_inline_var_def.cc b/tests/usage/func_usage_class_inline_var_def.cc
index 498900dd..60fdab4e 100644
--- a/tests/usage/func_usage_class_inline_var_def.cc
+++ b/tests/usage/func_usage_class_inline_var_def.cc
@@ -18,7 +18,7 @@ OUTPUT:
       "vars": [0],
       "uses": ["*1:5:7"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:func_usage_class_inline_var_def.cc@F@helper#",
       "short_name": "helper",
@@ -26,7 +26,7 @@ OUTPUT:
       "definition": "1:1:12",
       "uses": ["1:1:12", "1:6:11"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@S@Foo@FI@x",
       "short_name": "x",
@@ -36,4 +36,4 @@ OUTPUT:
       "uses": ["1:6:7"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/func_usage_forward_decl_func.cc b/tests/usage/func_usage_forward_decl_func.cc
index 4bd67d53..d301fe03 100644
--- a/tests/usage/func_usage_forward_decl_func.cc
+++ b/tests/usage/func_usage_forward_decl_func.cc
@@ -7,7 +7,7 @@ void usage() {
 OUTPUT:
 {
   "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#",
       "short_name": "foo",
@@ -23,7 +23,6 @@ OUTPUT:
       "definition": "1:3:6",
       "callees": ["0@1:4:3"],
       "uses": ["1:3:6"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/func_usage_forward_decl_method.cc b/tests/usage/func_usage_forward_decl_method.cc
index bdf6ba3b..0b685be0 100644
--- a/tests/usage/func_usage_forward_decl_method.cc
+++ b/tests/usage/func_usage_forward_decl_method.cc
@@ -18,7 +18,7 @@ OUTPUT:
       "funcs": [0],
       "uses": ["*1:1:8", "*1:6:3"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@S@Foo@F@foo#",
       "short_name": "foo",
@@ -36,7 +36,7 @@ OUTPUT:
       "callees": ["0@1:7:6"],
       "uses": ["1:5:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:func_usage_forward_decl_method.cc@53@F@usage#@f",
       "short_name": "f",
@@ -46,4 +46,4 @@ OUTPUT:
       "uses": ["1:6:8", "1:7:3"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/func_usage_template_func.cc b/tests/usage/func_usage_template_func.cc
index 72a035c9..9ae76944 100644
--- a/tests/usage/func_usage_template_func.cc
+++ b/tests/usage/func_usage_template_func.cc
@@ -9,8 +9,7 @@ void foo() {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@FT@>1#Taccept#t0.0#v#",
       "short_name": "accept",
@@ -26,7 +25,6 @@ OUTPUT:
       "definition": "1:4:6",
       "callees": ["0@1:5:3", "0@1:6:3"],
       "uses": ["1:4:6"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc
index d6815c15..b05277d4 100644
--- a/tests/usage/type_usage_as_template_parameter.cc
+++ b/tests/usage/type_usage_as_template_parameter.cc
@@ -25,7 +25,7 @@ OUTPUT:
       "definition": "1:4:8",
       "uses": ["*1:4:8", "*1:7:19", "*1:9:12", "*1:10:14"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@return_type#",
       "short_name": "return_type",
@@ -33,7 +33,7 @@ OUTPUT:
       "definition": "1:9:16",
       "uses": ["1:9:16"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:type_usage_as_template_parameter.cc@f0",
       "short_name": "f0",
@@ -59,4 +59,4 @@ OUTPUT:
       "uses": ["1:10:18"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc
index f110b9db..2c5e4b1d 100644
--- a/tests/usage/type_usage_as_template_parameter_complex.cc
+++ b/tests/usage/type_usage_as_template_parameter_complex.cc
@@ -102,7 +102,7 @@ OUTPUT:
       "funcs": [3],
       "uses": ["*1:64:7", "1:79:21"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@as_return_type#*$@S@unique_ptr>#$@S@S1#$@S@S2#",
       "short_name": "as_return_type",
@@ -133,7 +133,7 @@ OUTPUT:
       "declaring_type": 3,
       "uses": ["1:65:23", "1:79:26"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@f",
       "short_name": "f",
@@ -151,4 +151,4 @@ OUTPUT:
       "uses": ["1:54:39"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_as_template_parameter_simple.cc b/tests/usage/type_usage_as_template_parameter_simple.cc
index a8ca8a90..9e7239de 100644
--- a/tests/usage/type_usage_as_template_parameter_simple.cc
+++ b/tests/usage/type_usage_as_template_parameter_simple.cc
@@ -20,8 +20,7 @@ OUTPUT:
       "usr": "c:@S@S",
       "uses": ["1:4:8", "*1:6:19"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:type_usage_as_template_parameter_simple.cc@foo",
       "short_name": "foo",
@@ -31,4 +30,4 @@ OUTPUT:
       "uses": ["1:6:22"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_declare_extern.cc b/tests/usage/type_usage_declare_extern.cc
index 6b557429..f708874f 100644
--- a/tests/usage/type_usage_declare_extern.cc
+++ b/tests/usage/type_usage_declare_extern.cc
@@ -12,8 +12,7 @@ OUTPUT:
       "definition": "1:1:8",
       "uses": ["*1:1:8", "*1:3:8"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@t",
       "short_name": "t",
@@ -23,4 +22,4 @@ OUTPUT:
       "uses": ["1:3:10"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_declare_field.cc b/tests/usage/type_usage_declare_field.cc
index a5f3243a..652f0a51 100644
--- a/tests/usage/type_usage_declare_field.cc
+++ b/tests/usage/type_usage_declare_field.cc
@@ -29,8 +29,7 @@ OUTPUT:
       "vars": [0, 1],
       "uses": ["*1:4:8"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@S@Foo@FI@a",
       "short_name": "a",
@@ -50,4 +49,4 @@ OUTPUT:
       "uses": ["1:6:19"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc
index 3245df06..36d6648f 100644
--- a/tests/usage/type_usage_declare_local.cc
+++ b/tests/usage/type_usage_declare_local.cc
@@ -21,7 +21,7 @@ OUTPUT:
       "definition": "1:2:8",
       "uses": ["*1:2:8", "*1:6:3"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@Foo#",
       "short_name": "Foo",
@@ -29,7 +29,7 @@ OUTPUT:
       "definition": "1:4:6",
       "uses": ["1:4:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:type_usage_declare_local.cc@67@F@Foo#@a",
       "short_name": "a",
@@ -47,4 +47,4 @@ OUTPUT:
       "uses": ["1:6:19"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc
index 737b5669..140652ef 100644
--- a/tests/usage/type_usage_declare_param.cc
+++ b/tests/usage/type_usage_declare_param.cc
@@ -18,7 +18,7 @@ OUTPUT:
       "definition": "1:2:8",
       "uses": ["*1:2:8", "*1:4:26"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#*$@S@ForwardType#$@S@ImplementedType#",
       "short_name": "foo",
@@ -26,7 +26,7 @@ OUTPUT:
       "definition": "1:4:6",
       "uses": ["1:4:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:type_usage_declare_param.cc@60@F@foo#*$@S@ForwardType#$@S@ImplementedType#@f",
       "short_name": "f",
@@ -44,4 +44,4 @@ OUTPUT:
       "uses": ["1:4:42"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc
index d6ff63f9..8b90d165 100644
--- a/tests/usage/type_usage_declare_param_prototype.cc
+++ b/tests/usage/type_usage_declare_param_prototype.cc
@@ -16,7 +16,7 @@ OUTPUT:
       "usr": "c:@S@Foo",
       "uses": ["1:1:8", "1:3:10", "1:3:18", "*1:4:10", "*1:4:18"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#*$@S@Foo#S0_#",
       "short_name": "foo",
@@ -25,7 +25,7 @@ OUTPUT:
       "definition": "1:4:6",
       "uses": ["1:3:6", "1:4:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:type_usage_declare_param_prototype.cc@49@F@foo#*$@S@Foo#S0_#@f",
       "short_name": "f",
@@ -35,4 +35,4 @@ OUTPUT:
       "uses": ["1:4:15"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_declare_param_unnamed.cc b/tests/usage/type_usage_declare_param_unnamed.cc
index de0c0c0f..01e84e37 100644
--- a/tests/usage/type_usage_declare_param_unnamed.cc
+++ b/tests/usage/type_usage_declare_param_unnamed.cc
@@ -8,14 +8,13 @@ OUTPUT:
       "usr": "c:@S@ForwardType",
       "uses": ["1:1:8", "*1:2:10"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#*$@S@ForwardType#",
       "short_name": "foo",
       "qualified_name": "foo",
       "definition": "1:2:6",
       "uses": ["1:2:6"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_declare_qualifiers.cc b/tests/usage/type_usage_declare_qualifiers.cc
index 1c208c1a..ada65cf7 100644
--- a/tests/usage/type_usage_declare_qualifiers.cc
+++ b/tests/usage/type_usage_declare_qualifiers.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition": "1:1:8",
       "uses": ["*1:1:8", "*1:3:10", "*1:3:26", "*1:4:3", "*1:5:3", "*1:6:9", "*1:7:9"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#&$@S@Type#&1S1_#",
       "short_name": "foo",
@@ -25,7 +25,7 @@ OUTPUT:
       "definition": "1:3:6",
       "uses": ["1:3:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:type_usage_declare_qualifiers.cc@28@F@foo#&$@S@Type#&1S1_#@a0",
       "short_name": "a0",
@@ -76,4 +76,4 @@ OUTPUT:
     }]
 }
 
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_declare_static.cc b/tests/usage/type_usage_declare_static.cc
index d9e8e4ee..120d7d0e 100644
--- a/tests/usage/type_usage_declare_static.cc
+++ b/tests/usage/type_usage_declare_static.cc
@@ -8,8 +8,7 @@ OUTPUT:
       "usr": "c:@S@Type",
       "uses": ["1:1:8", "*1:2:8"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:type_usage_declare_static.cc@t",
       "short_name": "t",
@@ -19,4 +18,4 @@ OUTPUT:
       "uses": ["1:2:13"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_on_return_type.cc b/tests/usage/type_usage_on_return_type.cc
index c142e428..e69c7bf9 100644
--- a/tests/usage/type_usage_on_return_type.cc
+++ b/tests/usage/type_usage_on_return_type.cc
@@ -33,7 +33,7 @@ OUTPUT:
       "funcs": [1, 2],
       "uses": ["*1:7:7", "1:12:7", "1:13:6"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#",
       "short_name": "foo",
@@ -74,7 +74,6 @@ OUTPUT:
       "declarations": ["1:17:14"],
       "definition": "1:18:14",
       "uses": ["1:17:14", "1:18:14"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_typedef_and_using.cc b/tests/usage/type_usage_typedef_and_using.cc
index 1d5a042c..cb229175 100644
--- a/tests/usage/type_usage_typedef_and_using.cc
+++ b/tests/usage/type_usage_typedef_and_using.cc
@@ -49,7 +49,7 @@ OUTPUT:
       "definition": "1:5:7",
       "uses": ["*1:5:7"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@accept#*$@S@Foo#",
       "short_name": "accept",
@@ -77,7 +77,6 @@ OUTPUT:
       "qualified_name": "accept3",
       "definition": "1:10:6",
       "uses": ["1:10:6"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_typedef_and_using_template.cc b/tests/usage/type_usage_typedef_and_using_template.cc
index f3ad0e19..c347c877 100644
--- a/tests/usage/type_usage_typedef_and_using_template.cc
+++ b/tests/usage/type_usage_typedef_and_using_template.cc
@@ -27,8 +27,6 @@ OUTPUT:
       "definition": "1:5:19",
       "alias_of": 0,
       "uses": ["*1:5:19"]
-    }],
-  "functions": [],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc
index c2e84897..2961f12e 100644
--- a/tests/usage/type_usage_various.cc
+++ b/tests/usage/type_usage_various.cc
@@ -2,7 +2,7 @@ class Foo {
   Foo* make();
 };
 
-Foo* Foo::make() { 
+Foo* Foo::make() {
   Foo f;
   return nullptr;
 }
@@ -21,7 +21,7 @@ OUTPUT:
       "funcs": [0],
       "uses": ["*1:1:7", "*1:2:3", "*1:5:1", "1:5:6", "*1:6:3", "*1:10:8"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@S@Foo@F@make#",
       "short_name": "make",
@@ -31,7 +31,7 @@ OUTPUT:
       "declaring_type": 0,
       "uses": ["1:2:8", "1:5:11"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:type_usage_various.cc@58@S@Foo@F@make#@f",
       "short_name": "f",
@@ -49,4 +49,4 @@ OUTPUT:
       "uses": ["1:10:12"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/usage_inside_of_call.cc b/tests/usage/usage_inside_of_call.cc
index fb0b7799..449672fd 100644
--- a/tests/usage/usage_inside_of_call.cc
+++ b/tests/usage/usage_inside_of_call.cc
@@ -26,7 +26,7 @@ OUTPUT:
       "vars": [1, 0],
       "uses": ["*1:5:8", "1:10:5", "1:14:22", "1:14:40"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@called#I#",
       "short_name": "called",
@@ -51,7 +51,7 @@ OUTPUT:
       "callees": ["0@1:14:3", "1@1:14:14"],
       "uses": ["1:12:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@S@Foo@static_var",
       "short_name": "static_var",
@@ -77,4 +77,4 @@ OUTPUT:
       "uses": ["1:13:7", "1:14:10"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/usage_inside_of_call_simple.cc b/tests/usage/usage_inside_of_call_simple.cc
index a25609ba..34bc1e82 100644
--- a/tests/usage/usage_inside_of_call_simple.cc
+++ b/tests/usage/usage_inside_of_call_simple.cc
@@ -9,8 +9,7 @@ void foo() {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@called#I#",
       "short_name": "called",
@@ -34,7 +33,6 @@ OUTPUT:
       "definition": "1:5:6",
       "callees": ["0@1:6:3", "1@1:6:10", "1@1:6:18"],
       "uses": ["1:5:6"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/var_usage_call_function.cc b/tests/usage/var_usage_call_function.cc
index bb71b07f..cc850e72 100644
--- a/tests/usage/var_usage_call_function.cc
+++ b/tests/usage/var_usage_call_function.cc
@@ -11,7 +11,7 @@ void caller() {
 OUTPUT:
 {
   "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@called#",
       "short_name": "called",
@@ -28,7 +28,7 @@ OUTPUT:
       "callees": ["0@1:4:13", "0@1:7:3"],
       "uses": ["1:3:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:var_usage_call_function.cc@39@F@caller#@x",
       "short_name": "x",
@@ -37,4 +37,4 @@ OUTPUT:
       "uses": ["1:4:8", "1:5:3"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/var_usage_class_member.cc b/tests/usage/var_usage_class_member.cc
index efd37a7c..faa03f0b 100644
--- a/tests/usage/var_usage_class_member.cc
+++ b/tests/usage/var_usage_class_member.cc
@@ -29,7 +29,7 @@ OUTPUT:
       "vars": [0, 1],
       "uses": ["*1:1:7", "*1:11:3"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@accept#I#",
       "short_name": "accept",
@@ -54,7 +54,7 @@ OUTPUT:
       "callees": ["0@1:14:3", "0@1:15:3", "1@1:16:3", "0@1:17:3"],
       "uses": ["1:10:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@S@Foo@FI@x",
       "short_name": "x",
@@ -80,4 +80,4 @@ OUTPUT:
       "uses": ["1:11:7", "1:12:3", "1:13:3", "1:14:10", "1:15:10", "1:16:11", "1:17:10"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/var_usage_class_member_static.cc b/tests/usage/var_usage_class_member_static.cc
index f8f51979..15ee5ee0 100644
--- a/tests/usage/var_usage_class_member_static.cc
+++ b/tests/usage/var_usage_class_member_static.cc
@@ -19,7 +19,7 @@ OUTPUT:
       "definition": "1:1:8",
       "uses": ["*1:1:8", "1:8:10"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@accept#I#",
       "short_name": "accept",
@@ -36,7 +36,7 @@ OUTPUT:
       "callees": ["0@1:8:3"],
       "uses": ["1:7:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@S@Foo@x",
       "short_name": "x",
@@ -45,4 +45,4 @@ OUTPUT:
       "uses": ["1:2:14", "1:8:15"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/var_usage_cstyle_cast.cc b/tests/usage/var_usage_cstyle_cast.cc
index 2e1f6e28..9c45791e 100644
--- a/tests/usage/var_usage_cstyle_cast.cc
+++ b/tests/usage/var_usage_cstyle_cast.cc
@@ -26,8 +26,7 @@ OUTPUT:
       "vars": [0],
       "uses": ["*1:3:8", "1:7:15"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@S@Holder@static_var",
       "short_name": "static_var",
@@ -108,4 +107,4 @@ OUTPUT:
 //#include <string>
 //#include <vector>
 //#include <sstream>
-//#include <algorithm>
\ No newline at end of file
+//#include <algorithm>
diff --git a/tests/usage/var_usage_extern.cc b/tests/usage/var_usage_extern.cc
index 834ac61d..6d5cd17d 100644
--- a/tests/usage/var_usage_extern.cc
+++ b/tests/usage/var_usage_extern.cc
@@ -6,8 +6,7 @@ void foo() {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#",
       "short_name": "foo",
@@ -15,7 +14,7 @@ OUTPUT:
       "definition": "1:3:6",
       "uses": ["1:3:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@a",
       "short_name": "a",
@@ -24,4 +23,4 @@ OUTPUT:
       "uses": ["1:1:12", "1:4:3"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/var_usage_func_parameter.cc b/tests/usage/var_usage_func_parameter.cc
index 178f4b2d..2db5a125 100644
--- a/tests/usage/var_usage_func_parameter.cc
+++ b/tests/usage/var_usage_func_parameter.cc
@@ -4,8 +4,7 @@ void foo(int a) {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#I#",
       "short_name": "foo",
@@ -13,7 +12,7 @@ OUTPUT:
       "definition": "1:1:6",
       "uses": ["1:1:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:var_usage_func_parameter.cc@9@F@foo#I#@a",
       "short_name": "a",
@@ -22,4 +21,4 @@ OUTPUT:
       "uses": ["1:1:14", "1:2:3"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/var_usage_local.cc b/tests/usage/var_usage_local.cc
index 3af6d60c..f647ad59 100644
--- a/tests/usage/var_usage_local.cc
+++ b/tests/usage/var_usage_local.cc
@@ -5,8 +5,7 @@ void foo() {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#",
       "short_name": "foo",
@@ -14,7 +13,7 @@ OUTPUT:
       "definition": "1:1:6",
       "uses": ["1:1:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:var_usage_local.cc@16@F@foo#@x",
       "short_name": "x",
@@ -23,4 +22,4 @@ OUTPUT:
       "uses": ["1:2:7", "1:3:3"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/var_usage_shadowed_local.cc b/tests/usage/var_usage_shadowed_local.cc
index 565e954b..e7f9e515 100644
--- a/tests/usage/var_usage_shadowed_local.cc
+++ b/tests/usage/var_usage_shadowed_local.cc
@@ -10,8 +10,7 @@ void foo() {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#",
       "short_name": "foo",
@@ -19,7 +18,7 @@ OUTPUT:
       "definition": "1:1:6",
       "uses": ["1:1:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:var_usage_shadowed_local.cc@16@F@foo#@a",
       "short_name": "a",
@@ -35,4 +34,4 @@ OUTPUT:
       "uses": ["1:5:9", "1:6:5"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/var_usage_shadowed_parameter.cc b/tests/usage/var_usage_shadowed_parameter.cc
index 4b46355f..2f5e7047 100644
--- a/tests/usage/var_usage_shadowed_parameter.cc
+++ b/tests/usage/var_usage_shadowed_parameter.cc
@@ -10,8 +10,7 @@ void foo(int a) {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#I#",
       "short_name": "foo",
@@ -19,7 +18,7 @@ OUTPUT:
       "definition": "1:1:6",
       "uses": ["1:1:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:var_usage_shadowed_parameter.cc@9@F@foo#I#@a",
       "short_name": "a",
@@ -35,4 +34,4 @@ OUTPUT:
       "uses": ["1:4:9", "1:5:5"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/usage/var_usage_static.cc b/tests/usage/var_usage_static.cc
index 6ac80aa5..17e0be73 100644
--- a/tests/usage/var_usage_static.cc
+++ b/tests/usage/var_usage_static.cc
@@ -7,8 +7,7 @@ void foo() {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#",
       "short_name": "foo",
@@ -16,7 +15,7 @@ OUTPUT:
       "definition": "1:3:6",
       "uses": ["1:3:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:var_usage_static.cc@a",
       "short_name": "a",
@@ -25,4 +24,4 @@ OUTPUT:
       "uses": ["1:1:12", "1:4:3"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/class_member.cc b/tests/vars/class_member.cc
index 786b7698..f474ccfd 100644
--- a/tests/vars/class_member.cc
+++ b/tests/vars/class_member.cc
@@ -13,8 +13,7 @@ OUTPUT:
       "vars": [0],
       "uses": ["*1:1:7", "*1:2:3"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@S@Foo@FI@member",
       "short_name": "member",
@@ -25,4 +24,4 @@ OUTPUT:
       "uses": ["1:2:8"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/class_static_member.cc b/tests/vars/class_static_member.cc
index 1039cb92..9458ef55 100644
--- a/tests/vars/class_static_member.cc
+++ b/tests/vars/class_static_member.cc
@@ -15,8 +15,7 @@ OUTPUT:
       "vars": [0],
       "uses": ["*1:1:7", "*1:2:10", "*1:4:1", "1:4:6"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@S@Foo@member",
       "short_name": "member",
@@ -28,4 +27,4 @@ OUTPUT:
       "uses": ["1:2:15", "1:4:11"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/class_static_member_decl_only.cc b/tests/vars/class_static_member_decl_only.cc
index 59f3ba82..5e3340d0 100644
--- a/tests/vars/class_static_member_decl_only.cc
+++ b/tests/vars/class_static_member_decl_only.cc
@@ -12,8 +12,7 @@ OUTPUT:
       "definition": "1:1:7",
       "uses": ["*1:1:7"]
     }],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@S@Foo@member",
       "short_name": "member",
@@ -22,4 +21,4 @@ OUTPUT:
       "uses": ["1:2:14"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc
index 83f513ec..b55979dc 100644
--- a/tests/vars/function_local.cc
+++ b/tests/vars/function_local.cc
@@ -12,7 +12,7 @@ OUTPUT:
       "usr": "c:@S@Foo",
       "uses": ["1:1:8", "*1:4:3"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#",
       "short_name": "foo",
@@ -20,7 +20,7 @@ OUTPUT:
       "definition": "1:3:6",
       "uses": ["1:3:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:function_local.cc@31@F@foo#@a",
       "short_name": "a",
@@ -30,4 +30,4 @@ OUTPUT:
       "uses": ["1:4:8"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc
index 6e93a379..4090c98b 100644
--- a/tests/vars/function_param.cc
+++ b/tests/vars/function_param.cc
@@ -10,7 +10,7 @@ OUTPUT:
       "usr": "c:@S@Foo",
       "uses": ["1:1:8", "*1:3:10", "*1:3:19"]
     }],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#*$@S@Foo#S0_#",
       "short_name": "foo",
@@ -18,7 +18,7 @@ OUTPUT:
       "definition": "1:3:6",
       "uses": ["1:3:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:function_param.cc@24@F@foo#*$@S@Foo#S0_#@p0",
       "short_name": "p0",
@@ -36,4 +36,4 @@ OUTPUT:
       "uses": ["1:3:24"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/function_param_unnamed.cc b/tests/vars/function_param_unnamed.cc
index ae531eb2..9293f84b 100644
--- a/tests/vars/function_param_unnamed.cc
+++ b/tests/vars/function_param_unnamed.cc
@@ -2,15 +2,13 @@ void foo(int, int) {}
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#I#I#",
       "short_name": "foo",
       "qualified_name": "foo",
       "definition": "1:1:6",
       "uses": ["1:1:6"]
-    }],
-  "variables": []
+    }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/function_shadow_local.cc b/tests/vars/function_shadow_local.cc
index 1ca97ff6..a691c792 100644
--- a/tests/vars/function_shadow_local.cc
+++ b/tests/vars/function_shadow_local.cc
@@ -10,8 +10,7 @@ void foo() {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#",
       "short_name": "foo",
@@ -19,7 +18,7 @@ OUTPUT:
       "definition": "1:1:6",
       "uses": ["1:1:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:function_shadow_local.cc@16@F@foo#@a",
       "short_name": "a",
@@ -35,4 +34,4 @@ OUTPUT:
       "uses": ["1:5:9", "1:6:5"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/function_shadow_param.cc b/tests/vars/function_shadow_param.cc
index eb26ed96..3df97548 100644
--- a/tests/vars/function_shadow_param.cc
+++ b/tests/vars/function_shadow_param.cc
@@ -4,8 +4,7 @@ void foo(int p) {
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [{
+  "funcs": [{
       "id": 0,
       "usr": "c:@F@foo#I#",
       "short_name": "foo",
@@ -13,7 +12,7 @@ OUTPUT:
       "definition": "1:1:6",
       "uses": ["1:1:6"]
     }],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:function_shadow_param.cc@9@F@foo#I#@p",
       "short_name": "p",
@@ -29,4 +28,4 @@ OUTPUT:
       "uses": ["1:2:7"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/global_variable.cc b/tests/vars/global_variable.cc
index 00128c53..68f96a8e 100644
--- a/tests/vars/global_variable.cc
+++ b/tests/vars/global_variable.cc
@@ -2,9 +2,7 @@ static int global = 0;
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:global_variable.cc@global",
       "short_name": "global",
@@ -13,4 +11,4 @@ OUTPUT:
       "uses": ["1:1:12"]
     }]
 }
-*/
\ No newline at end of file
+*/
diff --git a/tests/vars/global_variable_decl_only.cc b/tests/vars/global_variable_decl_only.cc
index 6762769e..26874297 100644
--- a/tests/vars/global_variable_decl_only.cc
+++ b/tests/vars/global_variable_decl_only.cc
@@ -2,9 +2,7 @@ extern int global;
 /*
 OUTPUT:
 {
-  "types": [],
-  "functions": [],
-  "variables": [{
+  "vars": [{
       "id": 0,
       "usr": "c:@global",
       "short_name": "global",
@@ -13,4 +11,4 @@ OUTPUT:
       "uses": ["1:1:12"]
     }]
 }
-*/
\ No newline at end of file
+*/