diff --git a/tests/constructors/make_functions.cc b/tests/constructors/make_functions.cc
index 676e3c5d..58e5f274 100644
--- a/tests/constructors/make_functions.cc
+++ b/tests/constructors/make_functions.cc
@@ -91,26 +91,38 @@ OUTPUT: make_functions.cc
   "types": [{
       "id": 0,
       "usr": "c:make_functions.cc@41",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["4:1-4:2"]
     }, {
       "id": 1,
       "usr": "c:make_functions.cc@53",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["4:15-4:19"]
     }, {
       "id": 2,
       "usr": "c:make_functions.cc@139",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["9:1-9:2"]
     }, {
       "id": 3,
       "usr": "c:make_functions.cc@151",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["9:16-9:20"]
     }, {
       "id": 4,
       "usr": "c:@S@Foobar",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["14:14-14:20", "15:14-15:20", "16:14-16:20", "17:15-17:21"]
     }, {
       "id": 5,
       "usr": "c:@S@Bar",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["16:29-16:32", "17:30-17:33"]
     }],
   "funcs": [{
@@ -144,21 +156,29 @@ OUTPUT: make_functions.cc
       "id": 3,
       "is_operator": false,
       "usr": "c:@S@Foobar@F@Foobar#",
+      "short_name": "",
+      "detailed_name": "",
       "callers": ["~-1@14:3-14:13"]
     }, {
       "id": 4,
       "is_operator": false,
       "usr": "c:@S@Foobar@F@Foobar#I#",
+      "short_name": "",
+      "detailed_name": "",
       "callers": ["~-1@15:3-15:13"]
     }, {
       "id": 5,
       "is_operator": false,
       "usr": "c:@S@Foobar@F@Foobar#&&I#*$@S@Bar#*b#",
+      "short_name": "",
+      "detailed_name": "",
       "callers": ["~-1@16:3-16:13"]
     }, {
       "id": 6,
       "is_operator": false,
       "usr": "c:@S@Foobar@F@Foobar#I#*$@S@Bar#*b#",
+      "short_name": "",
+      "detailed_name": "",
       "callers": ["~-1@17:3-17:14"]
     }],
   "vars": [{
diff --git a/tests/inheritance/class_inherit_templated_parent.cc b/tests/inheritance/class_inherit_templated_parent.cc
index 9c6759c1..4569e9dd 100644
--- a/tests/inheritance/class_inherit_templated_parent.cc
+++ b/tests/inheritance/class_inherit_templated_parent.cc
@@ -56,6 +56,8 @@ OUTPUT:
     }, {
       "id": 4,
       "usr": "c:class_inherit_templated_parent.cc@154",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["11:24-11:25"]
     }, {
       "id": 5,
diff --git a/tests/multi_file/funky_enum.cc b/tests/multi_file/funky_enum.cc
index cae0cde0..ab54fee3 100644
--- a/tests/multi_file/funky_enum.cc
+++ b/tests/multi_file/funky_enum.cc
@@ -11,6 +11,8 @@ OUTPUT: funky_enum.h
   "types": [{
       "id": 0,
       "usr": "c:@E@Foo",
+      "short_name": "",
+      "detailed_name": "",
       "vars": [0, 1, 2]
     }],
   "vars": [{
diff --git a/tests/multi_file/impl.cc b/tests/multi_file/impl.cc
index 147ac985..34b23679 100644
--- a/tests/multi_file/impl.cc
+++ b/tests/multi_file/impl.cc
@@ -138,6 +138,8 @@ OUTPUT: impl.cc
       "id": 1,
       "is_operator": false,
       "usr": "c:@FT@>1#TFoo1#v#",
+      "short_name": "",
+      "detailed_name": "",
       "callers": ["0@4:3-4:7"]
     }]
 }
diff --git a/tests/multi_file/simple_impl.cc b/tests/multi_file/simple_impl.cc
index 1814560d..050bb8d0 100644
--- a/tests/multi_file/simple_impl.cc
+++ b/tests/multi_file/simple_impl.cc
@@ -39,6 +39,8 @@ OUTPUT: simple_impl.cc
       "id": 1,
       "is_operator": false,
       "usr": "c:@F@header#",
+      "short_name": "",
+      "detailed_name": "",
       "callers": ["0@4:3-4:9"]
     }]
 }
diff --git a/tests/multi_file/static.cc b/tests/multi_file/static.cc
index 942893d6..3d9d905b 100644
--- a/tests/multi_file/static.cc
+++ b/tests/multi_file/static.cc
@@ -38,6 +38,8 @@ OUTPUT: static.cc
   "types": [{
       "id": 0,
       "usr": "c:@S@Buffer",
+      "short_name": "",
+      "detailed_name": "",
       "funcs": [0],
       "uses": ["3:6-3:12"]
     }],
