diff --git a/include/mrdocs/Metadata.hpp b/include/mrdocs/Metadata.hpp
index 27af52d3d0..92e0f518f8 100644
--- a/include/mrdocs/Metadata.hpp
+++ b/include/mrdocs/Metadata.hpp
@@ -14,16 +14,10 @@
 
 #include <mrdocs/Platform.hpp>
 
-// All headers related to
-// metadata extracted from AST
-
-#include <mrdocs/Metadata/Info/Using.hpp>
-#include <mrdocs/Metadata/Expression.hpp>
 #include <mrdocs/Metadata/Info.hpp>
 #include <mrdocs/Metadata/Info/Concept.hpp>
 #include <mrdocs/Metadata/Info/Enum.hpp>
 #include <mrdocs/Metadata/Info/EnumConstant.hpp>
-#include <mrdocs/Metadata/Info/Field.hpp>
 #include <mrdocs/Metadata/Info/Friend.hpp>
 #include <mrdocs/Metadata/Info/Function.hpp>
 #include <mrdocs/Metadata/Info/Guide.hpp>
@@ -33,6 +27,9 @@
 #include <mrdocs/Metadata/Info/Record.hpp>
 #include <mrdocs/Metadata/Info/Typedef.hpp>
 #include <mrdocs/Metadata/Info/Variable.hpp>
+#include <mrdocs/Metadata/Info/Using.hpp>
+
+#include <mrdocs/Metadata/Expression.hpp>
 #include <mrdocs/Metadata/Javadoc.hpp>
 #include <mrdocs/Metadata/Name.hpp>
 #include <mrdocs/Metadata/Source.hpp>
