diff --git a/cpp/docs/common/typedefs.adoc b/cpp/docs/common/typedefs.adoc
index 08ecefef86..9548a0d85e 100644
--- a/cpp/docs/common/typedefs.adoc
+++ b/cpp/docs/common/typedefs.adoc
@@ -1,42 +1,42 @@
 [#_ConceptMapIterator]
 === ConceptMapIterator
 
-Alias for Iterator< _native::ConceptMapIterator, _native::ConceptMap, TypeDB::ConceptMap >
+Alias for Iterator<_native::ConceptMapIterator, _native::ConceptMap, TypeDB::ConceptMap>
 
 [#_ConceptMapIterable]
 === ConceptMapIterable
 
-Alias for Iterable< _native::ConceptMapIterator, _native::ConceptMap, TypeDB::ConceptMap >
+Alias for Iterable<_native::ConceptMapIterator, _native::ConceptMap, TypeDB::ConceptMap>
 
 [#_ConceptMapGroupIterable]
 === ConceptMapGroupIterable
 
-Alias for Iterable< _native::ConceptMapGroupIterator, _native::ConceptMapGroup, TypeDB::ConceptMapGroup >
+Alias for Iterable<_native::ConceptMapGroupIterator, _native::ConceptMapGroup, TypeDB::ConceptMapGroup>
 
 [#_ConceptMapGroupIterator]
 === ConceptMapGroupIterator
 
-Alias for Iterator< _native::ConceptMapGroupIterator, _native::ConceptMapGroup, TypeDB::ConceptMapGroup >
+Alias for Iterator<_native::ConceptMapGroupIterator, _native::ConceptMapGroup, TypeDB::ConceptMapGroup>
 
 [#_OwnerAttributePairIterator]
 === OwnerAttributePairIterator
 
-Alias for Iterator< _native::StringPairIterator, _native::StringPair, OwnerAttributePair >
+Alias for Iterator<_native::StringPairIterator, _native::StringPair, OwnerAttributePair>
 
 [#_OwnerAttributePairIterable]
 === OwnerAttributePairIterable
 
-Alias for Iterable< _native::StringPairIterator, _native::StringPair, OwnerAttributePair >
+Alias for Iterable<_native::StringPairIterator, _native::StringPair, OwnerAttributePair>
 
 [#_JSONMap]
 === JSONMap
 
-Alias for std::map< std::string, JSON >
+Alias for std::map<std::string, JSON>
 
 [#_JSONArray]
 === JSONArray
 
-Alias for std::vector< JSON >
+Alias for std::vector<JSON>
 
 [#_JSONBoolean]
 === JSONBoolean
@@ -61,52 +61,52 @@ Alias for std::string
 [#_AggregateResult]
 === AggregateResult
 
-Alias for std::optional< std::unique_ptr< Value > >
+Alias for std::optional<std::unique_ptr<Value>>
 
 [#_AggregateFuture]
 === AggregateFuture
 
-Alias for Future< AggregateResult, _native::ConceptPromise >
+Alias for Future<AggregateResult, _native::ConceptPromise>
 
 [#_ValueGroupIterable]
 === ValueGroupIterable
 
-Alias for Iterable< _native::ValueGroupIterator, _native::ValueGroup, TypeDB::ValueGroup >
+Alias for Iterable<_native::ValueGroupIterator, _native::ValueGroup, TypeDB::ValueGroup>
 
 [#_ValueGroupIterator]
 === ValueGroupIterator
 
-Alias for Iterator< _native::ValueGroupIterator, _native::ValueGroup, TypeDB::ValueGroup >
+Alias for Iterator<_native::ValueGroupIterator, _native::ValueGroup, TypeDB::ValueGroup>
 
 [#_VoidFuture]
 === VoidFuture
 
-Alias for Future< void, _native::VoidPromise >
+Alias for Future<void, _native::VoidPromise>
 
 [#_BoolFuture]
 === BoolFuture
 
-Alias for Future< bool, _native::BoolPromise >
+Alias for Future<bool, _native::BoolPromise>
 
 [#_StringFuture]
 === StringFuture
 
-Alias for Future< std::string, _native::StringPromise >
+Alias for Future<std::string, _native::StringPromise>
 
 [#_OptionalStringFuture]
 === OptionalStringFuture
 
-Alias for Future< std::optional< std::string >, _native::StringPromise >
+Alias for Future<std::optional<std::string>, _native::StringPromise>
 
 [#_StringIterable]
 === StringIterable
 
-Alias for Iterable< _native::StringIterator, char, std::string >
+Alias for Iterable<_native::StringIterator, char, std::string>
 
 [#_StringIterator]
 === StringIterator
 
-Alias for Iterator< _native::StringIterator, char, std::string >
+Alias for Iterator<_native::StringIterator, char, std::string>
 
 [#_DateTime]
 === DateTime
@@ -116,65 +116,65 @@ Alias for std::chrono::time_point< std::chrono::system_clock, std::chrono::milli
 [#_DatabaseIterator]
 === DatabaseIterator
 
-Alias for Iterator< _native::DatabaseIterator, _native::Database, TypeDB::Database >
+Alias for Iterator<_native::DatabaseIterator, _native::Database, TypeDB::Database>
 
 [#_DatabaseIterable]
 === DatabaseIterable
 
-Alias for Iterable< _native::DatabaseIterator, _native::Database, TypeDB::Database >
+Alias for Iterable<_native::DatabaseIterator, _native::Database, TypeDB::Database>
 
 [#_ReplicaInfoIterable]
 === ReplicaInfoIterable
 
-Alias for Iterable< _native::ReplicaInfoIterator, _native::ReplicaInfo, ReplicaInfo >
+Alias for Iterable<_native::ReplicaInfoIterator, _native::ReplicaInfo, ReplicaInfo>
 
 [#_ReplicaInfoIterator]
 === ReplicaInfoIterator
 
-Alias for Iterator< _native::ReplicaInfoIterator, _native::ReplicaInfo, ReplicaInfo >
+Alias for Iterator<_native::ReplicaInfoIterator, _native::ReplicaInfo, ReplicaInfo>
 
 [#_ExplanationIterator]
 === ExplanationIterator
 
-Alias for Iterator< _native::ExplanationIterator, _native::Explanation, Explanation >
+Alias for Iterator<_native::ExplanationIterator, _native::Explanation, Explanation>
 
 [#_ExplanationIterable]
 === ExplanationIterable
 
-Alias for Iterable< _native::ExplanationIterator, _native::Explanation, Explanation >
+Alias for Iterable<_native::ExplanationIterator, _native::Explanation, Explanation>
 
 [#_RuleFuture]
 === RuleFuture
 
-Alias for Future< Rule, _native::RulePromise >
+Alias for Future<Rule, _native::RulePromise>
 
 [#_OptionalRuleFuture]
 === OptionalRuleFuture
 
-Alias for Future< std::optional< Rule >, _native::RulePromise >
+Alias for Future<std::optional<Rule>, _native::RulePromise>
 
 [#_RuleIterable]
 === RuleIterable
 
-Alias for Iterable< _native::RuleIterator, _native::Rule, Rule >
+Alias for Iterable<_native::RuleIterator, _native::Rule, Rule>
 
 [#_RuleIterator]
 === RuleIterator
 
-Alias for Iterator< _native::RuleIterator, _native::Rule, Rule >
+Alias for Iterator<_native::RuleIterator, _native::Rule, Rule>
 
 [#_JSONIterable]
 === JSONIterable
 
-Alias for Iterable< _native::StringIterator, char, JSON >
+Alias for Iterable<_native::StringIterator, char, JSON>
 
 [#_UserIterator]
 === UserIterator
 
-Alias for Iterator< _native::UserIterator, _native::User, User >
+Alias for Iterator<_native::UserIterator, _native::User, User>
 
 [#_UserIterable]
 === UserIterable
 
-Alias for Iterable< _native::UserIterator, _native::User, User >
+Alias for Iterable<_native::UserIterator, _native::User, User>