diff --git a/tests/outline/outline.cc b/tests/outline/outline.cc
index fde2bd58..efc36480 100644
--- a/tests/outline/outline.cc
+++ b/tests/outline/outline.cc
@@ -25,6 +25,8 @@ OUTPUT:
     }, {
       "id": 1,
       "usr": "c:@N@std@ST>2#T#T@vector",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [2],
       "uses": ["6:8-6:14"]
     }],
diff --git a/tests/outline/outline2.cc b/tests/outline/outline2.cc
index 5f9a676c..23c78538 100644
--- a/tests/outline/outline2.cc
+++ b/tests/outline/outline2.cc
@@ -33,11 +33,15 @@ OUTPUT:
     }, {
       "id": 1,
       "usr": "c:@N@std@T@string",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0, 1],
       "uses": ["7:8-7:14", "8:8-8:14", "9:20-9:26"]
     }, {
       "id": 2,
       "usr": "c:@N@std@ST>2#T#T@vector",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [2],
       "uses": ["9:8-9:14", "12:6-12:12"]
     }],
diff --git a/tests/outline/static_function_in_type.cc b/tests/outline/static_function_in_type.cc
index 57e5bedc..5ab03519 100644
--- a/tests/outline/static_function_in_type.cc
+++ b/tests/outline/static_function_in_type.cc
@@ -12,6 +12,8 @@ OUTPUT: static_function_in_type.h
   "types": [{
       "id": 0,
       "usr": "c:@N@ns@S@Manager",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["3:7-3:14", "6:24-6:31"]
     }, {
       "id": 1,
@@ -47,11 +49,15 @@ OUTPUT: static_function_in_type.cc
   "types": [{
       "id": 0,
       "usr": "c:@N@ns@S@Foo",
+      "short_name": "",
+      "detailed_name": "",
       "funcs": [0],
       "uses": ["5:6-5:9"]
     }, {
       "id": 1,
       "usr": "c:@N@ns@S@Manager",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0],
       "uses": ["5:20-5:27"]
     }],
diff --git a/tests/templates/template_var_usage_folded_into_one.cc b/tests/templates/template_var_usage_folded_into_one.cc
index 0dbd8dfc..ddcf80eb 100644
--- a/tests/templates/template_var_usage_folded_into_one.cc
+++ b/tests/templates/template_var_usage_folded_into_one.cc
@@ -50,6 +50,8 @@ OUTPUT:
     }, {
       "id": 2,
       "usr": "c:template_var_usage_folded_into_one.cc@35",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["5:1-5:2"]
     }],
   "vars": [{
diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc
index f1a7dc52..1447467e 100644
--- a/tests/usage/type_usage_as_template_parameter.cc
+++ b/tests/usage/type_usage_as_template_parameter.cc
@@ -16,6 +16,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@ST>1#T@unique_ptr",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0, 1, 2],
       "uses": ["2:7-2:17", "6:8-6:18", "7:8-7:18", "9:1-9:11", "10:3-10:13"]
     }, {
diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc
index efd5ff41..7ae5bc61 100644
--- a/tests/usage/type_usage_as_template_parameter_complex.cc
+++ b/tests/usage/type_usage_as_template_parameter_complex.cc
@@ -85,15 +85,21 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@ST>2#T#T@unique_ptr",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0, 1],
       "uses": ["2:7-2:17", "15:8-15:18", "15:19-15:29", "33:1-33:11", "33:12-33:22", "33:52-33:62", "54:3-54:13", "54:14-54:24", "65:3-65:13", "79:1-79:11"]
     }, {
       "id": 1,
       "usr": "c:@S@S1",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["4:8-4:10", "15:30-15:32", "33:23-33:25", "33:63-33:65", "54:25-54:27", "65:14-65:16", "79:12-79:14"]
     }, {
       "id": 2,
       "usr": "c:@S@S2",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["5:8-5:10", "15:34-15:36", "15:39-15:41", "33:27-33:29", "33:32-33:34", "33:67-33:69", "54:29-54:31", "54:34-54:36", "65:18-65:20", "79:16-79:18"]
     }, {
       "id": 3,
diff --git a/tests/usage/type_usage_as_template_parameter_simple.cc b/tests/usage/type_usage_as_template_parameter_simple.cc
index f3233a8d..c570ff08 100644
--- a/tests/usage/type_usage_as_template_parameter_simple.cc
+++ b/tests/usage/type_usage_as_template_parameter_simple.cc
@@ -20,6 +20,8 @@ OUTPUT:
     }, {
       "id": 1,
       "usr": "c:@S@S",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["4:8-4:9", "6:19-6:20"]
     }],
   "vars": [{
diff --git a/tests/usage/type_usage_declare_field.cc b/tests/usage/type_usage_declare_field.cc
index e5afbf26..fdea9056 100644
--- a/tests/usage/type_usage_declare_field.cc
+++ b/tests/usage/type_usage_declare_field.cc
@@ -12,6 +12,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@ForwardType",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0],
       "uses": ["1:8-1:19", "5:3-5:14"]
     }, {
diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc
index 83dfbf12..37027b3e 100644
--- a/tests/usage/type_usage_declare_local.cc
+++ b/tests/usage/type_usage_declare_local.cc
@@ -12,6 +12,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@ForwardType",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0],
       "uses": ["1:8-1:19", "5:3-5:14"]
     }, {
diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc
index b5a7123d..c6dfb91f 100644
--- a/tests/usage/type_usage_declare_param.cc
+++ b/tests/usage/type_usage_declare_param.cc
@@ -9,6 +9,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@ForwardType",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0],
       "uses": ["1:8-1:19", "4:10-4:21"]
     }, {
diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc
index 9bc15ba8..03215ee7 100644
--- a/tests/usage/type_usage_declare_param_prototype.cc
+++ b/tests/usage/type_usage_declare_param_prototype.cc
@@ -14,6 +14,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@Foo",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0],
       "uses": ["1:8-1:11", "3:10-3:13", "3:18-3:21", "4:10-4:13", "4:18-4:21"]
     }],