diff --git a/include/mrdocs/Metadata/Info/Field.hpp b/include/mrdocs/Metadata/Info/Field.hpp
deleted file mode 100644
index 711cab72d0..0000000000
--- a/include/mrdocs/Metadata/Info/Field.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// This is a derivative work. originally part of the LLVM Project.
-// Licensed under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-// Copyright (c) 2023 Vinnie Falco (vinnie.falco@gmail.com)
-// Copyright (c) 2023 Krystian Stasiowski (sdkrystian@gmail.com)
-// Copyright (c) 2024 Alan de Freitas (alandefreitas@gmail.com)
-//
-// Official repository: https://github.com/cppalliance/mrdocs
-//
-
-#ifndef MRDOCS_API_METADATA_FIELD_HPP
-#define MRDOCS_API_METADATA_FIELD_HPP
-
-#include <mrdocs/Metadata/Expression.hpp>
-#include <mrdocs/Metadata/Info.hpp>
-#include <mrdocs/Metadata/Source.hpp>
-#include <mrdocs/Metadata/Type.hpp>
-#include <mrdocs/Dom/LazyArray.hpp>
-
-namespace clang::mrdocs {
-
-/** Info for fields (i.e. non-static data members)
-
-    Non-static data members cannot be redeclared.
-*/
-struct FieldInfo final
-    : InfoCommonBase<InfoKind::Field>
-{
-    /** Type of the field */
-    Polymorphic<TypeInfo> Type;
-
-    /** The default member initializer, if any.
-    */
-    ExprInfo Default;
-
-    /** Whether the field is a variant member */
-    bool IsVariant = false;
-
-    /** Whether the field is declared mutable */
-    bool IsMutable = false;
-
-    /** Whether the field is a bitfield */
-    bool IsBitfield = false;
-
-    /** The width of the bitfield */
-    ConstantExprInfo<std::uint64_t> BitfieldWidth;
-
-    // KRYSTIAN FIXME: nodiscard cannot be applied to fields; this should
-    // instead be IsMaybeUnused. we should also store the spelling
-    bool IsMaybeUnused = false;
-
-    bool IsDeprecated = false;
-
-    bool HasNoUniqueAddress = false;
-
-    std::vector<std::string> Attributes;
-
-    //--------------------------------------------
-
-    explicit FieldInfo(SymbolID ID) noexcept
-        : InfoCommonBase(ID)
-    {
-    }
-};
-
-MRDOCS_DECL
-void
-merge(FieldInfo& I, FieldInfo&& Other);
-
-/** Map a FieldInfo to a dom::Object.
- */
-template <class IO>
-void
-tag_invoke(
-    dom::LazyObjectMapTag t,
-    IO& io,
-    FieldInfo const& I,
-    DomCorpus const* domCorpus)
-{
-    tag_invoke(t, io, dynamic_cast<Info const&>(I), domCorpus);
-    io.map("type", I.Type);
-    if (!I.Default.Written.empty())
-    {
-        io.map("default", I.Default.Written);
-    }
-    io.map("isMaybeUnused", I.IsMaybeUnused);
-    io.map("isDeprecated", I.IsDeprecated);
-    io.map("isVariant", I.IsVariant);
-    io.map("isMutable", I.IsMutable);
-    io.map("isBitfield", I.IsBitfield);
-    io.map("hasNoUniqueAddress", I.HasNoUniqueAddress);
-    if (I.IsBitfield)
-    {
-        io.map("bitfieldWidth", I.BitfieldWidth.Written);
-    }
-    io.map("attributes", dom::LazyArray(I.Attributes));
-}
-
-/** Map the FieldInfo to a @ref dom::Value object.
- */
-inline
-void
-tag_invoke(
-    dom::ValueFromTag,
-    dom::Value& v,
-    FieldInfo const& I,
-    DomCorpus const* domCorpus)
-{
-    v = dom::LazyObject(I, domCorpus);
-}
-
-} // clang::mrdocs
-
-#endif
diff --git a/include/mrdocs/Metadata/Info/Variable.hpp b/include/mrdocs/Metadata/Info/Variable.hpp
index c8d8ece54b..6aa462a81a 100644
--- a/include/mrdocs/Metadata/Info/Variable.hpp
+++ b/include/mrdocs/Metadata/Info/Variable.hpp
@@ -25,7 +25,7 @@ namespace clang::mrdocs {
 /** A variable.
 
     This includes variables at namespace
-    scope, and static variables at class scope.
+    or record scope.
 */
 struct VariableInfo final
     : InfoCommonBase<InfoKind::Variable>
@@ -35,6 +35,8 @@ struct VariableInfo final
 
     std::optional<TemplateInfo> Template;
 
+    /** The default member initializer, if any.
+     */
     ExprInfo Initializer;
 
     StorageClassKind StorageClass = StorageClassKind::None;
@@ -49,6 +51,28 @@ struct VariableInfo final
 
     std::vector<std::string> Attributes;
 
+    bool IsMaybeUnused = false;
+
+    bool IsDeprecated = false;
+
+    bool HasNoUniqueAddress = false;
+
+    //--------------------------------------------
+    // Record fields
+    bool IsRecordField = false;
+
+    /** Whether the field is declared mutable */
+    bool IsMutable = false;
+
+    /** Whether the field is a variant member */
+    bool IsVariant = false;
+
+    /** Whether the field is a bitfield */
+    bool IsBitfield = false;
+
+    /** The width of the bitfield */
+    ConstantExprInfo<std::uint64_t> BitfieldWidth;
+
     //--------------------------------------------
 
     explicit VariableInfo(SymbolID const &ID) noexcept
@@ -90,6 +114,18 @@ tag_invoke(
         io.map("initializer", I.Initializer.Written);
     }
     io.map("attributes", dom::LazyArray(I.Attributes));
+    io.map("isRecordField", I.IsRecordField);
+    io.map("isMaybeUnused", I.IsMaybeUnused);
+    io.map("isDeprecated", I.IsDeprecated);
+    io.map("isVariant", I.IsVariant);
+    io.map("isMutable", I.IsMutable);
+    io.map("isBitfield", I.IsBitfield);
+    if (I.IsBitfield)
+    {
+        io.map("bitfieldWidth", I.BitfieldWidth.Written);
+    }
+    io.map("hasNoUniqueAddress", I.HasNoUniqueAddress);
+    io.map("attributes", dom::LazyArray(I.Attributes));
 }
 
 /** Map the VariableInfo to a @ref dom::Value object.
diff --git a/mrdocs.rnc b/mrdocs.rnc
index 4c3fef2c49..440b8853bf 100644
--- a/mrdocs.rnc
+++ b/mrdocs.rnc
@@ -166,30 +166,14 @@ grammar
 
     #---------------------------------------------
 
-    Field =
-        element (field|bitfield)
-        {
-            Name,
-            Access ?,
-            ID,
-            attribute width { text } ?,
-            attribute default { text } ?,
-            Location,
-            (
-                Attr * &
-                TypeInfo &
-                Javadoc ?
-            )
-        }
-
-    #---------------------------------------------
-
     Variable =
         element variable
         {
             Name,
             Access ?,
             ID,
+            attribute width { text } ?,
+            attribute default { text } ?,
             Location *,
             (
                 Attr * &
@@ -367,7 +351,6 @@ grammar
             Function       |
             Typedef        |
             Enum           |
-            Field          |
             Variable       |
             Guide          |
             Template       |
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/field.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/field.hbs
deleted file mode 100644
index e43274dc59..0000000000
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/field.hbs
+++ /dev/null
@@ -1,8 +0,0 @@
-{{#if attributes}}{{ str "[[" }}{{join ", " attributes}}{{ str "]]" }}
-{{/if}}
-{{#if isMutable}}mutable
-{{/if~}}
-{{>type/declarator-prefix type}} {{>symbol/name symbol~}}
-{{#if isBitfield}} : {{bitfieldWidth}}{{/if~}}
-{{#if default}} = {{default}}{{/if~}}
-{{>type/declarator-suffix type}};
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/signature/variable.hbs b/share/mrdocs/addons/generator/common/partials/symbol/signature/variable.hbs
index 77caeb6a15..a055a959a8 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/signature/variable.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/signature/variable.hbs
@@ -1,5 +1,9 @@
+{{#if attributes}}{{ str "[[" }}{{join ", " attributes}}{{ str "]]" }}
+{{/if}}
 {{#if template}}{{>template/head template}}
 {{/if~}}
+{{#if isMutable}}mutable
+{{/if~}}
 {{#if isInline}}inline {{/if~}}
 {{#if isConstexpr}}constexpr {{/if~}}
 {{#if storageClass}}{{storageClass}}
@@ -7,5 +11,7 @@
 {{#if isThreadLocal}}thread_local
 {{/if~}}
 {{>type/declarator-prefix type}} {{>symbol/name symbol link=(select link link template.primary)~}}
+{{#if isBitfield}} : {{bitfieldWidth}}{{/if~}}
+{{#if default}} = {{default}}{{/if~}}
 {{>type/declarator-suffix type~}}
 {{#if initializer}} = {{initializer}}{{/if}};
\ No newline at end of file
diff --git a/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs b/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs
index 6aff727240..8e9b2262bc 100644
--- a/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs
+++ b/share/mrdocs/addons/generator/common/partials/symbol/special-function-suffix.hbs
@@ -26,7 +26,7 @@
     {{~#if isDeleted~}}
         {{str ' '}}{{#>markup/span class="small"}}[deleted]{{/markup/span}}
     {{~/if~}}
-{{else if (eq kind "field")~}}
+{{else if (eq kind "variable")~}}
     {{~#if isVariant~}}
         {{#>markup/span class="small"}}[variant member]{{/markup/span}}
     {{~/if~}}
diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp
index 75404c987f..e30510312b 100644
--- a/src/lib/AST/ASTVisitor.cpp
+++ b/src/lib/AST/ASTVisitor.cpp
@@ -1085,16 +1085,17 @@ populate(VariableInfo& I, VarTemplatePartialSpecializationDecl const* D)
 void
 ASTVisitor::
 populate(
-    FieldInfo& I,
+    VariableInfo& I,
     FieldDecl const* D)
 {
+    I.IsRecordField = true;
     I.Type = toTypeInfo(D->getType());
-    I.IsVariant = D->getParent()->isUnion();
-    I.IsMutable = D->isMutable();
     if (Expr const* E = D->getInClassInitializer())
     {
-        populate(I.Default, E);
+        populate(I.Initializer, E);
     }
+    I.IsVariant = D->getParent()->isUnion();
+    I.IsMutable = D->isMutable();
     if(D->isBitField())
     {
         I.IsBitfield = true;
@@ -1756,14 +1757,16 @@ addMember(RecordTranche& T, Info const& Member)
         }
         return;
     }
-    if (auto const* U = Member.asFieldPtr())
-    {
-        addMember(T.Variables, *U);
-        return;
-    }
     if (auto const* U = Member.asVariablePtr())
     {
-        addMember(T.StaticVariables, *U);
+        if (U->StorageClass != StorageClassKind::Static)
+        {
+            addMember(T.Variables, *U);
+        }
+        else
+        {
+            addMember(T.StaticVariables, *U);
+        }
         return;
     }
     if (auto const* U = Member.asConceptPtr())
diff --git a/src/lib/AST/ASTVisitor.hpp b/src/lib/AST/ASTVisitor.hpp
index 0769082214..45b0d55f34 100644
--- a/src/lib/AST/ASTVisitor.hpp
+++ b/src/lib/AST/ASTVisitor.hpp
@@ -573,7 +573,7 @@ class ASTVisitor
     populate(VariableInfo& I, VarTemplatePartialSpecializationDecl const* D);
 
     void
-    populate(FieldInfo& I, FieldDecl const* D);
+    populate(VariableInfo& I, FieldDecl const* D);
 
     void
     populate(FriendInfo& I, FriendDecl const* D);
diff --git a/src/lib/AST/ClangHelpers.hpp b/src/lib/AST/ClangHelpers.hpp
index f30c7ca328..0fc713eca3 100644
--- a/src/lib/AST/ClangHelpers.hpp
+++ b/src/lib/AST/ClangHelpers.hpp
@@ -165,10 +165,9 @@ template <>
 struct InfoTypeFor<VarTemplateDecl>
     : std::type_identity<VariableInfo> {};
 
-// Extract FieldInfo from FieldDecl
 template <>
 struct InfoTypeFor<FieldDecl>
-    : std::type_identity<FieldInfo> {};
+    : std::type_identity<VariableInfo> {};
 
 // Extract FriendInfo from FriendDecl
 template <>
diff --git a/src/lib/Gen/xml/XMLWriter.cpp b/src/lib/Gen/xml/XMLWriter.cpp
index c41a5240a8..e91b9e8972 100644
--- a/src/lib/Gen/xml/XMLWriter.cpp
+++ b/src/lib/Gen/xml/XMLWriter.cpp
@@ -556,26 +556,26 @@ writeTypedef(
 
 void
 XMLWriter::
-writeField(
-    FieldInfo const& I)
+writeVariable(
+    VariableInfo const& I)
 {
-    std::string_view tag_name = dataMemberTagName;
+    openTemplate(I.Template);
+
     std::string bit_width;
     if(I.IsBitfield)
     {
-        tag_name = bitfieldTagName;
         bit_width = I.BitfieldWidth.Value ?
             std::to_string(*I.BitfieldWidth.Value) :
             I.BitfieldWidth.Written;
     }
 
-    tags_.open(tag_name, {
+    tags_.open(varTagName, {
         { "name", I.Name },
         { I.Access },
         { I.id },
-        { "width", bit_width, I.IsBitfield },
-        { "default", I.Default.Written, ! I.Default.Written.empty() }
-    });
+           { "width", bit_width, I.IsBitfield },
+        { "default", I.Initializer.Written, ! I.Initializer.Written.empty() }
+        });
 
     writeSourceInfo(I);
 
@@ -584,39 +584,17 @@ writeField(
             {"id", "is-mutable"}
         });
 
-    writeAttr(I.IsVariant, "is-variant", tags_);
-    writeAttr(I.IsMaybeUnused, "maybe-unused", tags_);
-    writeAttr(I.IsDeprecated, "deprecated", tags_);
-    writeAttr(I.HasNoUniqueAddress, "no-unique-address", tags_);
-
-    writeType(I.Type, tags_);
-
-    writeJavadoc(I.javadoc);
-
-    tags_.close(tag_name);
-}
-
-void
-XMLWriter::
-writeVariable(
-    VariableInfo const& I)
-{
-    openTemplate(I.Template);
-
-    tags_.open(varTagName, {
-        { "name", I.Name },
-        { I.Access },
-        { I.id }
-        });
-
-    writeSourceInfo(I);
-
     writeAttr(I.StorageClass, "storage-class", tags_);
     writeAttr(I.IsInline, "is-inline", tags_);
     writeAttr(I.IsConstexpr, "is-constexpr", tags_);
     writeAttr(I.IsConstinit, "is-constinit", tags_);
     writeAttr(I.IsThreadLocal, "is-thread-local", tags_);
 
+    // writeAttr(I.IsVariant, "is-variant", tags_);
+    // writeAttr(I.IsMaybeUnused, "maybe-unused", tags_);
+    // writeAttr(I.IsDeprecated, "deprecated", tags_);
+    // writeAttr(I.HasNoUniqueAddress, "no-unique-address", tags_);
+
     writeType(I.Type, tags_);
 
     writeJavadoc(I.javadoc);
diff --git a/src/lib/Lib/CorpusImpl.cpp b/src/lib/Lib/CorpusImpl.cpp
index 64ab59e5e4..22233d535b 100644
--- a/src/lib/Lib/CorpusImpl.cpp
+++ b/src/lib/Lib/CorpusImpl.cpp
@@ -827,16 +827,35 @@ build(
     corpus->info_ = std::move(results);
     corpus->undocumented_ = std::move(undocumented);
 
-    report::info(
-        "Extracted {} declarations in {}",
-        corpus->info_.size(),
-        format_duration(clock_type::now() - start_time));
-
     // ------------------------------------------
     // Finalize corpus
     // ------------------------------------------
     corpus->finalize();
 
+    report::info(
+        "Extracted {} declarations in {}",
+        corpus->info_.size(),
+        format_duration(clock_type::now() - start_time));
+    if (report::getMinimumLevel() <= report::Level::info)
+    {
+        for (ExtractionMode m:
+             { ExtractionMode::Regular,
+               ExtractionMode::SeeBelow,
+               ExtractionMode::ImplementationDefined,
+               ExtractionMode::Dependency })
+        {
+            std::size_t const count = std::ranges::
+                count_if(corpus->info_, [m](auto const& info) {
+                return info && info->Extraction == m;
+            });
+            MRDOCS_CHECK_OR_CONTINUE(count);
+            report::info(
+                "  - {} symbols: {}",
+                toString(m),
+                count);
+        }
+    }
+
     return corpus;
 }
 
@@ -925,44 +944,45 @@ qualifiedName(
 void
 CorpusImpl::finalize()
 {
+    report::info("Finalizing corpus");
+
     {
-        report::debug("Finalizing namespaces");
+        report::debug("  - Finalizing namespaces");
         NamespacesFinalizer finalizer(*this);
         finalizer.build();
     }
 
     if (config->inheritBaseMembers != PublicSettings::BaseMemberInheritance::Never)
     {
-        report::debug("Finalizing base members");
+        report::debug("  - Finalizing base members");
         BaseMembersFinalizer finalizer(*this);
         finalizer.build();
     }
 
     if (config->overloads)
     {
-        report::debug("Finalizing overloads");
+        report::debug("  - Finalizing overloads");
         OverloadsFinalizer finalizer(*this);
         finalizer.build();
     }
 
     {
-        report::debug("Finalizing auto-relates");
+        report::debug("  - Finalizing auto-relates");
         DerivedFinalizer finalizer(*this);
         finalizer.build();
     }
 
     if (config->sortMembers)
     {
-        report::debug("Finalizing sorted members");
+        report::debug("  - Finalizing sorted members");
         SortMembersFinalizer finalizer(*this);
         finalizer.build();
     }
 
     // Finalize javadoc
-    report::debug("Finalizing javadoc");
+    report::debug("  - Finalizing javadoc");
     JavadocFinalizer finalizer(*this);
     finalizer.build();
 }
 
-
 } // clang::mrdocs
diff --git a/src/lib/Lib/CorpusImpl.hpp b/src/lib/Lib/CorpusImpl.hpp
index 21dbdeb9a0..9adb1fab39 100644
--- a/src/lib/Lib/CorpusImpl.hpp
+++ b/src/lib/Lib/CorpusImpl.hpp
@@ -14,7 +14,7 @@
 
 #include "lib/AST/ParseRef.hpp"
 #include "lib/Lib/ConfigImpl.hpp"
-#include "lib/Lib/Info.hpp"
+#include "lib/Lib/InfoSet.hpp"
 #include "lib/Support/Debug.hpp"
 #include <clang/Tooling/CompilationDatabase.h>
 #include <mrdocs/ADT/UnorderedStringMap.hpp>
diff --git a/src/lib/Lib/ExecutionContext.hpp b/src/lib/Lib/ExecutionContext.hpp
index 95ddf33648..533d49b058 100644
--- a/src/lib/Lib/ExecutionContext.hpp
+++ b/src/lib/Lib/ExecutionContext.hpp
@@ -15,7 +15,7 @@
 
 #include "ConfigImpl.hpp"
 #include "Diagnostics.hpp"
-#include "Info.hpp"
+#include "InfoSet.hpp"
 #include <mrdocs/Support/Error.hpp>
 #include <llvm/ADT/SmallString.h>
 #include <mutex>
diff --git a/src/lib/Lib/Info.cpp b/src/lib/Lib/InfoSet.cpp
similarity index 91%
rename from src/lib/Lib/Info.cpp
rename to src/lib/Lib/InfoSet.cpp
index 17ceabdbf8..23b1a2f35a 100644
--- a/src/lib/Lib/Info.cpp
+++ b/src/lib/Lib/InfoSet.cpp
@@ -1,8 +1,7 @@
 
-#include "Info.hpp"
+#include "InfoSet.hpp"
 
-namespace clang {
-namespace mrdocs {
+namespace clang::mrdocs {
 
 std::size_t
 InfoPtrHasher::
@@ -56,5 +55,4 @@ operator()(
     return b->id == a;
 }
 
-} // mrdocs
-} // clang
+} // clang::mrdocs
diff --git a/src/lib/Lib/Info.hpp b/src/lib/Lib/InfoSet.hpp
similarity index 98%
rename from src/lib/Lib/Info.hpp
rename to src/lib/Lib/InfoSet.hpp
index d592aa58cd..2eac80105c 100644
--- a/src/lib/Lib/Info.hpp
+++ b/src/lib/Lib/InfoSet.hpp
@@ -10,8 +10,8 @@
 // Official repository: https://github.com/cppalliance/mrdocs
 //
 
-#ifndef MRDOCS_LIB_TOOL_INFO_HPP
-#define MRDOCS_LIB_TOOL_INFO_HPP
+#ifndef MRDOCS_LIB_TOOL_INFOSET_HPP
+#define MRDOCS_LIB_TOOL_INFOSET_HPP
 
 #include <mrdocs/Platform.hpp>
 #include <mrdocs/Metadata/Info.hpp>
diff --git a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.hpp b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.hpp
index efd2b774ce..94861deec3 100644
--- a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.hpp
@@ -11,7 +11,7 @@
 #ifndef MRDOCS_LIB_METADATA_FINALIZER_BASEMEMBERSFINALIZER_HPP
 #define MRDOCS_LIB_METADATA_FINALIZER_BASEMEMBERSFINALIZER_HPP
 
-#include "lib/Lib/Info.hpp"
+#include "lib/Lib/InfoSet.hpp"
 #include "lib/Lib/CorpusImpl.hpp"
 
 namespace clang::mrdocs {
diff --git a/src/lib/Metadata/Finalizers/DerivedFinalizer.hpp b/src/lib/Metadata/Finalizers/DerivedFinalizer.hpp
index 8726800a0f..49f611ce62 100644
--- a/src/lib/Metadata/Finalizers/DerivedFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/DerivedFinalizer.hpp
@@ -13,7 +13,7 @@
 #define MRDOCS_LIB_METADATA_FINALIZER_DERIVEDFINALIZER_HPP
 
 #include "lib/Lib/CorpusImpl.hpp"
-#include "lib/Lib/Info.hpp"
+#include "lib/Lib/InfoSet.hpp"
 #include <utility>
 
 namespace clang::mrdocs {
diff --git a/src/lib/Metadata/Finalizers/Javadoc/Function.hpp b/src/lib/Metadata/Finalizers/Javadoc/Function.hpp
index 1560ae0d54..3b7f440d89 100644
--- a/src/lib/Metadata/Finalizers/Javadoc/Function.hpp
+++ b/src/lib/Metadata/Finalizers/Javadoc/Function.hpp
@@ -12,7 +12,7 @@
 #define MRDOCS_LIB_METADATA_FINALIZER_JAVADOCFINALIZER_FUNCTION_HPP
 
 #include "lib/Lib/CorpusImpl.hpp"
-#include "lib/Lib/Info.hpp"
+#include "lib/Lib/InfoSet.hpp"
 #include <mrdocs/Support/Algorithm.hpp>
 #include <utility>
 
diff --git a/src/lib/Metadata/Finalizers/Javadoc/Overloads.hpp b/src/lib/Metadata/Finalizers/Javadoc/Overloads.hpp
index 9bfa06d7e3..fd01105d25 100644
--- a/src/lib/Metadata/Finalizers/Javadoc/Overloads.hpp
+++ b/src/lib/Metadata/Finalizers/Javadoc/Overloads.hpp
@@ -12,7 +12,7 @@
 #define MRDOCS_LIB_METADATA_FINALIZER_JAVADOCFINALIZER_OVERLOADS_HPP
 
 #include "lib/Lib/CorpusImpl.hpp"
-#include "lib/Lib/Info.hpp"
+#include "lib/Lib/InfoSet.hpp"
 #include "Function.hpp"
 #include <utility>
 
diff --git a/src/lib/Metadata/Finalizers/JavadocFinalizer.hpp b/src/lib/Metadata/Finalizers/JavadocFinalizer.hpp
index 5cc9ff1ef1..d45665a765 100644
--- a/src/lib/Metadata/Finalizers/JavadocFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/JavadocFinalizer.hpp
@@ -13,7 +13,7 @@
 #define MRDOCS_LIB_METADATA_FINALIZER_JAVADOCFINALIZER_HPP
 
 #include "lib/Lib/CorpusImpl.hpp"
-#include "lib/Lib/Info.hpp"
+#include "lib/Lib/InfoSet.hpp"
 #include <mrdocs/Support/ScopeExit.hpp>
 #include <mrdocs/Support/Report.hpp>
 #include <set>
diff --git a/src/lib/Metadata/Finalizers/NamespacesFinalizer.hpp b/src/lib/Metadata/Finalizers/NamespacesFinalizer.hpp
index 1b62047fbb..55963dadca 100644
--- a/src/lib/Metadata/Finalizers/NamespacesFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/NamespacesFinalizer.hpp
@@ -11,7 +11,7 @@
 #ifndef MRDOCS_LIB_METADATA_FINALIZER_NAMESPACESFINALIZER_HPP
 #define MRDOCS_LIB_METADATA_FINALIZER_NAMESPACESFINALIZER_HPP
 
-#include "lib/Lib/Info.hpp"
+#include "lib/Lib/InfoSet.hpp"
 #include "lib/Lib/CorpusImpl.hpp"
 
 namespace clang::mrdocs {
diff --git a/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp b/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp
index 9fe914cdd7..98d5ae6fe0 100644
--- a/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp
@@ -11,7 +11,7 @@
 #ifndef MRDOCS_LIB_METADATA_FINALIZER_OVERLOADSFINALIZER_HPP
 #define MRDOCS_LIB_METADATA_FINALIZER_OVERLOADSFINALIZER_HPP
 
-#include "lib/Lib/Info.hpp"
+#include "lib/Lib/InfoSet.hpp"
 #include "lib/Lib/CorpusImpl.hpp"
 
 namespace clang::mrdocs {
diff --git a/src/lib/Metadata/Finalizers/SortMembersFinalizer.hpp b/src/lib/Metadata/Finalizers/SortMembersFinalizer.hpp
index f9bcbc8f5e..d39b5dd0c6 100644
--- a/src/lib/Metadata/Finalizers/SortMembersFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/SortMembersFinalizer.hpp
@@ -11,7 +11,7 @@
 #ifndef MRDOCS_LIB_METADATA_FINALIZER_SORTMEMBERSFINALIZER_HPP
 #define MRDOCS_LIB_METADATA_FINALIZER_SORTMEMBERSFINALIZER_HPP
 
-#include "lib/Lib/Info.hpp"
+#include "lib/Lib/InfoSet.hpp"
 #include "lib/Lib/CorpusImpl.hpp"
 
 namespace clang::mrdocs {
diff --git a/src/lib/Metadata/Info/Field.cpp b/src/lib/Metadata/Info/Field.cpp
deleted file mode 100644
index b6ba7f364f..0000000000
--- a/src/lib/Metadata/Info/Field.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// This is a derivative work. originally part of the LLVM Project.
-// Licensed under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-// Copyright (c) 2025 Alan de Freitas (alandefreitas@gmail.com)
-//
-// Official repository: https://github.com/cppalliance/mrdocs
-//
-
-#include <mrdocs/Metadata/Info/Field.hpp>
-#include <mrdocs/Platform.hpp>
-#include <llvm/ADT/STLExtras.h>
-
-namespace clang::mrdocs {
-
-void
-merge(FieldInfo& I, FieldInfo&& Other)
-{
-    MRDOCS_ASSERT(canMerge(I, Other));
-    merge(I.asInfo(), std::move(Other.asInfo()));
-    if (!I.Type)
-    {
-        I.Type = std::move(Other.Type);
-    }
-    if (I.Default.Written.empty())
-    {
-        I.Default = std::move(Other.Default);
-    }
-    I.IsBitfield |= Other.IsBitfield;
-    merge(I.BitfieldWidth, std::move(Other.BitfieldWidth));
-    I.IsVariant |= Other.IsVariant;
-    I.IsMutable |= Other.IsMutable;
-    I.IsMaybeUnused |= Other.IsMaybeUnused;
-    I.IsDeprecated |= Other.IsDeprecated;
-    I.HasNoUniqueAddress |= Other.HasNoUniqueAddress;
-}
-
-} // clang::mrdocs
-
diff --git a/src/lib/Metadata/Info/Variable.cpp b/src/lib/Metadata/Info/Variable.cpp
index f31a0052ed..76474bcaf0 100644
--- a/src/lib/Metadata/Info/Variable.cpp
+++ b/src/lib/Metadata/Info/Variable.cpp
@@ -90,6 +90,13 @@ merge(VariableInfo& I, VariableInfo&& Other)
             I.Attributes.push_back(otherAttr);
         }
     }
+    I.IsBitfield |= Other.IsBitfield;
+    merge(I.BitfieldWidth, std::move(Other.BitfieldWidth));
+    I.IsVariant |= Other.IsVariant;
+    I.IsMutable |= Other.IsMutable;
+    I.IsMaybeUnused |= Other.IsMaybeUnused;
+    I.IsDeprecated |= Other.IsDeprecated;
+    I.HasNoUniqueAddress |= Other.HasNoUniqueAddress;
 }
 
 } // clang::mrdocs
diff --git a/src/lib/Metadata/InfoNodes.json b/src/lib/Metadata/InfoNodes.json
index 928c742a01..6bc4297ae3 100644
--- a/src/lib/Metadata/InfoNodes.json
+++ b/src/lib/Metadata/InfoNodes.json
@@ -31,10 +31,6 @@
     "name": "variable",
     "brief": "The symbol is a variable"
   },
-  {
-    "name": "field",
-    "brief": "The symbol is a field"
-  },
   {
     "name": "friend",
     "brief": "The symbol is a friend declaration"
diff --git a/src/tool/GenerateAction.cpp b/src/tool/GenerateAction.cpp
index 776329c1f0..1b527d1cc3 100644
--- a/src/tool/GenerateAction.cpp
+++ b/src/tool/GenerateAction.cpp
@@ -209,7 +209,7 @@ DoGenerateAction(
     // --------------------------------------------------------------
     // Normalize outputPath path
     MRDOCS_CHECK(settings.output, "The output path argument is missing");
-    report::info("Generating docs\n");
+    report::info("Generating docs");
     MRDOCS_TRY(generator.build(*corpus));
 
     // --------------------------------------------------------------
diff --git a/test-files/golden-tests/config/auto-relates/remove-friend.adoc b/test-files/golden-tests/config/auto-relates/remove-friend.adoc
index 0f35e0da8b..9a1462ff3c 100644
--- a/test-files/golden-tests/config/auto-relates/remove-friend.adoc
+++ b/test-files/golden-tests/config/auto-relates/remove-friend.adoc
@@ -46,7 +46,7 @@ class A;
 |===
 | Name
 | Description
-| <<A-09friend,`operator&equals;&equals;`>> 
+| <<A-08friend,`operator&equals;&equals;`>> 
 | Friend function not listed as non&hyphen;member
 |===
 
@@ -60,7 +60,7 @@ class A;
 | Non&hyphen;member function of A
 |===
 
-[#A-09friend]
+[#A-08friend]
 == operator&equals;&equals;
 
 Friend function not listed as non&hyphen;member
diff --git a/test-files/golden-tests/config/auto-relates/remove-friend.html b/test-files/golden-tests/config/auto-relates/remove-friend.html
index 026ab58e92..f4e3802499 100644
--- a/test-files/golden-tests/config/auto-relates/remove-friend.html
+++ b/test-files/golden-tests/config/auto-relates/remove-friend.html
@@ -67,7 +67,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-09friend"><code>operator&#x3D;&#x3D;</code></a> </td><td><span>Friend function not listed as non-member</span></td></tr>
+<td><a href="#A-08friend"><code>operator&#x3D;&#x3D;</code></a> </td><td><span>Friend function not listed as non-member</span></td></tr>
 </tbody>
 </table>
 
@@ -90,7 +90,7 @@ <h2>Non-Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="A-09friend">operator&#x3D;&#x3D;</h2>
+<h2 id="A-08friend">operator&#x3D;&#x3D;</h2>
 <div>
 <span>Friend function not listed as non-member</span>
 
diff --git a/test-files/golden-tests/filters/symbol-name/impl-defined-member.xml b/test-files/golden-tests/filters/symbol-name/impl-defined-member.xml
index 458803aab4..fc7d9b5302 100644
--- a/test-files/golden-tests/filters/symbol-name/impl-defined-member.xml
+++ b/test-files/golden-tests/filters/symbol-name/impl-defined-member.xml
@@ -12,12 +12,12 @@
       <file short-path="impl-defined-member.cpp" source-path="impl-defined-member.cpp" line="6" class="def"/>
     </struct>
   </namespace>
-  <variable name="absolute_uri_rule" id="/ePshzEghZYl/D7bJ6X3M2XbKEg=">
+  <variable name="absolute_uri_rule" id="/ePshzEghZYl/D7bJ6X3M2XbKEg=" default="{}">
     <file short-path="impl-defined-member.cpp" source-path="impl-defined-member.cpp" line="9" class="def"/>
     <attr id="is-constexpr"/>
     <type id="vOKKVGAcuI3CBaMkdZstuFgnnuQ=" name="detail::absolute_uri_rule_t"/>
   </variable>
-  <variable name="regular_absolute_uri_rule" id="ixmivDXFAcQVJd4G7XOqINAR858=">
+  <variable name="regular_absolute_uri_rule" id="ixmivDXFAcQVJd4G7XOqINAR858=" default="{}">
     <file short-path="impl-defined-member.cpp" source-path="impl-defined-member.cpp" line="11" class="def"/>
     <attr id="is-constexpr"/>
     <type id="fA+/UQOR2lG0f1+BZ+GeGlfo5sY=" name="regular::absolute_uri_rule_t"/>
diff --git a/test-files/golden-tests/javadoc/returns/returns.xml b/test-files/golden-tests/javadoc/returns/returns.xml
index 15efff74c0..e90d929443 100644
--- a/test-files/golden-tests/javadoc/returns/returns.xml
+++ b/test-files/golden-tests/javadoc/returns/returns.xml
@@ -12,14 +12,14 @@
           <reference id="43ASI/aC9fCLy8T+1gn7pUdis+g=">g</reference>
         </related>
       </doc>
-      <field name="first" id="zYZRwoC/XWBesPi1AQs+kPHibHI=">
+      <variable name="first" id="zYZRwoC/XWBesPi1AQs+kPHibHI=">
         <file short-path="returns.cpp" source-path="returns.cpp" line="9"/>
         <type name="T"/>
-      </field>
-      <field name="second" id="AfaC9XI9L85KNgrioXVThVhljqA=">
+      </variable>
+      <variable name="second" id="AfaC9XI9L85KNgrioXVThVhljqA=">
         <file short-path="returns.cpp" source-path="returns.cpp" line="10"/>
         <type name="U"/>
-      </field>
+      </variable>
     </struct>
   </template>
   <function name="f" id="s6nsa+zVhpzzrN+yUVPP5rvdXqs=">
diff --git a/test-files/golden-tests/symbols/concept/concept.xml b/test-files/golden-tests/symbols/concept/concept.xml
index 953a72be03..4cf58ad325 100644
--- a/test-files/golden-tests/symbols/concept/concept.xml
+++ b/test-files/golden-tests/symbols/concept/concept.xml
@@ -8,7 +8,7 @@
       <file short-path="concept.cpp" source-path="concept.cpp" line="4"/>
     </function>
   </template>
-  <variable name="x" id="ujOvtFFNPf6akih2fga4S9j6Y9M=">
+  <variable name="x" id="ujOvtFFNPf6akih2fga4S9j6Y9M=" default="0">
     <file short-path="concept.cpp" source-path="concept.cpp" line="7" class="def"/>
     <type class="auto" keyword="auto" constraint="C">
     </type>
diff --git a/test-files/golden-tests/symbols/friend/friend-1.adoc b/test-files/golden-tests/symbols/friend/friend-1.adoc
index 04d2b1965a..d16e7cc572 100644
--- a/test-files/golden-tests/symbols/friend/friend-1.adoc
+++ b/test-files/golden-tests/symbols/friend/friend-1.adoc
@@ -40,11 +40,11 @@ struct T;
 |===
 | Name
 | Description
-| <<T-09friend,`f`>> 
+| <<T-08friend,`f`>> 
 | f
 |===
 
-[#T-09friend]
+[#T-08friend]
 == f
 
 f
diff --git a/test-files/golden-tests/symbols/friend/friend-1.html b/test-files/golden-tests/symbols/friend/friend-1.html
index 8c5e5a6ce1..2706e21c72 100644
--- a/test-files/golden-tests/symbols/friend/friend-1.html
+++ b/test-files/golden-tests/symbols/friend/friend-1.html
@@ -61,7 +61,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T-09friend"><code>f</code></a> </td><td><span>f</span></td></tr>
+<td><a href="#T-08friend"><code>f</code></a> </td><td><span>f</span></td></tr>
 </tbody>
 </table>
 
@@ -70,7 +70,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="T-09friend">f</h2>
+<h2 id="T-08friend">f</h2>
 <div>
 <span>f</span>
 
diff --git a/test-files/golden-tests/symbols/friend/friend-2.adoc b/test-files/golden-tests/symbols/friend/friend-2.adoc
index e6e3f2877e..7d45b7c188 100644
--- a/test-files/golden-tests/symbols/friend/friend-2.adoc
+++ b/test-files/golden-tests/symbols/friend/friend-2.adoc
@@ -40,11 +40,11 @@ struct T;
 |===
 | Name
 | Description
-| <<T-09friend,`f`>> 
+| <<T-08friend,`f`>> 
 | f
 |===
 
-[#T-09friend]
+[#T-08friend]
 == f
 
 f
diff --git a/test-files/golden-tests/symbols/friend/friend-2.html b/test-files/golden-tests/symbols/friend/friend-2.html
index 6ffeda9245..d19e261117 100644
--- a/test-files/golden-tests/symbols/friend/friend-2.html
+++ b/test-files/golden-tests/symbols/friend/friend-2.html
@@ -61,7 +61,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T-09friend"><code>f</code></a> </td><td><span>f</span></td></tr>
+<td><a href="#T-08friend"><code>f</code></a> </td><td><span>f</span></td></tr>
 </tbody>
 </table>
 
@@ -70,7 +70,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="T-09friend">f</h2>
+<h2 id="T-08friend">f</h2>
 <div>
 <span>f</span>
 
diff --git a/test-files/golden-tests/symbols/friend/friend-3.adoc b/test-files/golden-tests/symbols/friend/friend-3.adoc
index 7479a8bdec..2f8e1ad497 100644
--- a/test-files/golden-tests/symbols/friend/friend-3.adoc
+++ b/test-files/golden-tests/symbols/friend/friend-3.adoc
@@ -41,11 +41,11 @@ struct T;
 |===
 | Name
 | Description
-| <<T-09friend,`f`>> 
+| <<T-08friend,`f`>> 
 | T&colon;&colon;f
 |===
 
-[#T-09friend]
+[#T-08friend]
 == f
 
 T&colon;&colon;f
@@ -78,10 +78,10 @@ struct U;
 [cols=1]
 |===
 | Name
-| <<U-09friend,`f`>> 
+| <<U-08friend,`f`>> 
 |===
 
-[#U-09friend]
+[#U-08friend]
 == f
 
 === Synopsis
diff --git a/test-files/golden-tests/symbols/friend/friend-3.html b/test-files/golden-tests/symbols/friend/friend-3.html
index 3bb0666896..8400973c09 100644
--- a/test-files/golden-tests/symbols/friend/friend-3.html
+++ b/test-files/golden-tests/symbols/friend/friend-3.html
@@ -62,7 +62,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T-09friend"><code>f</code></a> </td><td><span>T::f</span></td></tr>
+<td><a href="#T-08friend"><code>f</code></a> </td><td><span>T::f</span></td></tr>
 </tbody>
 </table>
 
@@ -71,7 +71,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="T-09friend">f</h2>
+<h2 id="T-08friend">f</h2>
 <div>
 <span>T::f</span>
 
@@ -113,7 +113,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#U-09friend"><code>f</code></a> </td></tr>
+<td><a href="#U-08friend"><code>f</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -122,7 +122,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="U-09friend">f</h2>
+<h2 id="U-08friend">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/friend/friend-4.adoc b/test-files/golden-tests/symbols/friend/friend-4.adoc
index a6c3a63262..df8f3f1467 100644
--- a/test-files/golden-tests/symbols/friend/friend-4.adoc
+++ b/test-files/golden-tests/symbols/friend/friend-4.adoc
@@ -40,10 +40,10 @@ struct T;
 [cols=1]
 |===
 | Name
-| <<T-09friend,`f`>> 
+| <<T-08friend,`f`>> 
 |===
 
-[#T-09friend]
+[#T-08friend]
 == f
 
 === Synopsis
@@ -75,11 +75,11 @@ struct U;
 |===
 | Name
 | Description
-| <<U-09friend,`f`>> 
+| <<U-08friend,`f`>> 
 | U&colon;&colon;f
 |===
 
-[#U-09friend]
+[#U-08friend]
 == f
 
 U&colon;&colon;f
diff --git a/test-files/golden-tests/symbols/friend/friend-4.html b/test-files/golden-tests/symbols/friend/friend-4.html
index 8976b26996..a120c4ac3b 100644
--- a/test-files/golden-tests/symbols/friend/friend-4.html
+++ b/test-files/golden-tests/symbols/friend/friend-4.html
@@ -61,7 +61,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T-09friend"><code>f</code></a> </td></tr>
+<td><a href="#T-08friend"><code>f</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -70,7 +70,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="T-09friend">f</h2>
+<h2 id="T-08friend">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -109,7 +109,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#U-09friend"><code>f</code></a> </td><td><span>U::f</span></td></tr>
+<td><a href="#U-08friend"><code>f</code></a> </td><td><span>U::f</span></td></tr>
 </tbody>
 </table>
 
@@ -118,7 +118,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="U-09friend">f</h2>
+<h2 id="U-08friend">f</h2>
 <div>
 <span>U::f</span>
 
diff --git a/test-files/golden-tests/symbols/friend/friend-5.adoc b/test-files/golden-tests/symbols/friend/friend-5.adoc
index 9a2c96d078..d685614313 100644
--- a/test-files/golden-tests/symbols/friend/friend-5.adoc
+++ b/test-files/golden-tests/symbols/friend/friend-5.adoc
@@ -40,10 +40,10 @@ struct T;
 [cols=1]
 |===
 | Name
-| <<T-09friend,`f`>> 
+| <<T-08friend,`f`>> 
 |===
 
-[#T-09friend]
+[#T-08friend]
 == f
 
 === Synopsis
@@ -74,10 +74,10 @@ struct U;
 [cols=1]
 |===
 | Name
-| <<U-09friend,`f`>> 
+| <<U-08friend,`f`>> 
 |===
 
-[#U-09friend]
+[#U-08friend]
 == f
 
 === Synopsis
diff --git a/test-files/golden-tests/symbols/friend/friend-5.html b/test-files/golden-tests/symbols/friend/friend-5.html
index a9cafb0739..4307f6710e 100644
--- a/test-files/golden-tests/symbols/friend/friend-5.html
+++ b/test-files/golden-tests/symbols/friend/friend-5.html
@@ -61,7 +61,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T-09friend"><code>f</code></a> </td></tr>
+<td><a href="#T-08friend"><code>f</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -70,7 +70,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="T-09friend">f</h2>
+<h2 id="T-08friend">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -108,7 +108,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#U-09friend"><code>f</code></a> </td></tr>
+<td><a href="#U-08friend"><code>f</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -117,7 +117,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="U-09friend">f</h2>
+<h2 id="U-08friend">f</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/friend/friend-6.adoc b/test-files/golden-tests/symbols/friend/friend-6.adoc
index a2e041f2bd..9ff805d52e 100644
--- a/test-files/golden-tests/symbols/friend/friend-6.adoc
+++ b/test-files/golden-tests/symbols/friend/friend-6.adoc
@@ -40,13 +40,13 @@ struct T;
 |===
 | Name
 | Description
-| <<T-09friend-04cb,`class Z`>> 
+| <<T-08friend-04cb,`class Z`>> 
 | Friend class Z brief
-| <<T-09friend-04ce,`int`>> 
+| <<T-08friend-04ce,`int`>> 
 | Friend int brief
 |===
 
-[#T-09friend-04cb]
+[#T-08friend-04cb]
 == <<Z,Z>>
 
 Friend class Z brief
@@ -60,7 +60,7 @@ Declared in `&lt;friend&hyphen;6&period;cpp&gt;`
 friend <<Z,Z>>;
 ----
 
-[#T-09friend-04ce]
+[#T-08friend-04ce]
 == int
 
 Friend int brief
@@ -94,11 +94,11 @@ struct U;
 |===
 | Name
 | Description
-| <<U-09friend,`T`>> 
+| <<U-08friend,`T`>> 
 | Friend T brief
 |===
 
-[#U-09friend]
+[#U-08friend]
 == <<T,T>>
 
 Friend T brief
@@ -132,11 +132,11 @@ struct V;
 |===
 | Name
 | Description
-| <<V-09friend,`struct U`>> 
+| <<V-08friend,`struct U`>> 
 | Friend struct U brief
 |===
 
-[#V-09friend]
+[#V-08friend]
 == <<U,U>>
 
 Friend struct U brief
diff --git a/test-files/golden-tests/symbols/friend/friend-6.html b/test-files/golden-tests/symbols/friend/friend-6.html
index 6497854cba..05490c357b 100644
--- a/test-files/golden-tests/symbols/friend/friend-6.html
+++ b/test-files/golden-tests/symbols/friend/friend-6.html
@@ -55,8 +55,8 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T-09friend-04cb"><code>class Z</code></a> </td><td><span>Friend class Z brief</span></td></tr><tr>
-<td><a href="#T-09friend-04ce"><code>int</code></a> </td><td><span>Friend int brief</span></td></tr>
+<td><a href="#T-08friend-04cb"><code>class Z</code></a> </td><td><span>Friend class Z brief</span></td></tr><tr>
+<td><a href="#T-08friend-04ce"><code>int</code></a> </td><td><span>Friend int brief</span></td></tr>
 </tbody>
 </table>
 
@@ -65,7 +65,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="T-09friend-04cb"><a href="#Z">Z</a></h2>
+<h2 id="T-08friend-04cb"><a href="#Z">Z</a></h2>
 <div>
 <span>Friend class Z brief</span>
 
@@ -84,7 +84,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-09friend-04ce">int</h2>
+<h2 id="T-08friend-04ce">int</h2>
 <div>
 <span>Friend int brief</span>
 
@@ -129,7 +129,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#U-09friend"><code>T</code></a> </td><td><span>Friend T brief</span></td></tr>
+<td><a href="#U-08friend"><code>T</code></a> </td><td><span>Friend T brief</span></td></tr>
 </tbody>
 </table>
 
@@ -138,7 +138,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="U-09friend"><a href="#T">T</a></h2>
+<h2 id="U-08friend"><a href="#T">T</a></h2>
 <div>
 <span>Friend T brief</span>
 
@@ -183,7 +183,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#V-09friend"><code>struct U</code></a> </td><td><span>Friend struct U brief</span></td></tr>
+<td><a href="#V-08friend"><code>struct U</code></a> </td><td><span>Friend struct U brief</span></td></tr>
 </tbody>
 </table>
 
@@ -192,7 +192,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="V-09friend"><a href="#U">U</a></h2>
+<h2 id="V-08friend"><a href="#U">U</a></h2>
 <div>
 <span>Friend struct U brief</span>
 
diff --git a/test-files/golden-tests/symbols/function/noreturn.adoc b/test-files/golden-tests/symbols/function/noreturn.adoc
index 083ff0b3b9..b2296746b3 100644
--- a/test-files/golden-tests/symbols/function/noreturn.adoc
+++ b/test-files/golden-tests/symbols/function/noreturn.adoc
@@ -53,7 +53,7 @@ struct T;
 [cols=1]
 |===
 | Name
-| <<T-09friend,`f1`>> 
+| <<T-08friend,`f1`>> 
 |===
 
 [#T-f3]
@@ -85,7 +85,7 @@ void
 f2();
 ----
 
-[#T-09friend]
+[#T-08friend]
 == f1
 
 === Synopsis
diff --git a/test-files/golden-tests/symbols/function/noreturn.html b/test-files/golden-tests/symbols/function/noreturn.html
index 3a45f33b87..70d90ead2b 100644
--- a/test-files/golden-tests/symbols/function/noreturn.html
+++ b/test-files/golden-tests/symbols/function/noreturn.html
@@ -85,7 +85,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#T-09friend"><code>f1</code></a> </td></tr>
+<td><a href="#T-08friend"><code>f1</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -129,7 +129,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="T-09friend">f1</h2>
+<h2 id="T-08friend">f1</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc
index 8cffffdc22..2024a36776 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.adoc
@@ -198,10 +198,10 @@ class B;
 [cols=1]
 |===
 | Name
-| <<ostream-B-09friend,`operator&lt;&lt;`>> 
+| <<ostream-B-08friend,`operator&lt;&lt;`>> 
 |===
 
-[#ostream-B-09friend]
+[#ostream-B-08friend]
 == <<ostream,ostream>>::operator&lt;&lt;
 
 === Synopsis
diff --git a/test-files/golden-tests/symbols/overloads/overloads-ostream.html b/test-files/golden-tests/symbols/overloads/overloads-ostream.html
index d4b2992a79..506f1a9aa6 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-ostream.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-ostream.html
@@ -274,7 +274,7 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#ostream-B-09friend"><code>operator&lt;&lt;</code></a> </td></tr>
+<td><a href="#ostream-B-08friend"><code>operator&lt;&lt;</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -283,7 +283,7 @@ <h2>Friends</h2>
 </div>
 <div>
 <div>
-<h2 id="ostream-B-09friend"><a href="#ostream">ostream</a>::operator&lt;&lt;</h2>
+<h2 id="ostream-B-08friend"><a href="#ostream">ostream</a>::operator&lt;&lt;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/overloads/overloads.adoc b/test-files/golden-tests/symbols/overloads/overloads.adoc
index e33da4a1f5..a7d444fa9c 100644
--- a/test-files/golden-tests/symbols/overloads/overloads.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads.adoc
@@ -62,8 +62,8 @@ struct A;
 [cols=1]
 |===
 | Name
-| <<A-09friend-0a,`operator&equals;&equals;`>> 
-| <<A-09friend-0e,`operator&equals;&equals;`>> 
+| <<A-08friend-0a,`operator&equals;&equals;`>> 
+| <<A-08friend-0e,`operator&equals;&equals;`>> 
 |===
 
 [#A-f-00]
@@ -172,7 +172,7 @@ int
 g(int);
 ----
 
-[#A-09friend-0a]
+[#A-08friend-0a]
 == operator&equals;&equals;
 
 === Synopsis
@@ -188,7 +188,7 @@ operator&equals;&equals;(
     <<A,A>> rhs);
 ----
 
-[#A-09friend-0e]
+[#A-08friend-0e]
 == operator&equals;&equals;
 
 === Synopsis
diff --git a/test-files/golden-tests/symbols/overloads/overloads.html b/test-files/golden-tests/symbols/overloads/overloads.html
index 9ac0e7e32a..06aa6cc6d5 100644
--- a/test-files/golden-tests/symbols/overloads/overloads.html
+++ b/test-files/golden-tests/symbols/overloads/overloads.html
@@ -90,8 +90,8 @@ <h2>Friends</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#A-09friend-0a"><code>operator&#x3D;&#x3D;</code></a> </td></tr><tr>
-<td><a href="#A-09friend-0e"><code>operator&#x3D;&#x3D;</code></a> </td></tr>
+<td><a href="#A-08friend-0a"><code>operator&#x3D;&#x3D;</code></a> </td></tr><tr>
+<td><a href="#A-08friend-0e"><code>operator&#x3D;&#x3D;</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -222,7 +222,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-09friend-0a">operator&#x3D;&#x3D;</h2>
+<h2 id="A-08friend-0a">operator&#x3D;&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
@@ -241,7 +241,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="A-09friend-0e">operator&#x3D;&#x3D;</h2>
+<h2 id="A-08friend-0e">operator&#x3D;&#x3D;</h2>
 </div>
 <div>
 <h3>Synopsis</h3>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-3.xml b/test-files/golden-tests/symbols/record/class-template-specializations-3.xml
index 11ad007cf4..b4509e366d 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-3.xml
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-3.xml
@@ -265,66 +265,66 @@
   </template>
   <struct name="E" id="KJWEqOD/QXinlGIqVHqmIlA5Z6E=">
     <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="55" class="def"/>
-    <field name="m0" id="oHfKrPnHC+B6Hx/yJYk5Fyxe+CI=">
+    <variable name="m0" id="oHfKrPnHC+B6Hx/yJYk5Fyxe+CI=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="57"/>
       <type id="gNJJgsCrBHI+de6/WxRWfc6QUSQ=" name="A&lt;float&gt;::B&lt;double&gt;"/>
-    </field>
-    <field name="m1" id="EvoFLEsY/zIQw+ATCcszcUXQX1U=">
+    </variable>
+    <variable name="m1" id="EvoFLEsY/zIQw+ATCcszcUXQX1U=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="58"/>
       <type id="3fOXhba/en8Im2gUSThzllitRc0=" name="A&lt;long&gt;::B&lt;double&gt;"/>
-    </field>
-    <field name="m10" id="M37GfnOSLu7LdwyWNUKiLSwQU8E=">
+    </variable>
+    <variable name="m10" id="M37GfnOSLu7LdwyWNUKiLSwQU8E=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="69"/>
       <type id="rzmzIDLemEwnRqvVCiQsLO9rHE4=" name="A&lt;float&gt;::B&lt;double&gt;::D&lt;bool&gt;"/>
-    </field>
-    <field name="m11" id="zs4yFWypzJvC9fBTuqRIWShHXDI=">
+    </variable>
+    <variable name="m11" id="zs4yFWypzJvC9fBTuqRIWShHXDI=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="70"/>
       <type id="P+rxL5vI4ct+gzn9YkO97Pt7Ras=" name="A&lt;long&gt;::B&lt;double&gt;::D&lt;bool&gt;"/>
-    </field>
-    <field name="m12" id="npnYjIFI4UqRV4lM1m0vGdOXafw=">
+    </variable>
+    <variable name="m12" id="npnYjIFI4UqRV4lM1m0vGdOXafw=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="71"/>
       <type id="NNxnP63PrqW2AkyLFpJx0uaNuTk=" name="A&lt;long&gt;::B&lt;float&gt;::D&lt;bool&gt;"/>
-    </field>
-    <field name="m13" id="m3ZkUTvg5FF0YzKrQCCIMDL4Gjk=">
+    </variable>
+    <variable name="m13" id="m3ZkUTvg5FF0YzKrQCCIMDL4Gjk=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="72"/>
       <type id="E3rBDckOC8QkP+2YLNtbMxg69mc=" name="A&lt;unsigned int&gt;::B&lt;float&gt;::D&lt;bool&gt;"/>
-    </field>
-    <field name="m14" id="lvoZQmyEhLRRqpEiNgzPQH1SOJ0=">
+    </variable>
+    <variable name="m14" id="lvoZQmyEhLRRqpEiNgzPQH1SOJ0=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="73"/>
       <type id="eYdoT3vlHlbkG+t3+ckhZAqrnlY=" name="A&lt;short&gt;::B&lt;void&gt;::D&lt;bool&gt;"/>
-    </field>
-    <field name="m2" id="QerDxfhCX/VklfvPy6KMWR5/grA=">
+    </variable>
+    <variable name="m2" id="QerDxfhCX/VklfvPy6KMWR5/grA=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="59"/>
       <type id="sJKQ/XsqBeYlnpwi1s54+RRv5NA=" name="A&lt;long&gt;::B&lt;float&gt;"/>
-    </field>
-    <field name="m3" id="jkZFwdFnuuwOAnc9RU1Pi4xsuZQ=">
+    </variable>
+    <variable name="m3" id="jkZFwdFnuuwOAnc9RU1Pi4xsuZQ=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="60"/>
       <type id="OqH2nTulqZzSwHPpqaqq/8Aw1rA=" name="A&lt;unsigned int&gt;::B&lt;float&gt;"/>
-    </field>
-    <field name="m4" id="Jz1/8DLujy3S44Nw3O0+j7/ib/E=">
+    </variable>
+    <variable name="m4" id="Jz1/8DLujy3S44Nw3O0+j7/ib/E=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="61"/>
       <type id="AmrHzqMyGcAD714oirSEx/XCTwk=" name="A&lt;short&gt;::B&lt;void&gt;"/>
-    </field>
-    <field name="m5" id="caJb3xi3hSrcOYpFTjaGGYy2Lwo=">
+    </variable>
+    <variable name="m5" id="caJb3xi3hSrcOYpFTjaGGYy2Lwo=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="63"/>
       <type id="B/thZ5I0G7tgrSCTq/QPdxvZ7mk=" name="A&lt;float&gt;::B&lt;double&gt;::C"/>
-    </field>
-    <field name="m6" id="I9XmCN/8GnrjYZlx8qXp383uWq0=">
+    </variable>
+    <variable name="m6" id="I9XmCN/8GnrjYZlx8qXp383uWq0=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="64"/>
       <type id="y0bAB1lqim3CuNevLIQcyhSRoF0=" name="A&lt;long&gt;::B&lt;double&gt;::C"/>
-    </field>
-    <field name="m7" id="1q9S+RfN6FdeN1hVj4px4bBGHps=">
+    </variable>
+    <variable name="m7" id="1q9S+RfN6FdeN1hVj4px4bBGHps=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="65"/>
       <type id="ctaWbbvndczuSnONWd9XeHYCB9w=" name="A&lt;long&gt;::B&lt;float&gt;::C"/>
-    </field>
-    <field name="m8" id="lV8Cih1vnhktZoDmSG/54XfsVMY=">
+    </variable>
+    <variable name="m8" id="lV8Cih1vnhktZoDmSG/54XfsVMY=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="66"/>
       <type id="eXPfVkdfVF382Q5KqAEfOcjpVmo=" name="A&lt;unsigned int&gt;::B&lt;float&gt;::C"/>
-    </field>
-    <field name="m9" id="HXroC5e+xF7qrqN/j/TCTfZsqRM=">
+    </variable>
+    <variable name="m9" id="HXroC5e+xF7qrqN/j/TCTfZsqRM=">
       <file short-path="class-template-specializations-3.cpp" source-path="class-template-specializations-3.cpp" line="67"/>
       <type id="uGKF2n5ovA4i95uQxRmzyMq2uqY=" name="A&lt;short&gt;::B&lt;void&gt;::C"/>
-    </field>
+    </variable>
   </struct>
 </namespace>
 </mrdocs>
diff --git a/test-files/golden-tests/symbols/record/class-template.xml b/test-files/golden-tests/symbols/record/class-template.xml
index 4661d7d58d..9a4ffcaf7e 100644
--- a/test-files/golden-tests/symbols/record/class-template.xml
+++ b/test-files/golden-tests/symbols/record/class-template.xml
@@ -8,23 +8,23 @@
       <file short-path="class-template.cpp" source-path="class-template.cpp" line="3" class="def"/>
       <struct name="N0" id="gx6LdMT9nBMQKB26lZXGWbB7N6c=">
         <file short-path="class-template.cpp" source-path="class-template.cpp" line="10" class="def"/>
-        <field name="z" id="sdv932bFyf1dJzPblqxQGqsy8G4=">
+        <variable name="z" id="sdv932bFyf1dJzPblqxQGqsy8G4=">
           <file short-path="class-template.cpp" source-path="class-template.cpp" line="12"/>
           <type name="int"/>
-        </field>
+        </variable>
       </struct>
-      <field name="w" id="ySFHEWJe6/b1dbtjDC2IAvT2vmU=">
+      <variable name="w" id="ySFHEWJe6/b1dbtjDC2IAvT2vmU=">
         <file short-path="class-template.cpp" source-path="class-template.cpp" line="6"/>
         <type name="int"/>
-      </field>
-      <field name="x" id="81imwKxfuTfd7lfVGnF+fKx46lY=">
+      </variable>
+      <variable name="x" id="81imwKxfuTfd7lfVGnF+fKx46lY=">
         <file short-path="class-template.cpp" source-path="class-template.cpp" line="7"/>
         <type id="pOYGF6pLJlICuiGO0Xj0daDb/to=" name="S"/>
-      </field>
-      <field name="y" id="UKBRhwzQ0PeL6ZwfxmreRBoDQSY=">
+      </variable>
+      <variable name="y" id="UKBRhwzQ0PeL6ZwfxmreRBoDQSY=">
         <file short-path="class-template.cpp" source-path="class-template.cpp" line="8"/>
         <type name="T"/>
-      </field>
+      </variable>
     </struct>
   </template>
   <struct name="C1" id="tm2khHa6qZM0lj1f7IwBdxVxDgE=">
@@ -33,24 +33,24 @@
       <tparam name="T" class="type"/>
       <struct name="N1" id="F1Cyqn/faLYbjTU4RfGsepUiiZw=">
         <file short-path="class-template.cpp" source-path="class-template.cpp" line="20" class="def"/>
-        <field name="x" id="bQCgblScrSKOxQMVJxT7vFw9W4I=">
+        <variable name="x" id="bQCgblScrSKOxQMVJxT7vFw9W4I=">
           <file short-path="class-template.cpp" source-path="class-template.cpp" line="23"/>
           <type id="pOYGF6pLJlICuiGO0Xj0daDb/to=" name="S"/>
-        </field>
-        <field name="y" id="phg6+zMhjV0SJ7vav871OGqoPPQ=">
+        </variable>
+        <variable name="y" id="phg6+zMhjV0SJ7vav871OGqoPPQ=">
           <file short-path="class-template.cpp" source-path="class-template.cpp" line="24"/>
           <type name="T"/>
-        </field>
-        <field name="z" id="53ijFg2EUlLuOP8qvufgjwZDNoI=">
+        </variable>
+        <variable name="z" id="53ijFg2EUlLuOP8qvufgjwZDNoI=">
           <file short-path="class-template.cpp" source-path="class-template.cpp" line="25"/>
           <type name="int"/>
-        </field>
+        </variable>
       </struct>
     </template>
-    <field name="w" id="Q0itZUB0O9hts+pFPk9DO415Lo8=">
+    <variable name="w" id="Q0itZUB0O9hts+pFPk9DO415Lo8=">
       <file short-path="class-template.cpp" source-path="class-template.cpp" line="18"/>
       <type name="int"/>
-    </field>
+    </variable>
   </struct>
   <template>
     <tparam name="T" class="type"/>
@@ -60,28 +60,28 @@
         <tparam name="U" class="type"/>
         <struct name="N2" id="xljI5oOqNOhyyR4QzmKvFB3nEfw=">
           <file short-path="class-template.cpp" source-path="class-template.cpp" line="34" class="def"/>
-          <field name="w" id="bLX5mthqXMHAtLNEc87RKLQSUyU=">
+          <variable name="w" id="bLX5mthqXMHAtLNEc87RKLQSUyU=">
             <file short-path="class-template.cpp" source-path="class-template.cpp" line="37"/>
             <type id="pOYGF6pLJlICuiGO0Xj0daDb/to=" name="S"/>
-          </field>
-          <field name="x" id="qSNOAAxaet7aBxvD7WvFqJOpm3A=">
+          </variable>
+          <variable name="x" id="qSNOAAxaet7aBxvD7WvFqJOpm3A=">
             <file short-path="class-template.cpp" source-path="class-template.cpp" line="38"/>
             <type name="T"/>
-          </field>
-          <field name="y" id="P9x8qHxDv7huDL0MyNORJ/enU0Q=">
+          </variable>
+          <variable name="y" id="P9x8qHxDv7huDL0MyNORJ/enU0Q=">
             <file short-path="class-template.cpp" source-path="class-template.cpp" line="39"/>
             <type name="U"/>
-          </field>
-          <field name="z" id="pRO2j7I5aEQI+ktDwT1fLJPqy28=">
+          </variable>
+          <variable name="z" id="pRO2j7I5aEQI+ktDwT1fLJPqy28=">
             <file short-path="class-template.cpp" source-path="class-template.cpp" line="40"/>
             <type name="int"/>
-          </field>
+          </variable>
         </struct>
       </template>
-      <field name="v" id="rvAO5HvzEvS8z9PgbRoqkyTi+1c=">
+      <variable name="v" id="rvAO5HvzEvS8z9PgbRoqkyTi+1c=">
         <file short-path="class-template.cpp" source-path="class-template.cpp" line="32"/>
         <type name="int"/>
-      </field>
+      </variable>
     </struct>
   </template>
   <template>
@@ -89,10 +89,10 @@
     <struct name="C3" id="x60FzYL65XgZZRrxrZuC5jemrwQ=">
       <file short-path="class-template.cpp" source-path="class-template.cpp" line="47" class="def"/>
       <file short-path="class-template.cpp" source-path="class-template.cpp" line="44"/>
-      <field name="v" id="28J+g16kE2M7qwnrP4yzW4hHlIg=">
+      <variable name="v" id="28J+g16kE2M7qwnrP4yzW4hHlIg=">
         <file short-path="class-template.cpp" source-path="class-template.cpp" line="50"/>
         <type name="int"/>
-      </field>
+      </variable>
     </struct>
   </template>
   <struct name="S" id="pOYGF6pLJlICuiGO0Xj0daDb/to=">
diff --git a/test-files/golden-tests/symbols/record/record-data.xml b/test-files/golden-tests/symbols/record/record-data.xml
index 4c9c5d512d..41c9f6d76c 100644
--- a/test-files/golden-tests/symbols/record/record-data.xml
+++ b/test-files/golden-tests/symbols/record/record-data.xml
@@ -4,58 +4,58 @@
 <namespace id="//////////////////////////8=">
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
     <file short-path="record-data.cpp" source-path="record-data.cpp" line="3" class="def"/>
-    <field name="i" id="91xV6rCFObgi6i1/U2uZ/GnD3WM=">
+    <variable name="i" id="91xV6rCFObgi6i1/U2uZ/GnD3WM=">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="5"/>
       <type name="int"/>
-    </field>
-    <field name="j" id="g7xcHrg43mq7PlaOEmNvMHlU+Hk=">
+    </variable>
+    <variable name="j" id="g7xcHrg43mq7PlaOEmNvMHlU+Hk=">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="6"/>
       <type name="double"/>
-    </field>
-    <field name="k" id="DDn/yzxAAKSmBASeK+/IuU+FvzM=">
+    </variable>
+    <variable name="k" id="DDn/yzxAAKSmBASeK+/IuU+FvzM=">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="7"/>
       <attr id="is-mutable"/>
       <type name="int"/>
-    </field>
-    <bitfield name="l" id="wmuk99bazNMSdS8W8oD/7vIsIhQ=" width="8">
+    </variable>
+    <variable name="l" id="wmuk99bazNMSdS8W8oD/7vIsIhQ=" width="8">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="8"/>
       <type name="int"/>
-    </bitfield>
-    <bitfield name="m" id="8Olj7aMWgTqR7bHtl+C3EZ5wILI=" width="8">
+    </variable>
+    <variable name="m" id="8Olj7aMWgTqR7bHtl+C3EZ5wILI=" width="8">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="9"/>
       <type name="int"/>
-    </bitfield>
+    </variable>
   </struct>
   <struct name="U" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
     <file short-path="record-data.cpp" source-path="record-data.cpp" line="14" class="def"/>
-    <field name="t" id="LvEIBVXJYQQL4yraOaQv7ijMDng=">
+    <variable name="t" id="LvEIBVXJYQQL4yraOaQv7ijMDng=">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="16"/>
       <type id="CgGNdHpW5mG/i5741WPYQDw28OQ=" name="T"/>
-    </field>
+    </variable>
   </struct>
   <class name="V" id="9kzYwt0WPztMEDUaFxul1Jvqqs8=">
     <file short-path="record-data.cpp" source-path="record-data.cpp" line="19" class="def"/>
-    <field name="j" access="protected" id="VKvx+Pci4bUmtjCsXJqKb7SNYqw=">
+    <variable name="j" access="protected" id="VKvx+Pci4bUmtjCsXJqKb7SNYqw=">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="23"/>
       <type name="unsigned long"/>
-    </field>
-    <field name="i" access="private" id="EWXCzRl9erjnMQFZ8VmHC5cVkLM=">
+    </variable>
+    <variable name="i" access="private" id="EWXCzRl9erjnMQFZ8VmHC5cVkLM=">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="21"/>
       <type name="int"/>
-    </field>
-    <field name="k" access="private" id="iKr1oLycejUWY6AnSgoQnbmaCEE=">
+    </variable>
+    <variable name="k" access="private" id="iKr1oLycejUWY6AnSgoQnbmaCEE=">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="25"/>
       <type name="double"/>
-    </field>
+    </variable>
   </class>
   <struct name="W" id="6OhcFM3BV6KlrvmfpsljaMHxpdA=">
     <file short-path="record-data.cpp" source-path="record-data.cpp" line="28" class="def"/>
-    <field name="buf" id="2akJUSKKPN7IylZjqGMRlhXupds=">
+    <variable name="buf" id="2akJUSKKPN7IylZjqGMRlhXupds=">
       <file short-path="record-data.cpp" source-path="record-data.cpp" line="30"/>
       <type class="array" bounds="64">
         <element-type name="char"/>
       </type>
-    </field>
+    </variable>
   </struct>
   <template>
     <tparam name="P" class="type"/>
@@ -66,28 +66,28 @@
         <file short-path="record-data.cpp" source-path="record-data.cpp" line="36"/>
         <type name="P"/>
       </namespace-alias>
-      <field name="x0" id="WMA7IrW+2LvVbOV8OxRgz1lZtgs=" default="0">
+      <variable name="x0" id="WMA7IrW+2LvVbOV8OxRgz1lZtgs=" default="0">
         <file short-path="record-data.cpp" source-path="record-data.cpp" line="38"/>
         <type name="int"/>
-      </field>
-      <field name="x1" id="9mHoUUHldwcRXKA3lf94KNCXALA=">
+      </variable>
+      <variable name="x1" id="9mHoUUHldwcRXKA3lf94KNCXALA=">
         <file short-path="record-data.cpp" source-path="record-data.cpp" line="39"/>
         <type name="P"/>
-      </field>
-      <field name="x2" id="BBtkYfP6w9XgHxk01Va2e1WZHo0=">
+      </variable>
+      <variable name="x2" id="BBtkYfP6w9XgHxk01Va2e1WZHo0=">
         <file short-path="record-data.cpp" source-path="record-data.cpp" line="40"/>
         <type class="array" bounds="32">
           <element-type name="P" cv-qualifiers="const"/>
         </type>
-      </field>
-      <field name="x3" id="nnQtR7SV1kLSZgMv0quXSh0M8/A=">
+      </variable>
+      <variable name="x3" id="nnQtR7SV1kLSZgMv0quXSh0M8/A=">
         <file short-path="record-data.cpp" source-path="record-data.cpp" line="41"/>
         <type id="nkW23Ykh9wywIjUzLqEQlHf8R5k=" name="Q"/>
-      </field>
-      <bitfield name="x4" id="iixsM8X5M740uqb1jSRUfUuvNo0=" width="I + 4">
+      </variable>
+      <variable name="x4" id="iixsM8X5M740uqb1jSRUfUuvNo0=" width="I + 4">
         <file short-path="record-data.cpp" source-path="record-data.cpp" line="43"/>
         <type name="int"/>
-      </bitfield>
+      </variable>
     </struct>
   </template>
 </namespace>
diff --git a/test-files/golden-tests/symbols/record/union.xml b/test-files/golden-tests/symbols/record/union.xml
index b631e8fe76..dd2386cc58 100644
--- a/test-files/golden-tests/symbols/record/union.xml
+++ b/test-files/golden-tests/symbols/record/union.xml
@@ -4,33 +4,29 @@
 <namespace id="//////////////////////////8=">
   <union name="A" id="rOga+mYntM7ytFb7bhJSklZ0r34=">
     <file short-path="union.cpp" source-path="union.cpp" line="1" class="def"/>
-    <field name="x" id="Be23kXXQRAQHfKNTp2HOM2jouJo=">
+    <variable name="x" id="Be23kXXQRAQHfKNTp2HOM2jouJo=">
       <file short-path="union.cpp" source-path="union.cpp" line="3"/>
-      <attr id="is-variant"/>
       <type name="int"/>
-    </field>
-    <field name="y" id="HqUCV+CnE+akUirdwlf8maZxw40=">
+    </variable>
+    <variable name="y" id="HqUCV+CnE+akUirdwlf8maZxw40=">
       <file short-path="union.cpp" source-path="union.cpp" line="4"/>
-      <attr id="is-variant"/>
       <type name="bool"/>
-    </field>
+    </variable>
   </union>
   <struct name="B" id="3JsK1DO0O+wZhv+0meptQrbs3fY=">
     <file short-path="union.cpp" source-path="union.cpp" line="7" class="def"/>
-    <field name="x" id="QtOrWpj/+5ytPBCEoNlbW+uW/oA=">
+    <variable name="x" id="QtOrWpj/+5ytPBCEoNlbW+uW/oA=">
       <file short-path="union.cpp" source-path="union.cpp" line="11"/>
-      <attr id="is-variant"/>
       <type name="int"/>
-    </field>
-    <field name="y" id="8o+2/UVx4hIiDLQRYohp688sXmI=">
+    </variable>
+    <variable name="y" id="8o+2/UVx4hIiDLQRYohp688sXmI=">
       <file short-path="union.cpp" source-path="union.cpp" line="12"/>
-      <attr id="is-variant"/>
       <type name="bool"/>
-    </field>
-    <field name="z" id="zTVqdWL2ShJziu85kaeOk2wfYFs=">
+    </variable>
+    <variable name="z" id="zTVqdWL2ShJziu85kaeOk2wfYFs=">
       <file short-path="union.cpp" source-path="union.cpp" line="15"/>
       <type name="int"/>
-    </field>
+    </variable>
   </struct>
 </namespace>
 </mrdocs>
diff --git a/test-files/golden-tests/symbols/variable/no_unique_address.xml b/test-files/golden-tests/symbols/variable/no_unique_address.xml
index 5172e712ca..8727692f39 100644
--- a/test-files/golden-tests/symbols/variable/no_unique_address.xml
+++ b/test-files/golden-tests/symbols/variable/no_unique_address.xml
@@ -7,16 +7,14 @@
   </struct>
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
     <file short-path="no_unique_address.cpp" source-path="no_unique_address.cpp" line="5" class="def"/>
-    <field name="e" id="h2j8f921HD+Fyaokcs4ndGM/yNk=" default="Empty{}">
+    <variable name="e" id="h2j8f921HD+Fyaokcs4ndGM/yNk=" default="Empty{}">
       <file short-path="no_unique_address.cpp" source-path="no_unique_address.cpp" line="8"/>
-      <attr id="maybe-unused"/>
-      <attr id="deprecated"/>
       <type id="iczIHP1J59EwYw3xxL3w2C3Q43Q=" name="Empty"/>
-    </field>
-    <field name="i" id="91xV6rCFObgi6i1/U2uZ/GnD3WM=">
+    </variable>
+    <variable name="i" id="91xV6rCFObgi6i1/U2uZ/GnD3WM=">
       <file short-path="no_unique_address.cpp" source-path="no_unique_address.cpp" line="7"/>
       <type name="int"/>
-    </field>
+    </variable>
   </struct>
 </namespace>
 </mrdocs>
diff --git a/test-files/golden-tests/symbols/variable/ns-variables.xml b/test-files/golden-tests/symbols/variable/ns-variables.xml
index 34f2850166..d2fd2eeb44 100644
--- a/test-files/golden-tests/symbols/variable/ns-variables.xml
+++ b/test-files/golden-tests/symbols/variable/ns-variables.xml
@@ -5,31 +5,31 @@
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="14" class="def"/>
   </struct>
-  <variable name="i" id="X2Wd7fyQ8BJNJ0tn4nnA77ckJM8=">
+  <variable name="i" id="X2Wd7fyQ8BJNJ0tn4nnA77ckJM8=" default="0">
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="3" class="def"/>
     <attr id="is-constexpr"/>
     <type name="int"/>
   </variable>
-  <variable name="j" id="pKvK/kHXdM/1/pu86JcSrLqVypE=">
+  <variable name="j" id="pKvK/kHXdM/1/pu86JcSrLqVypE=" default="0">
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="4" class="def"/>
     <attr id="is-constinit"/>
     <type name="int"/>
   </variable>
-  <variable name="k" id="Fr1KYTKmyLHGW9rPSpCZK82iRqQ=">
+  <variable name="k" id="Fr1KYTKmyLHGW9rPSpCZK82iRqQ=" default="1">
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="9" class="def"/>
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="6"/>
     <attr id="storage-class" name="extern" value="1"/>
     <attr id="is-constexpr"/>
     <type name="int"/>
   </variable>
-  <variable name="l" id="h5r4fNloVAMKqMyVJI+iWTxRjhM=">
+  <variable name="l" id="h5r4fNloVAMKqMyVJI+iWTxRjhM=" default="1">
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="10" class="def"/>
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="7"/>
     <attr id="storage-class" name="extern" value="1"/>
     <attr id="is-constinit"/>
     <type name="int"/>
   </variable>
-  <variable name="pi" id="EgqLVTs3FIJjFIODa5OOP2hmEI0=">
+  <variable name="pi" id="EgqLVTs3FIJjFIODa5OOP2hmEI0=" default="3.14">
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="12" class="def"/>
     <type name="double"/>
   </variable>
@@ -38,18 +38,18 @@
     <attr id="storage-class" name="extern" value="1"/>
     <type id="CgGNdHpW5mG/i5741WPYQDw28OQ=" name="T"/>
   </variable>
-  <variable name="x0" id="LESPWJfwRpePfANf2Vm0O/W1Lfw=">
+  <variable name="x0" id="LESPWJfwRpePfANf2Vm0O/W1Lfw=" default="0">
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="18" class="def"/>
     <attr id="is-thread-local"/>
     <type name="int"/>
   </variable>
-  <variable name="x1" id="bMKl4XYJf8MQ48jSHwRmFHM3MiA=">
+  <variable name="x1" id="bMKl4XYJf8MQ48jSHwRmFHM3MiA=" default="0">
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="19" class="def"/>
     <attr id="storage-class" name="static" value="2"/>
     <attr id="is-thread-local"/>
     <type name="int"/>
   </variable>
-  <variable name="x2" id="EpcDWput1W/SJ3IYEINS0W815Zw=">
+  <variable name="x2" id="EpcDWput1W/SJ3IYEINS0W815Zw=" default="0">
     <file short-path="ns-variables.cpp" source-path="ns-variables.cpp" line="20" class="def"/>
     <attr id="storage-class" name="static" value="2"/>
     <attr id="is-constexpr"/>
diff --git a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.xml b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.xml
index 63346ee043..3aa0744348 100644
--- a/test-files/golden-tests/symbols/variable/static-data-def-constexpr.xml
+++ b/test-files/golden-tests/symbols/variable/static-data-def-constexpr.xml
@@ -4,7 +4,7 @@
 <namespace id="//////////////////////////8=">
   <struct name="S" id="pOYGF6pLJlICuiGO0Xj0daDb/to=">
     <file short-path="static-data-def-constexpr.cpp" source-path="static-data-def-constexpr.cpp" line="1" class="def"/>
-    <variable name="s" id="Sugb8cWjf0PRq2dN0pOEbkKY9C4=">
+    <variable name="s" id="Sugb8cWjf0PRq2dN0pOEbkKY9C4=" default="S{}">
       <file short-path="static-data-def-constexpr.cpp" source-path="static-data-def-constexpr.cpp" line="5" class="def"/>
       <file short-path="static-data-def-constexpr.cpp" source-path="static-data-def-constexpr.cpp" line="3"/>
       <attr id="storage-class" name="static" value="2"/>
@@ -15,7 +15,7 @@
   </struct>
   <struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
     <file short-path="static-data-def-constexpr.cpp" source-path="static-data-def-constexpr.cpp" line="7" class="def"/>
-    <variable name="t" id="+nDx93NmBRbrBZ8RlBwzPk8rp8I=">
+    <variable name="t" id="+nDx93NmBRbrBZ8RlBwzPk8rp8I=" default="0">
       <file short-path="static-data-def-constexpr.cpp" source-path="static-data-def-constexpr.cpp" line="12" class="def"/>
       <file short-path="static-data-def-constexpr.cpp" source-path="static-data-def-constexpr.cpp" line="9"/>
       <attr id="storage-class" name="static" value="2"/>
diff --git a/test-files/golden-tests/symbols/variable/static-data-def.xml b/test-files/golden-tests/symbols/variable/static-data-def.xml
index a048dfdb87..e299f51577 100644
--- a/test-files/golden-tests/symbols/variable/static-data-def.xml
+++ b/test-files/golden-tests/symbols/variable/static-data-def.xml
@@ -6,20 +6,20 @@
     <tparam name="T" class="type"/>
     <struct name="A" id="5tUSuMtQqtYE49jBjSYSWp0DJAM=">
       <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="1" class="def"/>
-      <variable name="v0" id="rW6h+mCfZLROHlYzwXFIUPN6oSE=">
+      <variable name="v0" id="rW6h+mCfZLROHlYzwXFIUPN6oSE=" default="0">
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="21" class="def"/>
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="4"/>
         <attr id="storage-class" name="static" value="2"/>
         <type name="int"/>
       </variable>
-      <variable name="v1" id="nkB0lMmDvMsu9GDrKr3Mzwi5g6I=">
+      <variable name="v1" id="nkB0lMmDvMsu9GDrKr3Mzwi5g6I=" default="1">
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="24" class="def"/>
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="5"/>
         <attr id="storage-class" name="static" value="2"/>
         <attr id="is-inline"/>
         <type name="int"/>
       </variable>
-      <variable name="v2" id="e48c97dC3AIWJHWE5T0yWVxezgg=">
+      <variable name="v2" id="e48c97dC3AIWJHWE5T0yWVxezgg=" default="2">
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="27" class="def"/>
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="6"/>
         <attr id="storage-class" name="static" value="2"/>
@@ -27,32 +27,32 @@
         <attr id="is-constexpr"/>
         <type name="int"/>
       </variable>
-      <variable name="v3" id="Wx5S5oWv5o4nV7I+zFEKTvWl40g=">
+      <variable name="v3" id="Wx5S5oWv5o4nV7I+zFEKTvWl40g=" default="3">
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="30" class="def"/>
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="7"/>
         <attr id="storage-class" name="static" value="2"/>
         <attr id="is-inline"/>
         <type name="int" cv-qualifiers="const"/>
       </variable>
-      <variable name="v4" id="6a2wBN4mHiuAAqV0gYgYQeqFNVM=">
+      <variable name="v4" id="6a2wBN4mHiuAAqV0gYgYQeqFNVM=" default="4">
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="33" class="def"/>
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="8"/>
         <attr id="storage-class" name="static" value="2"/>
         <type name="int" cv-qualifiers="const"/>
       </variable>
-      <variable name="v5" id="Q96okKllwtE2Tg+t7HAkms6flbk=">
+      <variable name="v5" id="Q96okKllwtE2Tg+t7HAkms6flbk=" default="5">
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="10" class="def"/>
         <attr id="storage-class" name="static" value="2"/>
         <attr id="is-inline"/>
         <type name="int"/>
       </variable>
-      <variable name="v6" id="0Xh4ypD2+Eipbqc5Z8n4fEkXZ8c=">
+      <variable name="v6" id="0Xh4ypD2+Eipbqc5Z8n4fEkXZ8c=" default="6">
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="11" class="def"/>
         <attr id="storage-class" name="static" value="2"/>
         <attr id="is-inline"/>
         <type name="int" cv-qualifiers="const"/>
       </variable>
-      <variable name="v7" id="VCnmz8Cp9RtJzQQQ7yw57uzbQAY=">
+      <variable name="v7" id="VCnmz8Cp9RtJzQQQ7yw57uzbQAY=" default="7">
         <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="12" class="def"/>
         <attr id="storage-class" name="static" value="2"/>
         <attr id="is-inline"/>
@@ -63,14 +63,14 @@
   </template>
   <struct name="B" id="3JsK1DO0O+wZhv+0meptQrbs3fY=">
     <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="15" class="def"/>
-    <variable name="x0" id="+yhNlGuTVY4spCfBXSTBkEDzi30=">
+    <variable name="x0" id="+yhNlGuTVY4spCfBXSTBkEDzi30=" default="0">
       <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="49" class="def"/>
       <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="17"/>
       <attr id="storage-class" name="static" value="2"/>
       <attr id="is-thread-local"/>
       <type name="int" cv-qualifiers="const"/>
     </variable>
-    <variable name="x1" id="vNYWHh2ovZiBP3uVEeJhMkaiF3w=">
+    <variable name="x1" id="vNYWHh2ovZiBP3uVEeJhMkaiF3w=" default="0">
       <file short-path="static-data-def.cpp" source-path="static-data-def.cpp" line="18" class="def"/>
       <attr id="storage-class" name="static" value="2"/>
       <attr id="is-inline"/>
diff --git a/test-files/golden-tests/symbols/variable/static-data-template.xml b/test-files/golden-tests/symbols/variable/static-data-template.xml
index af1ca53b3c..34ba63a557 100644
--- a/test-files/golden-tests/symbols/variable/static-data-template.xml
+++ b/test-files/golden-tests/symbols/variable/static-data-template.xml
@@ -9,7 +9,7 @@
       <template>
         <tparam name="U" class="type"/>
         <tparam name="V" class="type"/>
-        <variable name="x" id="XzfcXqh7M7tQVHWKvlB891KIC/0=">
+        <variable name="x" id="XzfcXqh7M7tQVHWKvlB891KIC/0=" default="0">
           <file short-path="static-data-template.cpp" source-path="static-data-template.cpp" line="4" class="def"/>
           <attr id="storage-class" name="static" value="2"/>
           <attr id="is-inline"/>
@@ -20,7 +20,7 @@
       <template class="explicit">
         <targ class="type" type="T"/>
         <targ class="type" type="long"/>
-        <variable name="x" id="eKdgKT44WwfN7UkQXGEqVJssIPM=">
+        <variable name="x" id="eKdgKT44WwfN7UkQXGEqVJssIPM=" default="2">
           <file short-path="static-data-template.cpp" source-path="static-data-template.cpp" line="10" class="def"/>
           <attr id="storage-class" name="static" value="2"/>
           <attr id="is-inline"/>
@@ -32,7 +32,7 @@
         <tparam name="U" class="type"/>
         <targ class="type" type="U*"/>
         <targ class="type" type="T"/>
-        <variable name="x" id="odTOUblgmooUozrBqW3qKzPWSO4=">
+        <variable name="x" id="odTOUblgmooUozrBqW3qKzPWSO4=" default="1">
           <file short-path="static-data-template.cpp" source-path="static-data-template.cpp" line="7" class="def"/>
           <attr id="storage-class" name="static" value="2"/>
           <attr id="is-inline"/>
diff --git a/test-files/golden-tests/symbols/variable/var-inline-constexpr.xml b/test-files/golden-tests/symbols/variable/var-inline-constexpr.xml
index 4ce555c94b..a347049727 100644
--- a/test-files/golden-tests/symbols/variable/var-inline-constexpr.xml
+++ b/test-files/golden-tests/symbols/variable/var-inline-constexpr.xml
@@ -2,11 +2,11 @@
 <mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
 <namespace id="//////////////////////////8=">
-  <variable name="var" id="9s8AEcaO/PYLDINeClULQZuqcls=">
+  <variable name="var" id="9s8AEcaO/PYLDINeClULQZuqcls=" default="5">
     <file short-path="var-inline-constexpr.cpp" source-path="var-inline-constexpr.cpp" line="9" class="def"/>
     <type name="int"/>
   </variable>
-  <variable name="var_const" id="zUgw7RZYhWQ0Wdr483M4dEkcXFU=">
+  <variable name="var_const" id="zUgw7RZYhWQ0Wdr483M4dEkcXFU=" default="4">
     <file short-path="var-inline-constexpr.cpp" source-path="var-inline-constexpr.cpp" line="7" class="def"/>
     <type name="int" cv-qualifiers="const"/>
   </variable>
@@ -17,7 +17,7 @@
       <type name="T" cv-qualifiers="const"/>
     </variable>
   </template>
-  <variable name="var_constexpr" id="fWXHXBdM9s2COMhYT0j3aWad+0I=">
+  <variable name="var_constexpr" id="fWXHXBdM9s2COMhYT0j3aWad+0I=" default="2">
     <file short-path="var-inline-constexpr.cpp" source-path="var-inline-constexpr.cpp" line="3" class="def"/>
     <attr id="is-constexpr"/>
     <type name="int"/>
@@ -30,7 +30,7 @@
       <type name="T"/>
     </variable>
   </template>
-  <variable name="var_inline_const" id="pn99V2QzcOsMfIXOuUkZkX5qPxM=">
+  <variable name="var_inline_const" id="pn99V2QzcOsMfIXOuUkZkX5qPxM=" default="3">
     <file short-path="var-inline-constexpr.cpp" source-path="var-inline-constexpr.cpp" line="5" class="def"/>
     <attr id="is-inline"/>
     <type name="int" cv-qualifiers="const"/>
@@ -43,7 +43,7 @@
       <type name="T" cv-qualifiers="const"/>
     </variable>
   </template>
-  <variable name="var_inline_constexpr" id="/HfsnrPPmN325zi27Blg78dY0HE=">
+  <variable name="var_inline_constexpr" id="/HfsnrPPmN325zi27Blg78dY0HE=" default="1">
     <file short-path="var-inline-constexpr.cpp" source-path="var-inline-constexpr.cpp" line="1" class="def"/>
     <attr id="is-inline"/>
     <attr id="is-constexpr"/>
diff --git a/test-files/golden-tests/symbols/variable/var-template.xml b/test-files/golden-tests/symbols/variable/var-template.xml
index e22ee19ebf..7f35448dad 100644
--- a/test-files/golden-tests/symbols/variable/var-template.xml
+++ b/test-files/golden-tests/symbols/variable/var-template.xml
@@ -6,7 +6,7 @@
     <file short-path="var-template.cpp" source-path="var-template.cpp" line="10" class="def"/>
     <template>
       <tparam name="T" class="type"/>
-      <variable name="C" id="kMNXdSEDYBD+T4RYbkq3ekR+jUU=">
+      <variable name="C" id="kMNXdSEDYBD+T4RYbkq3ekR+jUU=" default="0">
         <file short-path="var-template.cpp" source-path="var-template.cpp" line="12" class="def"/>
         <attr id="storage-class" name="static" value="2"/>
         <attr id="is-inline"/>
@@ -15,7 +15,7 @@
     </template>
     <template class="explicit">
       <targ class="type" type="int"/>
-      <variable name="C" id="Wtlw7VEK38lEEBeqNoDOjTkJE+U=">
+      <variable name="C" id="Wtlw7VEK38lEEBeqNoDOjTkJE+U=" default="-1">
         <file short-path="var-template.cpp" source-path="var-template.cpp" line="15" class="def"/>
         <attr id="storage-class" name="static" value="2"/>
         <attr id="is-inline"/>
@@ -25,7 +25,7 @@
     <template class="partial">
       <tparam name="T" class="type"/>
       <targ class="type" type="T*"/>
-      <variable name="C" id="wvoZkG3eTMaiFAf971AFdvmHCDE=">
+      <variable name="C" id="wvoZkG3eTMaiFAf971AFdvmHCDE=" default="sizeof(T)">
         <file short-path="var-template.cpp" source-path="var-template.cpp" line="18" class="def"/>
         <attr id="storage-class" name="static" value="2"/>
         <attr id="is-inline"/>
@@ -35,14 +35,14 @@
   </struct>
   <template>
     <tparam name="T" class="type"/>
-    <variable name="A" id="z3eMoJQlHlg0acXVyn1pwg9Ktys=">
+    <variable name="A" id="z3eMoJQlHlg0acXVyn1pwg9Ktys=" default="sizeof(T)">
       <file short-path="var-template.cpp" source-path="var-template.cpp" line="1" class="def"/>
       <type name="unsigned int"/>
     </variable>
   </template>
   <template class="explicit">
     <targ class="type" type="void"/>
-    <variable name="A" id="jrW9aLj8cqTteNoZmH97vOW7csQ=">
+    <variable name="A" id="jrW9aLj8cqTteNoZmH97vOW7csQ=" default="0">
       <file short-path="var-template.cpp" source-path="var-template.cpp" line="4" class="def"/>
       <type name="unsigned int"/>
     </variable>
@@ -50,7 +50,7 @@
   <template class="partial">
     <tparam name="T" class="type"/>
     <targ class="type" type="T&amp;"/>
-    <variable name="A" id="FsEwA9OFNGH4A/cxXIoOOa+ZQg8=">
+    <variable name="A" id="FsEwA9OFNGH4A/cxXIoOOa+ZQg8=" default="sizeof(T)">
       <file short-path="var-template.cpp" source-path="var-template.cpp" line="7" class="def"/>
       <type name="unsigned int"/>
     </variable>