diff --git a/tests/usage/type_usage_declare_param_unnamed.cc b/tests/usage/type_usage_declare_param_unnamed.cc
index c99d0004..55ba2041 100644
--- a/tests/usage/type_usage_declare_param_unnamed.cc
+++ b/tests/usage/type_usage_declare_param_unnamed.cc
@@ -6,6 +6,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@ForwardType",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["1:8-1:19", "2:10-2:21"]
     }],
   "funcs": [{
diff --git a/tests/usage/type_usage_declare_static.cc b/tests/usage/type_usage_declare_static.cc
index 3b423813..df1f055e 100644
--- a/tests/usage/type_usage_declare_static.cc
+++ b/tests/usage/type_usage_declare_static.cc
@@ -6,6 +6,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@Type",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0],
       "uses": ["1:8-1:12", "2:8-2:12"]
     }],
diff --git a/tests/usage/type_usage_on_return_type.cc b/tests/usage/type_usage_on_return_type.cc
index 0b281c9d..00cbf127 100644
--- a/tests/usage/type_usage_on_return_type.cc
+++ b/tests/usage/type_usage_on_return_type.cc
@@ -23,6 +23,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@Type",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["1:8-1:12", "3:1-3:5", "4:1-4:5", "5:1-5:5", "8:3-8:7", "12:1-12:5", "15:14-15:18", "17:8-17:12", "18:8-18:12"]
     }, {
       "id": 1,
diff --git a/tests/usage/type_usage_typedef_and_using.cc b/tests/usage/type_usage_typedef_and_using.cc
index 797f2ff3..4cf54200 100644
--- a/tests/usage/type_usage_typedef_and_using.cc
+++ b/tests/usage/type_usage_typedef_and_using.cc
@@ -15,6 +15,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@Foo",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["1:8-1:11", "2:14-2:17", "3:9-3:12", "7:13-7:16"]
     }, {
       "id": 1,
diff --git a/tests/usage/type_usage_typedef_and_using_template.cc b/tests/usage/type_usage_typedef_and_using_template.cc
index 29614e1c..7a45452b 100644
--- a/tests/usage/type_usage_typedef_and_using_template.cc
+++ b/tests/usage/type_usage_typedef_and_using_template.cc
@@ -10,6 +10,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@ST>1#T@Foo",
+      "short_name": "",
+      "detailed_name": "",
       "uses": ["2:8-2:11", "4:14-4:17", "5:9-5:12"]
     }, {
       "id": 1,
diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc
index eeb14e09..6b0a9f3c 100644
--- a/tests/vars/function_local.cc
+++ b/tests/vars/function_local.cc
@@ -10,6 +10,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@Foo",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0],
       "uses": ["1:8-1:11", "4:3-4:6"]
     }],
diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc
index 25a6eaea..f133fbd8 100644
--- a/tests/vars/function_param.cc
+++ b/tests/vars/function_param.cc
@@ -8,6 +8,8 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@Foo",
+      "short_name": "",
+      "detailed_name": "",
       "instances": [0, 1],
       "uses": ["1:8-1:11", "3:10-3:13", "3:19-3:22"]
     }],