From a2f60911fefb6b46d4194ae775bdd4fd49787370 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Wed, 8 Nov 2023 20:29:12 +0100
Subject: [PATCH] AK: Rename GenericTraits to DefaultTraits

This feels like a more fitting name for something that provides the
default values for Traits.
---
 AK/ByteBuffer.h                               |  2 +-
 AK/DeprecatedFlyString.h                      |  2 +-
 AK/DeprecatedString.h                         |  2 +-
 AK/DisjointChunks.h                           |  2 +-
 AK/DistinctNumeric.h                          |  2 +-
 AK/Endian.h                                   |  8 +++----
 AK/FlyString.h                                |  2 +-
 AK/IPv4Address.h                              |  2 +-
 AK/IPv6Address.h                              |  2 +-
 AK/MACAddress.h                               |  2 +-
 AK/NonnullOwnPtr.h                            |  2 +-
 AK/NonnullRefPtr.h                            |  2 +-
 AK/OwnPtr.h                                   |  2 +-
 AK/RefPtr.h                                   |  2 +-
 AK/Span.h                                     |  2 +-
 AK/String.h                                   |  2 +-
 AK/StringView.h                               |  2 +-
 AK/Traits.h                                   | 16 ++++++-------
 AK/UFixedBigInt.h                             |  2 +-
 AK/URL.h                                      |  2 +-
 Kernel/FileSystem/FileSystem.h                |  2 +-
 Kernel/Library/KString.h                      |  4 ++--
 Kernel/Library/LockRefPtr.h                   |  2 +-
 Kernel/Library/NonnullLockRefPtr.h            |  2 +-
 Kernel/Net/IPv4SocketTuple.h                  |  2 +-
 Kernel/Tasks/Process.h                        |  2 +-
 Ladybird/AppKit/UI/Inspector.mm               |  2 +-
 .../LibLocale/GenerateDateTimeFormatData.cpp  | 16 ++++++-------
 .../LibLocale/GenerateLocaleData.cpp          |  6 ++---
 .../LibLocale/GenerateNumberFormatData.cpp    |  6 ++---
 .../GenerateRelativeTimeFormatData.cpp        |  2 +-
 .../CodeGenerators/LibUnicode/GeneratorUtil.h |  2 +-
 .../LibWeb/GenerateCSSPropertyID.cpp          |  2 +-
 Tests/AK/TestHashTable.cpp                    |  4 ++--
 Userland/Applications/Maps/MapWidget.h        |  2 +-
 .../Applications/Spreadsheet/Spreadsheet.h    |  2 +-
 Userland/DevTools/UserspaceEmulator/Range.h   |  2 +-
 Userland/Games/ColorLines/Marble.h            |  2 +-
 Userland/Libraries/LibAccelGfx/Painter.h      |  2 +-
 Userland/Libraries/LibArchive/Tar.h           |  2 +-
 Userland/Libraries/LibChess/Chess.h           |  4 ++--
 .../Cpp/CppComprehensionEngine.h              |  2 +-
 Userland/Libraries/LibCompress/Lzma.h         |  2 +-
 Userland/Libraries/LibCompress/Xz.h           |  6 ++---
 Userland/Libraries/LibCompress/Zlib.h         |  2 +-
 .../Libraries/LibCore/SOCKSProxyClient.cpp    | 12 +++++-----
 Userland/Libraries/LibCore/SocketAddress.h    |  2 +-
 Userland/Libraries/LibDNS/Answer.h            |  2 +-
 Userland/Libraries/LibDNS/PacketHeader.h      |  2 +-
 Userland/Libraries/LibGUI/ModelIndex.h        |  2 +-
 .../Libraries/LibGUI/PersistentModelIndex.h   |  2 +-
 Userland/Libraries/LibGUI/Shortcut.h          |  2 +-
 Userland/Libraries/LibGfx/Font/BitmapFont.cpp |  2 +-
 .../LibGfx/Font/OpenType/DataTypes.h          |  8 +++----
 .../Libraries/LibGfx/Font/OpenType/Font.cpp   |  2 +-
 .../Libraries/LibGfx/Font/OpenType/Tables.h   | 24 +++++++++----------
 Userland/Libraries/LibGfx/Font/ScaledFont.h   |  2 +-
 Userland/Libraries/LibGfx/Font/WOFF/Font.cpp  |  4 ++--
 Userland/Libraries/LibGfx/Font/WOFF2/Font.cpp |  4 ++--
 .../Libraries/LibGfx/ICC/DistinctFourCC.h     |  2 +-
 .../Libraries/LibGfx/ImageFormats/DDSLoader.h |  4 ++--
 .../LibGfx/ImageFormats/ICOLoader.cpp         |  4 ++--
 .../Libraries/LibGfx/ImageFormats/QOILoader.h |  2 +-
 .../LibGfx/ImageFormats/TGALoader.cpp         |  2 +-
 Userland/Libraries/LibGfx/Point.h             |  2 +-
 Userland/Libraries/LibJS/Heap/GCPtr.h         |  4 ++--
 Userland/Libraries/LibJS/Heap/Handle.h        |  4 ++--
 .../Libraries/LibJS/Runtime/PropertyKey.h     |  2 +-
 Userland/Libraries/LibJS/Runtime/Shape.h      |  2 +-
 .../Libraries/LibJS/Runtime/StringOrSymbol.h  |  2 +-
 Userland/Libraries/LibJS/Runtime/Value.h      |  2 +-
 .../Libraries/LibLine/KeyCallbackMachine.h    |  4 ++--
 Userland/Libraries/LibManual/Node.h           |  2 +-
 Userland/Libraries/LibPDF/Fonts/Type1Font.h   |  2 +-
 Userland/Libraries/LibPDF/Renderer.h          |  2 +-
 Userland/Libraries/LibSyntax/Highlighter.h    |  2 +-
 Userland/Libraries/LibVideo/Track.h           |  2 +-
 .../LibWasm/AbstractMachine/AbstractMachine.h |  2 +-
 .../Libraries/LibWeb/CSS/StyleComputer.cpp    |  2 +-
 Userland/Libraries/LibWeb/CSS/StyleComputer.h |  2 +-
 Userland/Libraries/LibWeb/FontCache.h         |  2 +-
 .../CrossOriginPropertyDescriptorMap.h        |  2 +-
 .../LibWeb/HTML/ListOfAvailableImages.h       |  2 +-
 Userland/Libraries/LibWeb/HTML/Origin.h       |  2 +-
 .../LibWeb/HTML/Scripting/ModuleMap.h         |  2 +-
 .../LibWeb/Layout/GridFormattingContext.cpp   |  2 +-
 Userland/Libraries/LibWeb/Layout/TableGrid.h  |  2 +-
 .../Libraries/LibWeb/Loader/LoadRequest.h     |  2 +-
 .../LibWeb/Painting/TableBordersPainting.cpp  |  2 +-
 Userland/Libraries/LibWeb/PixelUnits.h        |  4 ++--
 Userland/Libraries/LibWebView/CookieJar.h     |  2 +-
 Userland/Services/DHCPClient/DHCPv4.h         |  2 +-
 .../DeviceMapper/RegisteredDeviceNode.h       |  2 +-
 .../Services/RequestServer/ConnectionCache.h  |  2 +-
 Userland/Services/SpiceAgent/ChunkHeader.h    |  2 +-
 Userland/Services/SpiceAgent/MessageHeader.h  |  2 +-
 Userland/Services/Taskbar/WindowIdentifier.h  |  2 +-
 Userland/Shell/Shell.h                        |  2 +-
 Userland/Utilities/du.cpp                     |  2 +-
 Userland/Utilities/sort.cpp                   |  2 +-
 Userland/Utilities/top.cpp                    |  2 +-
 101 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/AK/ByteBuffer.h b/AK/ByteBuffer.h
index e2fc73bbfe3..947f883d36e 100644
--- a/AK/ByteBuffer.h
+++ b/AK/ByteBuffer.h
@@ -341,7 +341,7 @@ private:
 }
 
 template<>
-struct Traits<ByteBuffer> : public GenericTraits<ByteBuffer> {
+struct Traits<ByteBuffer> : public DefaultTraits<ByteBuffer> {
     static unsigned hash(ByteBuffer const& byte_buffer)
     {
         return Traits<ReadonlyBytes>::hash(byte_buffer.span());
diff --git a/AK/DeprecatedFlyString.h b/AK/DeprecatedFlyString.h
index 76d924da09f..b7b0ca03750 100644
--- a/AK/DeprecatedFlyString.h
+++ b/AK/DeprecatedFlyString.h
@@ -95,7 +95,7 @@ private:
 };
 
 template<>
-struct Traits<DeprecatedFlyString> : public GenericTraits<DeprecatedFlyString> {
+struct Traits<DeprecatedFlyString> : public DefaultTraits<DeprecatedFlyString> {
     static unsigned hash(DeprecatedFlyString const& s) { return s.hash(); }
 };
 
diff --git a/AK/DeprecatedString.h b/AK/DeprecatedString.h
index ad939d0c21e..4813342bded 100644
--- a/AK/DeprecatedString.h
+++ b/AK/DeprecatedString.h
@@ -308,7 +308,7 @@ private:
 };
 
 template<>
-struct Traits<DeprecatedString> : public GenericTraits<DeprecatedString> {
+struct Traits<DeprecatedString> : public DefaultTraits<DeprecatedString> {
     static unsigned hash(DeprecatedString const& s) { return s.impl() ? s.impl()->hash() : 0; }
 };
 
diff --git a/AK/DisjointChunks.h b/AK/DisjointChunks.h
index f95bdb52256..60ed379367e 100644
--- a/AK/DisjointChunks.h
+++ b/AK/DisjointChunks.h
@@ -449,7 +449,7 @@ private:
 };
 
 template<typename T>
-struct Traits<DisjointSpans<T>> : public GenericTraits<DisjointSpans<T>> {
+struct Traits<DisjointSpans<T>> : public DefaultTraits<DisjointSpans<T>> {
     static unsigned hash(DisjointSpans<T> const& span)
     {
         unsigned hash = 0;
diff --git a/AK/DistinctNumeric.h b/AK/DistinctNumeric.h
index 82f63dd3464..17b794e774e 100644
--- a/AK/DistinctNumeric.h
+++ b/AK/DistinctNumeric.h
@@ -326,7 +326,7 @@ struct Formatter<DistinctNumeric<T, X, Opts...>> : Formatter<T> {
     constexpr bool operator==(DN n, E e) { return n.value() == to_underlying(e); }
 
 template<typename T, typename X, typename... Opts>
-struct Traits<AK::DistinctNumeric<T, X, Opts...>> : public GenericTraits<AK::DistinctNumeric<T, X, Opts...>> {
+struct Traits<AK::DistinctNumeric<T, X, Opts...>> : public DefaultTraits<AK::DistinctNumeric<T, X, Opts...>> {
     static constexpr bool is_trivial() { return true; }
     static constexpr auto hash(DistinctNumeric<T, X, Opts...> const& d) { return Traits<T>::hash(d.value()); }
 };
diff --git a/AK/Endian.h b/AK/Endian.h
index e0c6a9afa27..936304818f5 100644
--- a/AK/Endian.h
+++ b/AK/Endian.h
@@ -121,22 +121,22 @@ requires(HasFormatter<T>) struct Formatter<BigEndian<T>> : Formatter<T> {
 };
 
 template<typename T>
-struct Traits<LittleEndian<T>> : public GenericTraits<LittleEndian<T>> {
+struct Traits<LittleEndian<T>> : public DefaultTraits<LittleEndian<T>> {
     static constexpr bool is_trivially_serializable() { return Traits<T>::is_trivially_serializable(); }
 };
 
 template<typename T>
-struct Traits<LittleEndian<T> const> : public GenericTraits<LittleEndian<T> const> {
+struct Traits<LittleEndian<T> const> : public DefaultTraits<LittleEndian<T> const> {
     static constexpr bool is_trivially_serializable() { return Traits<T>::is_trivially_serializable(); }
 };
 
 template<typename T>
-struct Traits<BigEndian<T>> : public GenericTraits<BigEndian<T>> {
+struct Traits<BigEndian<T>> : public DefaultTraits<BigEndian<T>> {
     static constexpr bool is_trivially_serializable() { return Traits<T>::is_trivially_serializable(); }
 };
 
 template<typename T>
-struct Traits<BigEndian<T> const> : public GenericTraits<BigEndian<T> const> {
+struct Traits<BigEndian<T> const> : public DefaultTraits<BigEndian<T> const> {
     static constexpr bool is_trivially_serializable() { return Traits<T>::is_trivially_serializable(); }
 };
 
diff --git a/AK/FlyString.h b/AK/FlyString.h
index 1647af82b5a..bc938159f61 100644
--- a/AK/FlyString.h
+++ b/AK/FlyString.h
@@ -86,7 +86,7 @@ private:
 };
 
 template<>
-struct Traits<FlyString> : public GenericTraits<FlyString> {
+struct Traits<FlyString> : public DefaultTraits<FlyString> {
     static unsigned hash(FlyString const&);
 };
 
diff --git a/AK/IPv4Address.h b/AK/IPv4Address.h
index 2365b5c95d0..f927777508c 100644
--- a/AK/IPv4Address.h
+++ b/AK/IPv4Address.h
@@ -162,7 +162,7 @@ private:
 static_assert(sizeof(IPv4Address) == 4);
 
 template<>
-struct Traits<IPv4Address> : public GenericTraits<IPv4Address> {
+struct Traits<IPv4Address> : public DefaultTraits<IPv4Address> {
     static unsigned hash(IPv4Address const& address) { return secure_sip_hash(static_cast<u64>(address.to_u32())); }
 };
 
diff --git a/AK/IPv6Address.h b/AK/IPv6Address.h
index e9f36535094..2a3c9ea6f18 100644
--- a/AK/IPv6Address.h
+++ b/AK/IPv6Address.h
@@ -269,7 +269,7 @@ private:
 static_assert(sizeof(IPv6Address) == 16);
 
 template<>
-struct Traits<IPv6Address> : public GenericTraits<IPv6Address> {
+struct Traits<IPv6Address> : public DefaultTraits<IPv6Address> {
     // SipHash-4-8 is considered conservatively secure, even if not cryptographically secure.
     static unsigned hash(IPv6Address const& address) { return sip_hash_bytes<4, 8>({ &address.to_in6_addr_t(), sizeof(address.to_in6_addr_t()) }); }
 };
diff --git a/AK/MACAddress.h b/AK/MACAddress.h
index 3e410f40859..cd90c83fe34 100644
--- a/AK/MACAddress.h
+++ b/AK/MACAddress.h
@@ -111,7 +111,7 @@ static_assert(sizeof(MACAddress) == 6u);
 namespace AK {
 
 template<>
-struct Traits<MACAddress> : public GenericTraits<MACAddress> {
+struct Traits<MACAddress> : public DefaultTraits<MACAddress> {
     static unsigned hash(MACAddress const& address) { return string_hash((char const*)&address, sizeof(address)); }
 };
 
diff --git a/AK/NonnullOwnPtr.h b/AK/NonnullOwnPtr.h
index 843faa4f20b..445ebba2f57 100644
--- a/AK/NonnullOwnPtr.h
+++ b/AK/NonnullOwnPtr.h
@@ -183,7 +183,7 @@ inline ErrorOr<NonnullOwnPtr<T>> try_make(Args&&... args)
 }
 
 template<typename T>
-struct Traits<NonnullOwnPtr<T>> : public GenericTraits<NonnullOwnPtr<T>> {
+struct Traits<NonnullOwnPtr<T>> : public DefaultTraits<NonnullOwnPtr<T>> {
     using PeekType = T*;
     using ConstPeekType = T const*;
     static unsigned hash(NonnullOwnPtr<T> const& p) { return ptr_hash(p.ptr()); }
diff --git a/AK/NonnullRefPtr.h b/AK/NonnullRefPtr.h
index 049181ecdcf..09e0e69d436 100644
--- a/AK/NonnullRefPtr.h
+++ b/AK/NonnullRefPtr.h
@@ -285,7 +285,7 @@ inline NonnullRefPtr<T> make_ref_counted(Args&&... args)
 }
 
 template<typename T>
-struct Traits<NonnullRefPtr<T>> : public GenericTraits<NonnullRefPtr<T>> {
+struct Traits<NonnullRefPtr<T>> : public DefaultTraits<NonnullRefPtr<T>> {
     using PeekType = T*;
     using ConstPeekType = T const*;
     static unsigned hash(NonnullRefPtr<T> const& p) { return ptr_hash(p.ptr()); }
diff --git a/AK/OwnPtr.h b/AK/OwnPtr.h
index 2ccb0c3f9a6..98246375b35 100644
--- a/AK/OwnPtr.h
+++ b/AK/OwnPtr.h
@@ -193,7 +193,7 @@ inline OwnPtr<T> adopt_own_if_nonnull(T* object)
 }
 
 template<typename T>
-struct Traits<OwnPtr<T>> : public GenericTraits<OwnPtr<T>> {
+struct Traits<OwnPtr<T>> : public DefaultTraits<OwnPtr<T>> {
     using PeekType = T*;
     using ConstPeekType = T const*;
     static unsigned hash(OwnPtr<T> const& p) { return ptr_hash(p.ptr()); }
diff --git a/AK/RefPtr.h b/AK/RefPtr.h
index 0cc650bcd1a..58395b49767 100644
--- a/AK/RefPtr.h
+++ b/AK/RefPtr.h
@@ -293,7 +293,7 @@ struct Formatter<RefPtr<T>> : Formatter<T const*> {
 };
 
 template<typename T>
-struct Traits<RefPtr<T>> : public GenericTraits<RefPtr<T>> {
+struct Traits<RefPtr<T>> : public DefaultTraits<RefPtr<T>> {
     using PeekType = T*;
     using ConstPeekType = T const*;
     static unsigned hash(RefPtr<T> const& p) { return ptr_hash(p.ptr()); }
diff --git a/AK/Span.h b/AK/Span.h
index 52164532751..a39c3757a75 100644
--- a/AK/Span.h
+++ b/AK/Span.h
@@ -296,7 +296,7 @@ public:
 };
 
 template<typename T>
-struct Traits<Span<T>> : public GenericTraits<Span<T>> {
+struct Traits<Span<T>> : public DefaultTraits<Span<T>> {
     static unsigned hash(Span<T> const& span)
     {
         unsigned hash = 0;
diff --git a/AK/String.h b/AK/String.h
index ab7ae9a2e8f..e84ab8abef4 100644
--- a/AK/String.h
+++ b/AK/String.h
@@ -257,7 +257,7 @@ private:
 };
 
 template<>
-struct Traits<String> : public GenericTraits<String> {
+struct Traits<String> : public DefaultTraits<String> {
     static unsigned hash(String const&);
 };
 
diff --git a/AK/StringView.h b/AK/StringView.h
index 5db9b5673ff..94ac28c36a2 100644
--- a/AK/StringView.h
+++ b/AK/StringView.h
@@ -360,7 +360,7 @@ private:
 };
 
 template<>
-struct Traits<StringView> : public GenericTraits<StringView> {
+struct Traits<StringView> : public DefaultTraits<StringView> {
     static unsigned hash(StringView s) { return s.hash(); }
 };
 
diff --git a/AK/Traits.h b/AK/Traits.h
index 515d779adc9..229c2d63ad7 100644
--- a/AK/Traits.h
+++ b/AK/Traits.h
@@ -16,7 +16,7 @@
 namespace AK {
 
 template<typename T>
-struct GenericTraits {
+struct DefaultTraits {
     using PeekType = T&;
     using ConstPeekType = T const&;
     static constexpr bool is_trivial() { return false; }
@@ -27,11 +27,11 @@ struct GenericTraits {
 };
 
 template<typename T>
-struct Traits : public GenericTraits<T> {
+struct Traits : public DefaultTraits<T> {
 };
 
 template<Integral T>
-struct Traits<T> : public GenericTraits<T> {
+struct Traits<T> : public DefaultTraits<T> {
     static constexpr bool is_trivial() { return true; }
     static constexpr bool is_trivially_serializable() { return true; }
     static unsigned hash(T value)
@@ -42,7 +42,7 @@ struct Traits<T> : public GenericTraits<T> {
 
 #ifndef KERNEL
 template<FloatingPoint T>
-struct Traits<T> : public GenericTraits<T> {
+struct Traits<T> : public DefaultTraits<T> {
     static constexpr bool is_trivial() { return true; }
     static constexpr bool is_trivially_serializable() { return true; }
     static unsigned hash(T value)
@@ -53,20 +53,20 @@ struct Traits<T> : public GenericTraits<T> {
 #endif
 
 template<typename T>
-requires(IsPointer<T> && !Detail::IsPointerOfType<char, T>) struct Traits<T> : public GenericTraits<T> {
+requires(IsPointer<T> && !Detail::IsPointerOfType<char, T>) struct Traits<T> : public DefaultTraits<T> {
     static unsigned hash(T p) { return standard_sip_hash(bit_cast<FlatPtr>(p)); }
     static constexpr bool is_trivial() { return true; }
 };
 
 template<Enum T>
-struct Traits<T> : public GenericTraits<T> {
+struct Traits<T> : public DefaultTraits<T> {
     static unsigned hash(T value) { return Traits<UnderlyingType<T>>::hash(to_underlying(value)); }
     static constexpr bool is_trivial() { return Traits<UnderlyingType<T>>::is_trivial(); }
     static constexpr bool is_trivially_serializable() { return Traits<UnderlyingType<T>>::is_trivially_serializable(); }
 };
 
 template<typename T>
-requires(Detail::IsPointerOfType<char, T>) struct Traits<T> : public GenericTraits<T> {
+requires(Detail::IsPointerOfType<char, T>) struct Traits<T> : public DefaultTraits<T> {
     static unsigned hash(T const value) { return string_hash(value, strlen(value)); }
     static constexpr bool equals(T const a, T const b) { return strcmp(a, b); }
     static constexpr bool is_trivial() { return true; }
@@ -75,6 +75,6 @@ requires(Detail::IsPointerOfType<char, T>) struct Traits<T> : public GenericTrai
 }
 
 #if USING_AK_GLOBALLY
-using AK::GenericTraits;
+using AK::DefaultTraits;
 using AK::Traits;
 #endif
diff --git a/AK/UFixedBigInt.h b/AK/UFixedBigInt.h
index 3764da9c6b0..e687a19eceb 100644
--- a/AK/UFixedBigInt.h
+++ b/AK/UFixedBigInt.h
@@ -581,7 +581,7 @@ private:
 };
 
 template<size_t M>
-struct Traits<UFixedBigInt<M>> : public GenericTraits<UFixedBigInt<M>> {
+struct Traits<UFixedBigInt<M>> : public DefaultTraits<UFixedBigInt<M>> {
     static constexpr bool is_trivially_serializable() { return true; }
     static constexpr bool is_trivial() { return true; }
 };
diff --git a/AK/URL.h b/AK/URL.h
index ad8bf5157a5..951297a738c 100644
--- a/AK/URL.h
+++ b/AK/URL.h
@@ -197,7 +197,7 @@ struct Formatter<URL> : Formatter<StringView> {
 };
 
 template<>
-struct Traits<URL> : public GenericTraits<URL> {
+struct Traits<URL> : public DefaultTraits<URL> {
     static unsigned hash(URL const& url) { return url.to_deprecated_string().hash(); }
 };
 
diff --git a/Kernel/FileSystem/FileSystem.h b/Kernel/FileSystem/FileSystem.h
index 0bb72530e87..b7e6ae7ba2a 100644
--- a/Kernel/FileSystem/FileSystem.h
+++ b/Kernel/FileSystem/FileSystem.h
@@ -88,7 +88,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<Kernel::InodeIdentifier> : public GenericTraits<Kernel::InodeIdentifier> {
+struct Traits<Kernel::InodeIdentifier> : public DefaultTraits<Kernel::InodeIdentifier> {
     static unsigned hash(Kernel::InodeIdentifier const& inode) { return pair_int_hash(inode.fsid().value(), inode.index().value()); }
 };
 
diff --git a/Kernel/Library/KString.h b/Kernel/Library/KString.h
index 80928ef8b5b..5e299bb3b15 100644
--- a/Kernel/Library/KString.h
+++ b/Kernel/Library/KString.h
@@ -86,7 +86,7 @@ struct Formatter<NonnullOwnPtr<Kernel::KString>> : Formatter<StringView> {
 };
 
 template<>
-struct Traits<NonnullOwnPtr<Kernel::KString>> : public GenericTraits<NonnullOwnPtr<Kernel::KString>> {
+struct Traits<NonnullOwnPtr<Kernel::KString>> : public DefaultTraits<NonnullOwnPtr<Kernel::KString>> {
     using PeekType = Kernel::KString*;
     using ConstPeekType = Kernel::KString const*;
     static unsigned hash(NonnullOwnPtr<Kernel::KString> const& p) { return string_hash(p->characters(), p->length()); }
@@ -95,7 +95,7 @@ struct Traits<NonnullOwnPtr<Kernel::KString>> : public GenericTraits<NonnullOwnP
 };
 
 template<>
-struct Traits<OwnPtr<Kernel::KString>> : public GenericTraits<OwnPtr<Kernel::KString>> {
+struct Traits<OwnPtr<Kernel::KString>> : public DefaultTraits<OwnPtr<Kernel::KString>> {
     using PeekType = Kernel::KString*;
     using ConstPeekType = Kernel::KString const*;
     static unsigned hash(OwnPtr<Kernel::KString> const& p)
diff --git a/Kernel/Library/LockRefPtr.h b/Kernel/Library/LockRefPtr.h
index 6486b0fa7cb..da8b29e40ff 100644
--- a/Kernel/Library/LockRefPtr.h
+++ b/Kernel/Library/LockRefPtr.h
@@ -460,7 +460,7 @@ struct Formatter<LockRefPtr<T>> : Formatter<T const*> {
 };
 
 template<typename T>
-struct Traits<LockRefPtr<T>> : public GenericTraits<LockRefPtr<T>> {
+struct Traits<LockRefPtr<T>> : public DefaultTraits<LockRefPtr<T>> {
     using PeekType = T*;
     using ConstPeekType = T const*;
     static unsigned hash(LockRefPtr<T> const& p) { return ptr_hash(p.ptr()); }
diff --git a/Kernel/Library/NonnullLockRefPtr.h b/Kernel/Library/NonnullLockRefPtr.h
index 3b915692fa4..d6d1442b661 100644
--- a/Kernel/Library/NonnullLockRefPtr.h
+++ b/Kernel/Library/NonnullLockRefPtr.h
@@ -329,7 +329,7 @@ requires(IsConvertible<U*, T*>)
 }
 
 template<typename T>
-struct Traits<NonnullLockRefPtr<T>> : public GenericTraits<NonnullLockRefPtr<T>> {
+struct Traits<NonnullLockRefPtr<T>> : public DefaultTraits<NonnullLockRefPtr<T>> {
     using PeekType = T*;
     using ConstPeekType = T const*;
     static unsigned hash(NonnullLockRefPtr<T> const& p) { return ptr_hash(p.ptr()); }
diff --git a/Kernel/Net/IPv4SocketTuple.h b/Kernel/Net/IPv4SocketTuple.h
index 774e1132a93..f9d5ea4638b 100644
--- a/Kernel/Net/IPv4SocketTuple.h
+++ b/Kernel/Net/IPv4SocketTuple.h
@@ -56,7 +56,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<Kernel::IPv4SocketTuple> : public GenericTraits<Kernel::IPv4SocketTuple> {
+struct Traits<Kernel::IPv4SocketTuple> : public DefaultTraits<Kernel::IPv4SocketTuple> {
     static unsigned hash(Kernel::IPv4SocketTuple const& tuple)
     {
         auto h1 = pair_int_hash(tuple.local_address().to_u32(), tuple.local_port());
diff --git a/Kernel/Tasks/Process.h b/Kernel/Tasks/Process.h
index 4915fb6649b..3218202bda8 100644
--- a/Kernel/Tasks/Process.h
+++ b/Kernel/Tasks/Process.h
@@ -1098,7 +1098,7 @@ struct AK::Formatter<Kernel::Process> : AK::Formatter<FormatString> {
 
 namespace AK {
 template<>
-struct Traits<Kernel::GlobalFutexKey> : public GenericTraits<Kernel::GlobalFutexKey> {
+struct Traits<Kernel::GlobalFutexKey> : public DefaultTraits<Kernel::GlobalFutexKey> {
     static unsigned hash(Kernel::GlobalFutexKey const& futex_key) { return pair_int_hash(ptr_hash(futex_key.raw.parent), ptr_hash(futex_key.raw.offset)); }
     static bool equals(Kernel::GlobalFutexKey const& a, Kernel::GlobalFutexKey const& b) { return a.raw.parent == b.raw.parent && a.raw.offset == b.raw.offset; }
 };
diff --git a/Ladybird/AppKit/UI/Inspector.mm b/Ladybird/AppKit/UI/Inspector.mm
index b0989dbdb12..ea84b18b141 100644
--- a/Ladybird/AppKit/UI/Inspector.mm
+++ b/Ladybird/AppKit/UI/Inspector.mm
@@ -28,7 +28,7 @@ static NSString* const CSS_PROPERTY_COLUMN = @"Property";
 static NSString* const CSS_VALUE_COLUMN = @"Value";
 
 template<>
-struct AK::Traits<NSDictionary*> : public GenericTraits<NSDictionary*> {
+struct AK::Traits<NSDictionary*> : public DefaultTraits<NSDictionary*> {
     static unsigned hash(NSDictionary* dictionary)
     {
         return [dictionary hash];
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp
index 8481023696d..44789917ff1 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp
@@ -118,7 +118,7 @@ struct AK::Formatter<CalendarPattern> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<CalendarPattern> : public GenericTraits<CalendarPattern> {
+struct AK::Traits<CalendarPattern> : public DefaultTraits<CalendarPattern> {
     static unsigned hash(CalendarPattern const& c) { return c.hash(); }
 };
 
@@ -185,7 +185,7 @@ struct AK::Formatter<CalendarRangePattern> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<CalendarRangePattern> : public GenericTraits<CalendarRangePattern> {
+struct AK::Traits<CalendarRangePattern> : public DefaultTraits<CalendarRangePattern> {
     static unsigned hash(CalendarRangePattern const& c) { return c.hash(); }
 };
 
@@ -226,7 +226,7 @@ struct AK::Formatter<CalendarFormat> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<CalendarFormat> : public GenericTraits<CalendarFormat> {
+struct AK::Traits<CalendarFormat> : public DefaultTraits<CalendarFormat> {
     static unsigned hash(CalendarFormat const& c) { return c.hash(); }
 };
 
@@ -265,7 +265,7 @@ struct AK::Formatter<CalendarSymbols> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<CalendarSymbols> : public GenericTraits<CalendarSymbols> {
+struct AK::Traits<CalendarSymbols> : public DefaultTraits<CalendarSymbols> {
     static unsigned hash(CalendarSymbols const& c) { return c.hash(); }
 };
 
@@ -329,7 +329,7 @@ struct AK::Formatter<Calendar> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<Calendar> : public GenericTraits<Calendar> {
+struct AK::Traits<Calendar> : public DefaultTraits<Calendar> {
     static unsigned hash(Calendar const& c) { return c.hash(); }
 };
 
@@ -381,7 +381,7 @@ struct AK::Formatter<TimeZoneNames> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<TimeZoneNames> : public GenericTraits<TimeZoneNames> {
+struct AK::Traits<TimeZoneNames> : public DefaultTraits<TimeZoneNames> {
     static unsigned hash(TimeZoneNames const& t) { return t.hash(); }
 };
 
@@ -432,7 +432,7 @@ struct AK::Formatter<TimeZoneFormat> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<TimeZoneFormat> : public GenericTraits<TimeZoneFormat> {
+struct AK::Traits<TimeZoneFormat> : public DefaultTraits<TimeZoneFormat> {
     static unsigned hash(TimeZoneFormat const& t) { return t.hash(); }
 };
 
@@ -470,7 +470,7 @@ struct AK::Formatter<DayPeriod> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<DayPeriod> : public GenericTraits<DayPeriod> {
+struct AK::Traits<DayPeriod> : public DefaultTraits<DayPeriod> {
     static unsigned hash(DayPeriod const& d) { return d.hash(); }
 };
 
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
index 4937170dc28..383d068b79a 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
@@ -61,7 +61,7 @@ struct AK::Formatter<DisplayPattern> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<DisplayPattern> : public GenericTraits<DisplayPattern> {
+struct AK::Traits<DisplayPattern> : public DefaultTraits<DisplayPattern> {
     static unsigned hash(DisplayPattern const& p) { return p.hash(); }
 };
 
@@ -110,7 +110,7 @@ struct AK::Formatter<ListPatterns> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<ListPatterns> : public GenericTraits<ListPatterns> {
+struct AK::Traits<ListPatterns> : public DefaultTraits<ListPatterns> {
     static unsigned hash(ListPatterns const& p) { return p.hash(); }
 };
 
@@ -139,7 +139,7 @@ struct AK::Formatter<TextLayout> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<TextLayout> : public GenericTraits<TextLayout> {
+struct AK::Traits<TextLayout> : public DefaultTraits<TextLayout> {
     static unsigned hash(TextLayout const& t) { return t.hash(); }
 };
 
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp
index 4c515eedc3f..1059270ad93 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp
@@ -90,7 +90,7 @@ struct AK::Formatter<NumberFormat> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<NumberFormat> : public GenericTraits<NumberFormat> {
+struct AK::Traits<NumberFormat> : public DefaultTraits<NumberFormat> {
     static unsigned hash(NumberFormat const& f) { return f.hash(); }
 };
 
@@ -167,7 +167,7 @@ struct AK::Formatter<NumberSystem> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<NumberSystem> : public GenericTraits<NumberSystem> {
+struct AK::Traits<NumberSystem> : public DefaultTraits<NumberSystem> {
     static unsigned hash(NumberSystem const& s) { return s.hash(); }
 };
 
@@ -209,7 +209,7 @@ struct AK::Formatter<Unit> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<Unit> : public GenericTraits<Unit> {
+struct AK::Traits<Unit> : public DefaultTraits<Unit> {
     static unsigned hash(Unit const& u) { return u.hash(); }
 };
 
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp
index a57bb06feec..f68e69efc76 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp
@@ -61,7 +61,7 @@ struct AK::Formatter<RelativeTimeFormat> : Formatter<FormatString> {
 };
 
 template<>
-struct AK::Traits<RelativeTimeFormat> : public GenericTraits<RelativeTimeFormat> {
+struct AK::Traits<RelativeTimeFormat> : public DefaultTraits<RelativeTimeFormat> {
     static unsigned hash(RelativeTimeFormat const& format) { return format.hash(); }
 };
 
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h
index 5e16263cd47..d251e1de8a3 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h
+++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GeneratorUtil.h
@@ -33,7 +33,7 @@ template<typename T>
 concept IntegralOrEnum = Integral<T> || Enum<T>;
 
 template<IntegralOrEnum T>
-struct AK::Traits<Vector<T>> : public GenericTraits<Vector<T>> {
+struct AK::Traits<Vector<T>> : public DefaultTraits<Vector<T>> {
     static unsigned hash(Vector<T> const& list)
     {
         auto hash = int_hash(static_cast<u32>(list.size()));
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp
index 2cbec5abdf5..95bf12ab82c 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp
@@ -230,7 +230,7 @@ bool property_has_quirk(PropertyID, Quirk);
 
 namespace AK {
 template<>
-struct Traits<Web::CSS::PropertyID> : public GenericTraits<Web::CSS::PropertyID> {
+struct Traits<Web::CSS::PropertyID> : public DefaultTraits<Web::CSS::PropertyID> {
     static unsigned hash(Web::CSS::PropertyID property_id) { return int_hash((unsigned)property_id); }
 };
 } // namespace AK
diff --git a/Tests/AK/TestHashTable.cpp b/Tests/AK/TestHashTable.cpp
index a6e18845eda..d1ca5d1788c 100644
--- a/Tests/AK/TestHashTable.cpp
+++ b/Tests/AK/TestHashTable.cpp
@@ -155,7 +155,7 @@ TEST_CASE(many_strings)
 
 TEST_CASE(many_collisions)
 {
-    struct StringCollisionTraits : public GenericTraits<DeprecatedString> {
+    struct StringCollisionTraits : public DefaultTraits<DeprecatedString> {
         static unsigned hash(DeprecatedString const&) { return 0; }
     };
 
@@ -176,7 +176,7 @@ TEST_CASE(many_collisions)
 
 TEST_CASE(space_reuse)
 {
-    struct StringCollisionTraits : public GenericTraits<DeprecatedString> {
+    struct StringCollisionTraits : public DefaultTraits<DeprecatedString> {
         static unsigned hash(DeprecatedString const&) { return 0; }
     };
 
diff --git a/Userland/Applications/Maps/MapWidget.h b/Userland/Applications/Maps/MapWidget.h
index 886f3938f15..e2c9e3cb927 100644
--- a/Userland/Applications/Maps/MapWidget.h
+++ b/Userland/Applications/Maps/MapWidget.h
@@ -200,6 +200,6 @@ private:
 }
 
 template<>
-struct AK::Traits<Maps::MapWidget::TileKey> : public GenericTraits<Maps::MapWidget::TileKey> {
+struct AK::Traits<Maps::MapWidget::TileKey> : public DefaultTraits<Maps::MapWidget::TileKey> {
     static unsigned hash(Maps::MapWidget::TileKey const& t) { return t.hash(); }
 };
diff --git a/Userland/Applications/Spreadsheet/Spreadsheet.h b/Userland/Applications/Spreadsheet/Spreadsheet.h
index f157f7d4ad6..28e4bad61af 100644
--- a/Userland/Applications/Spreadsheet/Spreadsheet.h
+++ b/Userland/Applications/Spreadsheet/Spreadsheet.h
@@ -179,7 +179,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<Spreadsheet::Position> : public GenericTraits<Spreadsheet::Position> {
+struct Traits<Spreadsheet::Position> : public DefaultTraits<Spreadsheet::Position> {
     static constexpr bool is_trivial() { return false; }
     static unsigned hash(Spreadsheet::Position const& p)
     {
diff --git a/Userland/DevTools/UserspaceEmulator/Range.h b/Userland/DevTools/UserspaceEmulator/Range.h
index 98b489552f3..7bde305e24d 100644
--- a/Userland/DevTools/UserspaceEmulator/Range.h
+++ b/Userland/DevTools/UserspaceEmulator/Range.h
@@ -69,7 +69,7 @@ private:
 
 namespace AK {
 template<>
-struct Traits<UserspaceEmulator::Range> : public GenericTraits<UserspaceEmulator::Range> {
+struct Traits<UserspaceEmulator::Range> : public DefaultTraits<UserspaceEmulator::Range> {
     static constexpr bool is_trivial() { return true; }
 };
 }
diff --git a/Userland/Games/ColorLines/Marble.h b/Userland/Games/ColorLines/Marble.h
index 5ec2238ad0a..f72951a3f8c 100644
--- a/Userland/Games/ColorLines/Marble.h
+++ b/Userland/Games/ColorLines/Marble.h
@@ -37,7 +37,7 @@ private:
 
 namespace AK {
 template<>
-struct Traits<Marble> : public GenericTraits<Marble> {
+struct Traits<Marble> : public DefaultTraits<Marble> {
     static unsigned hash(Marble const& marble)
     {
         return Traits<Marble::Point>::hash(marble.position());
diff --git a/Userland/Libraries/LibAccelGfx/Painter.h b/Userland/Libraries/LibAccelGfx/Painter.h
index 1869daec429..686e9c538d7 100644
--- a/Userland/Libraries/LibAccelGfx/Painter.h
+++ b/Userland/Libraries/LibAccelGfx/Painter.h
@@ -97,7 +97,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<AccelGfx::Painter::GlyphsTextureKey> : public GenericTraits<AccelGfx::Painter::GlyphsTextureKey> {
+struct Traits<AccelGfx::Painter::GlyphsTextureKey> : public DefaultTraits<AccelGfx::Painter::GlyphsTextureKey> {
     static unsigned hash(AccelGfx::Painter::GlyphsTextureKey const& key)
     {
         return pair_int_hash(ptr_hash(key.font), key.code_point);
diff --git a/Userland/Libraries/LibArchive/Tar.h b/Userland/Libraries/LibArchive/Tar.h
index 86ad43059f4..2186c6be2f9 100644
--- a/Userland/Libraries/LibArchive/Tar.h
+++ b/Userland/Libraries/LibArchive/Tar.h
@@ -157,6 +157,6 @@ private:
 }
 
 template<>
-struct AK::Traits<Archive::TarFileHeader> : public AK::GenericTraits<Archive::TarFileHeader> {
+struct AK::Traits<Archive::TarFileHeader> : public AK::DefaultTraits<Archive::TarFileHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibChess/Chess.h b/Userland/Libraries/LibChess/Chess.h
index acff4ee9d45..6037cb4200c 100644
--- a/Userland/Libraries/LibChess/Chess.h
+++ b/Userland/Libraries/LibChess/Chess.h
@@ -293,7 +293,7 @@ void Board::generate_moves(Callback callback, Color color) const
 }
 
 template<>
-struct AK::Traits<Chess::Piece> : public GenericTraits<Chess::Piece> {
+struct AK::Traits<Chess::Piece> : public DefaultTraits<Chess::Piece> {
     static unsigned hash(Chess::Piece const& piece)
     {
         return pair_int_hash(static_cast<u32>(piece.color), static_cast<u32>(piece.type));
@@ -301,7 +301,7 @@ struct AK::Traits<Chess::Piece> : public GenericTraits<Chess::Piece> {
 };
 
 template<>
-struct AK::Traits<Chess::Board> : public GenericTraits<Chess::Board> {
+struct AK::Traits<Chess::Board> : public DefaultTraits<Chess::Board> {
     static unsigned hash(Chess::Board const& chess)
     {
         unsigned hash = 0;
diff --git a/Userland/Libraries/LibCodeComprehension/Cpp/CppComprehensionEngine.h b/Userland/Libraries/LibCodeComprehension/Cpp/CppComprehensionEngine.h
index e635afc2859..43f24cb4f20 100644
--- a/Userland/Libraries/LibCodeComprehension/Cpp/CppComprehensionEngine.h
+++ b/Userland/Libraries/LibCodeComprehension/Cpp/CppComprehensionEngine.h
@@ -189,7 +189,7 @@ void CppComprehensionEngine::for_each_included_document_recursive(DocumentData c
 namespace AK {
 
 template<>
-struct Traits<CodeComprehension::Cpp::CppComprehensionEngine::SymbolName> : public GenericTraits<CodeComprehension::Cpp::CppComprehensionEngine::SymbolName> {
+struct Traits<CodeComprehension::Cpp::CppComprehensionEngine::SymbolName> : public DefaultTraits<CodeComprehension::Cpp::CppComprehensionEngine::SymbolName> {
     static unsigned hash(CodeComprehension::Cpp::CppComprehensionEngine::SymbolName const& key)
     {
         unsigned hash = 0;
diff --git a/Userland/Libraries/LibCompress/Lzma.h b/Userland/Libraries/LibCompress/Lzma.h
index 18f6307f21b..066c97612c9 100644
--- a/Userland/Libraries/LibCompress/Lzma.h
+++ b/Userland/Libraries/LibCompress/Lzma.h
@@ -271,6 +271,6 @@ private:
 }
 
 template<>
-struct AK::Traits<Compress::LzmaHeader> : public AK::GenericTraits<Compress::LzmaHeader> {
+struct AK::Traits<Compress::LzmaHeader> : public AK::DefaultTraits<Compress::LzmaHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibCompress/Xz.h b/Userland/Libraries/LibCompress/Xz.h
index aa9e69fd987..997631ca2a6 100644
--- a/Userland/Libraries/LibCompress/Xz.h
+++ b/Userland/Libraries/LibCompress/Xz.h
@@ -162,16 +162,16 @@ private:
 }
 
 template<>
-struct AK::Traits<Compress::XzStreamHeader> : public AK::GenericTraits<Compress::XzStreamHeader> {
+struct AK::Traits<Compress::XzStreamHeader> : public AK::DefaultTraits<Compress::XzStreamHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-struct AK::Traits<Compress::XzStreamFooter> : public AK::GenericTraits<Compress::XzStreamFooter> {
+struct AK::Traits<Compress::XzStreamFooter> : public AK::DefaultTraits<Compress::XzStreamFooter> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-struct AK::Traits<Compress::XzBlockFlags> : public AK::GenericTraits<Compress::XzBlockFlags> {
+struct AK::Traits<Compress::XzBlockFlags> : public AK::DefaultTraits<Compress::XzBlockFlags> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibCompress/Zlib.h b/Userland/Libraries/LibCompress/Zlib.h
index 6a3e0813f3c..478ead7f24e 100644
--- a/Userland/Libraries/LibCompress/Zlib.h
+++ b/Userland/Libraries/LibCompress/Zlib.h
@@ -88,6 +88,6 @@ private:
 }
 
 template<>
-struct AK::Traits<Compress::ZlibHeader> : public AK::GenericTraits<Compress::ZlibHeader> {
+struct AK::Traits<Compress::ZlibHeader> : public AK::DefaultTraits<Compress::ZlibHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibCore/SOCKSProxyClient.cpp b/Userland/Libraries/LibCore/SOCKSProxyClient.cpp
index 88a001c8978..199def7297c 100644
--- a/Userland/Libraries/LibCore/SOCKSProxyClient.cpp
+++ b/Userland/Libraries/LibCore/SOCKSProxyClient.cpp
@@ -40,7 +40,7 @@ struct [[gnu::packed]] Socks5VersionIdentifierAndMethodSelectionMessage {
 };
 
 template<>
-struct AK::Traits<Socks5VersionIdentifierAndMethodSelectionMessage> : public AK::GenericTraits<Socks5VersionIdentifierAndMethodSelectionMessage> {
+struct AK::Traits<Socks5VersionIdentifierAndMethodSelectionMessage> : public AK::DefaultTraits<Socks5VersionIdentifierAndMethodSelectionMessage> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
@@ -50,7 +50,7 @@ struct [[gnu::packed]] Socks5InitialResponse {
 };
 
 template<>
-struct AK::Traits<Socks5InitialResponse> : public AK::GenericTraits<Socks5InitialResponse> {
+struct AK::Traits<Socks5InitialResponse> : public AK::DefaultTraits<Socks5InitialResponse> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
@@ -61,7 +61,7 @@ struct [[gnu::packed]] Socks5ConnectRequestHeader {
 };
 
 template<>
-struct AK::Traits<Socks5ConnectRequestHeader> : public AK::GenericTraits<Socks5ConnectRequestHeader> {
+struct AK::Traits<Socks5ConnectRequestHeader> : public AK::DefaultTraits<Socks5ConnectRequestHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
@@ -70,7 +70,7 @@ struct [[gnu::packed]] Socks5ConnectRequestTrailer {
 };
 
 template<>
-struct AK::Traits<Socks5ConnectRequestTrailer> : public AK::GenericTraits<Socks5ConnectRequestTrailer> {
+struct AK::Traits<Socks5ConnectRequestTrailer> : public AK::DefaultTraits<Socks5ConnectRequestTrailer> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
@@ -81,7 +81,7 @@ struct [[gnu::packed]] Socks5ConnectResponseHeader {
 };
 
 template<>
-struct AK::Traits<Socks5ConnectResponseHeader> : public AK::GenericTraits<Socks5ConnectResponseHeader> {
+struct AK::Traits<Socks5ConnectResponseHeader> : public AK::DefaultTraits<Socks5ConnectResponseHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
@@ -95,7 +95,7 @@ struct [[gnu::packed]] Socks5UsernamePasswordResponse {
 };
 
 template<>
-struct AK::Traits<Socks5UsernamePasswordResponse> : public AK::GenericTraits<Socks5UsernamePasswordResponse> {
+struct AK::Traits<Socks5UsernamePasswordResponse> : public AK::DefaultTraits<Socks5UsernamePasswordResponse> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
diff --git a/Userland/Libraries/LibCore/SocketAddress.h b/Userland/Libraries/LibCore/SocketAddress.h
index 28dc6833df6..48f7cb6426d 100644
--- a/Userland/Libraries/LibCore/SocketAddress.h
+++ b/Userland/Libraries/LibCore/SocketAddress.h
@@ -105,7 +105,7 @@ struct AK::Formatter<Core::SocketAddress> : Formatter<DeprecatedString> {
 };
 
 template<>
-struct AK::Traits<Core::SocketAddress> : public GenericTraits<Core::SocketAddress> {
+struct AK::Traits<Core::SocketAddress> : public DefaultTraits<Core::SocketAddress> {
     static unsigned hash(Core::SocketAddress const& socket_address)
     {
         return pair_int_hash(Traits<IPv4Address>::hash(socket_address.ipv4_address()), Traits<u16>::hash(socket_address.port()));
diff --git a/Userland/Libraries/LibDNS/Answer.h b/Userland/Libraries/LibDNS/Answer.h
index 9a4c073e958..73263315dbd 100644
--- a/Userland/Libraries/LibDNS/Answer.h
+++ b/Userland/Libraries/LibDNS/Answer.h
@@ -65,7 +65,7 @@ private:
 }
 
 template<>
-struct AK::Traits<DNS::Answer> : public GenericTraits<DNS::Answer> {
+struct AK::Traits<DNS::Answer> : public DefaultTraits<DNS::Answer> {
     static constexpr bool is_trivial() { return false; }
     static unsigned hash(DNS::Answer a) { return a.hash(); }
 };
diff --git a/Userland/Libraries/LibDNS/PacketHeader.h b/Userland/Libraries/LibDNS/PacketHeader.h
index 300286f0ed4..fe4d46677d3 100644
--- a/Userland/Libraries/LibDNS/PacketHeader.h
+++ b/Userland/Libraries/LibDNS/PacketHeader.h
@@ -99,6 +99,6 @@ static_assert(sizeof(PacketHeader) == 12);
 }
 
 template<>
-struct AK::Traits<DNS::PacketHeader> : public AK::GenericTraits<DNS::PacketHeader> {
+struct AK::Traits<DNS::PacketHeader> : public AK::DefaultTraits<DNS::PacketHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibGUI/ModelIndex.h b/Userland/Libraries/LibGUI/ModelIndex.h
index a9473cb556d..6750609a290 100644
--- a/Userland/Libraries/LibGUI/ModelIndex.h
+++ b/Userland/Libraries/LibGUI/ModelIndex.h
@@ -70,7 +70,7 @@ struct Formatter<GUI::ModelIndex> : Formatter<FormatString> {
 };
 
 template<>
-struct Traits<GUI::ModelIndex> : public GenericTraits<GUI::ModelIndex> {
+struct Traits<GUI::ModelIndex> : public DefaultTraits<GUI::ModelIndex> {
     static unsigned hash(const GUI::ModelIndex& index)
     {
         return pair_int_hash(pair_int_hash(index.row(), index.column()), reinterpret_cast<FlatPtr>(index.internal_data()));
diff --git a/Userland/Libraries/LibGUI/PersistentModelIndex.h b/Userland/Libraries/LibGUI/PersistentModelIndex.h
index 0690ebd0de4..a2d7666aa2b 100644
--- a/Userland/Libraries/LibGUI/PersistentModelIndex.h
+++ b/Userland/Libraries/LibGUI/PersistentModelIndex.h
@@ -81,7 +81,7 @@ struct Formatter<GUI::PersistentModelIndex> : Formatter<FormatString> {
 };
 
 template<>
-struct Traits<GUI::PersistentModelIndex> : public GenericTraits<GUI::PersistentModelIndex> {
+struct Traits<GUI::PersistentModelIndex> : public DefaultTraits<GUI::PersistentModelIndex> {
     static unsigned hash(const GUI::PersistentModelIndex& index)
     {
         if (index.has_valid_handle())
diff --git a/Userland/Libraries/LibGUI/Shortcut.h b/Userland/Libraries/LibGUI/Shortcut.h
index 835d626bfcb..fa8d199dcfd 100644
--- a/Userland/Libraries/LibGUI/Shortcut.h
+++ b/Userland/Libraries/LibGUI/Shortcut.h
@@ -80,7 +80,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<GUI::Shortcut> : public GenericTraits<GUI::Shortcut> {
+struct Traits<GUI::Shortcut> : public DefaultTraits<GUI::Shortcut> {
     static unsigned hash(const GUI::Shortcut& shortcut)
     {
         auto base_hash = pair_int_hash(shortcut.modifiers(), (u32)shortcut.type());
diff --git a/Userland/Libraries/LibGfx/Font/BitmapFont.cpp b/Userland/Libraries/LibGfx/Font/BitmapFont.cpp
index db950b5271c..a12e423e33f 100644
--- a/Userland/Libraries/LibGfx/Font/BitmapFont.cpp
+++ b/Userland/Libraries/LibGfx/Font/BitmapFont.cpp
@@ -46,7 +46,7 @@ static constexpr size_t s_max_range_mask_size = s_max_glyph_count / (256 * 8);
 // FIXME: We define the traits for the const FontFileHeader, because that's the one we use, and defining
 //        Traits<T> doesn't apply to Traits<T const>. Once that's fixed, remove the const here.
 template<>
-class AK::Traits<Gfx::FontFileHeader const> : public GenericTraits<Gfx::FontFileHeader const> {
+class AK::Traits<Gfx::FontFileHeader const> : public DefaultTraits<Gfx::FontFileHeader const> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibGfx/Font/OpenType/DataTypes.h b/Userland/Libraries/LibGfx/Font/OpenType/DataTypes.h
index d3c687bb315..db3fe2e64b9 100644
--- a/Userland/Libraries/LibGfx/Font/OpenType/DataTypes.h
+++ b/Userland/Libraries/LibGfx/Font/OpenType/DataTypes.h
@@ -55,19 +55,19 @@ static_assert(AssertSize<Version16Dot16, 4>());
 
 namespace AK {
 template<>
-struct Traits<OpenType::Fixed const> : public GenericTraits<OpenType::Fixed const> {
+struct Traits<OpenType::Fixed const> : public DefaultTraits<OpenType::Fixed const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 template<>
-struct Traits<OpenType::LongDateTime const> : public GenericTraits<OpenType::LongDateTime const> {
+struct Traits<OpenType::LongDateTime const> : public DefaultTraits<OpenType::LongDateTime const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 template<>
-struct Traits<OpenType::Tag const> : public GenericTraits<OpenType::Tag const> {
+struct Traits<OpenType::Tag const> : public DefaultTraits<OpenType::Tag const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 template<>
-struct Traits<OpenType::Version16Dot16 const> : public GenericTraits<OpenType::Version16Dot16 const> {
+struct Traits<OpenType::Version16Dot16 const> : public DefaultTraits<OpenType::Version16Dot16 const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 }
diff --git a/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp b/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp
index 6194b7547b0..53ce004bc55 100644
--- a/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp
+++ b/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp
@@ -37,7 +37,7 @@ static_assert(AssertSize<TTCHeaderV1, 16>());
 }
 
 template<>
-class AK::Traits<OpenType::TTCHeaderV1> : public GenericTraits<OpenType::TTCHeaderV1> {
+class AK::Traits<OpenType::TTCHeaderV1> : public DefaultTraits<OpenType::TTCHeaderV1> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibGfx/Font/OpenType/Tables.h b/Userland/Libraries/LibGfx/Font/OpenType/Tables.h
index 0f5f619f66f..93fc02742f0 100644
--- a/Userland/Libraries/LibGfx/Font/OpenType/Tables.h
+++ b/Userland/Libraries/LibGfx/Font/OpenType/Tables.h
@@ -48,13 +48,13 @@ static_assert(AssertSize<TableRecord, 16>());
 }
 
 template<>
-class AK::Traits<OpenType::TableDirectory const> : public GenericTraits<OpenType::TableDirectory const> {
+class AK::Traits<OpenType::TableDirectory const> : public DefaultTraits<OpenType::TableDirectory const> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-class AK::Traits<OpenType::TableRecord const> : public GenericTraits<OpenType::TableRecord const> {
+class AK::Traits<OpenType::TableRecord const> : public DefaultTraits<OpenType::TableRecord const> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
@@ -788,47 +788,47 @@ private:
 
 namespace AK {
 template<>
-struct Traits<OpenType::Kern::Header const> : public GenericTraits<OpenType::Kern::Header const> {
+struct Traits<OpenType::Kern::Header const> : public DefaultTraits<OpenType::Kern::Header const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 template<>
-struct Traits<OpenType::Kern::SubtableHeader const> : public GenericTraits<OpenType::Kern::SubtableHeader const> {
+struct Traits<OpenType::Kern::SubtableHeader const> : public DefaultTraits<OpenType::Kern::SubtableHeader const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 template<>
-struct Traits<OpenType::Kern::Format0 const> : public GenericTraits<OpenType::Kern::Format0 const> {
+struct Traits<OpenType::Kern::Format0 const> : public DefaultTraits<OpenType::Kern::Format0 const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 template<>
-struct Traits<OpenType::Kern::Format0Pair const> : public GenericTraits<OpenType::Kern::Format0Pair const> {
+struct Traits<OpenType::Kern::Format0Pair const> : public DefaultTraits<OpenType::Kern::Format0Pair const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-struct Traits<OpenType::GPOS::Version1_0 const> : public GenericTraits<OpenType::GPOS::Version1_0 const> {
+struct Traits<OpenType::GPOS::Version1_0 const> : public DefaultTraits<OpenType::GPOS::Version1_0 const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-struct Traits<OpenType::FeatureList const> : public GenericTraits<OpenType::FeatureList const> {
+struct Traits<OpenType::FeatureList const> : public DefaultTraits<OpenType::FeatureList const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 template<>
-struct Traits<OpenType::FeatureRecord const> : public GenericTraits<OpenType::FeatureRecord const> {
+struct Traits<OpenType::FeatureRecord const> : public DefaultTraits<OpenType::FeatureRecord const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-struct Traits<OpenType::LookupList const> : public GenericTraits<OpenType::LookupList const> {
+struct Traits<OpenType::LookupList const> : public DefaultTraits<OpenType::LookupList const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-struct Traits<OpenType::ScriptList const> : public GenericTraits<OpenType::ScriptList const> {
+struct Traits<OpenType::ScriptList const> : public DefaultTraits<OpenType::ScriptList const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 template<>
-struct Traits<OpenType::ScriptRecord const> : public GenericTraits<OpenType::ScriptRecord const> {
+struct Traits<OpenType::ScriptRecord const> : public DefaultTraits<OpenType::ScriptRecord const> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 }
diff --git a/Userland/Libraries/LibGfx/Font/ScaledFont.h b/Userland/Libraries/LibGfx/Font/ScaledFont.h
index 1ae93d69bfe..fb3a00f7457 100644
--- a/Userland/Libraries/LibGfx/Font/ScaledFont.h
+++ b/Userland/Libraries/LibGfx/Font/ScaledFont.h
@@ -97,7 +97,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<Gfx::GlyphIndexWithSubpixelOffset> : public GenericTraits<Gfx::GlyphIndexWithSubpixelOffset> {
+struct Traits<Gfx::GlyphIndexWithSubpixelOffset> : public DefaultTraits<Gfx::GlyphIndexWithSubpixelOffset> {
     static unsigned hash(Gfx::GlyphIndexWithSubpixelOffset const& index)
     {
         return pair_int_hash(index.glyph_id, (index.subpixel_offset.x << 8) | index.subpixel_offset.y);
diff --git a/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp b/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp
index 86b7409096d..defe0136991 100644
--- a/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp
+++ b/Userland/Libraries/LibGfx/Font/WOFF/Font.cpp
@@ -47,13 +47,13 @@ static_assert(AssertSize<TableDirectoryEntry, 20>());
 }
 
 template<>
-class AK::Traits<WOFF::Header> : public GenericTraits<WOFF::Header> {
+class AK::Traits<WOFF::Header> : public DefaultTraits<WOFF::Header> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-class AK::Traits<WOFF::TableDirectoryEntry> : public GenericTraits<WOFF::TableDirectoryEntry> {
+class AK::Traits<WOFF::TableDirectoryEntry> : public DefaultTraits<WOFF::TableDirectoryEntry> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibGfx/Font/WOFF2/Font.cpp b/Userland/Libraries/LibGfx/Font/WOFF2/Font.cpp
index 392f89afe94..b3533e52a16 100644
--- a/Userland/Libraries/LibGfx/Font/WOFF2/Font.cpp
+++ b/Userland/Libraries/LibGfx/Font/WOFF2/Font.cpp
@@ -42,7 +42,7 @@ static_assert(AssertSize<Header, 48>());
 }
 
 template<>
-class AK::Traits<WOFF2::Header> : public GenericTraits<WOFF2::Header> {
+class AK::Traits<WOFF2::Header> : public DefaultTraits<WOFF2::Header> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
@@ -496,7 +496,7 @@ static_assert(AssertSize<TransformedGlyfTable, 36>());
 }
 
 template<>
-class AK::Traits<WOFF2::TransformedGlyfTable> : public GenericTraits<WOFF2::TransformedGlyfTable> {
+class AK::Traits<WOFF2::TransformedGlyfTable> : public DefaultTraits<WOFF2::TransformedGlyfTable> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibGfx/ICC/DistinctFourCC.h b/Userland/Libraries/LibGfx/ICC/DistinctFourCC.h
index 1d037b57111..7b23f289339 100644
--- a/Userland/Libraries/LibGfx/ICC/DistinctFourCC.h
+++ b/Userland/Libraries/LibGfx/ICC/DistinctFourCC.h
@@ -65,7 +65,7 @@ struct AK::Formatter<Gfx::ICC::DistinctFourCC<Type>> : StandardFormatter {
 };
 
 template<Gfx::ICC::FourCCType Type>
-struct AK::Traits<Gfx::ICC::DistinctFourCC<Type>> : public GenericTraits<Gfx::ICC::DistinctFourCC<Type>> {
+struct AK::Traits<Gfx::ICC::DistinctFourCC<Type>> : public DefaultTraits<Gfx::ICC::DistinctFourCC<Type>> {
     static unsigned hash(Gfx::ICC::DistinctFourCC<Type> const& key)
     {
         return int_hash(key.value);
diff --git a/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h
index 69b46476b6d..3bc77f1e418 100644
--- a/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h
@@ -254,11 +254,11 @@ private:
 }
 
 template<>
-struct AK::Traits<Gfx::DDSHeader> : public AK::GenericTraits<Gfx::DDSHeader> {
+struct AK::Traits<Gfx::DDSHeader> : public AK::DefaultTraits<Gfx::DDSHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-struct AK::Traits<Gfx::DDSHeaderDXT10> : public AK::GenericTraits<Gfx::DDSHeaderDXT10> {
+struct AK::Traits<Gfx::DDSHeaderDXT10> : public AK::DefaultTraits<Gfx::DDSHeaderDXT10> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
index e9180e2432f..a56f57907d5 100644
--- a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
@@ -38,13 +38,13 @@ static_assert(AssertSize<ICONDIRENTRY, 16>());
 };
 
 template<>
-class AK::Traits<Gfx::ICONDIR> : public GenericTraits<Gfx::ICONDIR> {
+class AK::Traits<Gfx::ICONDIR> : public DefaultTraits<Gfx::ICONDIR> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
 template<>
-class AK::Traits<Gfx::ICONDIRENTRY> : public GenericTraits<Gfx::ICONDIRENTRY> {
+class AK::Traits<Gfx::ICONDIRENTRY> : public DefaultTraits<Gfx::ICONDIRENTRY> {
 public:
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h
index bb9a034d2fc..c1908ebdbf3 100644
--- a/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h
+++ b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h
@@ -59,6 +59,6 @@ private:
 }
 
 template<>
-struct AK::Traits<Gfx::QOIHeader> : public GenericTraits<Gfx::QOIHeader> {
+struct AK::Traits<Gfx::QOIHeader> : public DefaultTraits<Gfx::QOIHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp
index 32746f54a67..98b53655e77 100644
--- a/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp
+++ b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp
@@ -44,7 +44,7 @@ static_assert(sizeof(TGAHeader) == 18);
 }
 
 template<>
-struct AK::Traits<Gfx::TGAHeader> : public GenericTraits<Gfx::TGAHeader> {
+struct AK::Traits<Gfx::TGAHeader> : public DefaultTraits<Gfx::TGAHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
diff --git a/Userland/Libraries/LibGfx/Point.h b/Userland/Libraries/LibGfx/Point.h
index 51062877f4b..77ba60328e8 100644
--- a/Userland/Libraries/LibGfx/Point.h
+++ b/Userland/Libraries/LibGfx/Point.h
@@ -313,7 +313,7 @@ ErrorOr<Gfx::IntPoint> decode(Decoder&);
 }
 
 template<typename T>
-struct AK::Traits<Gfx::Point<T>> : public AK::GenericTraits<Gfx::Point<T>> {
+struct AK::Traits<Gfx::Point<T>> : public AK::DefaultTraits<Gfx::Point<T>> {
     static constexpr bool is_trivial() { return false; }
     static unsigned hash(Gfx::Point<T> const& point)
     {
diff --git a/Userland/Libraries/LibJS/Heap/GCPtr.h b/Userland/Libraries/LibJS/Heap/GCPtr.h
index 29e05ec2be0..a9c853b6a2b 100644
--- a/Userland/Libraries/LibJS/Heap/GCPtr.h
+++ b/Userland/Libraries/LibJS/Heap/GCPtr.h
@@ -215,7 +215,7 @@ inline bool operator==(NonnullGCPtr<T> const& a, GCPtr<U> const& b)
 namespace AK {
 
 template<typename T>
-struct Traits<JS::GCPtr<T>> : public GenericTraits<JS::GCPtr<T>> {
+struct Traits<JS::GCPtr<T>> : public DefaultTraits<JS::GCPtr<T>> {
     static unsigned hash(JS::GCPtr<T> const& value)
     {
         return Traits<T*>::hash(value.ptr());
@@ -223,7 +223,7 @@ struct Traits<JS::GCPtr<T>> : public GenericTraits<JS::GCPtr<T>> {
 };
 
 template<typename T>
-struct Traits<JS::NonnullGCPtr<T>> : public GenericTraits<JS::NonnullGCPtr<T>> {
+struct Traits<JS::NonnullGCPtr<T>> : public DefaultTraits<JS::NonnullGCPtr<T>> {
     static unsigned hash(JS::NonnullGCPtr<T> const& value)
     {
         return Traits<T*>::hash(value.ptr());
diff --git a/Userland/Libraries/LibJS/Heap/Handle.h b/Userland/Libraries/LibJS/Heap/Handle.h
index 36be3bf0ae9..e7dedd7ce06 100644
--- a/Userland/Libraries/LibJS/Heap/Handle.h
+++ b/Userland/Libraries/LibJS/Heap/Handle.h
@@ -195,12 +195,12 @@ inline Handle<Value> make_handle(Value value, SourceLocation location = SourceLo
 namespace AK {
 
 template<typename T>
-struct Traits<JS::Handle<T>> : public GenericTraits<JS::Handle<T>> {
+struct Traits<JS::Handle<T>> : public DefaultTraits<JS::Handle<T>> {
     static unsigned hash(JS::Handle<T> const& handle) { return Traits<T>::hash(handle); }
 };
 
 template<>
-struct Traits<JS::Handle<JS::Value>> : public GenericTraits<JS::Handle<JS::Value>> {
+struct Traits<JS::Handle<JS::Value>> : public DefaultTraits<JS::Handle<JS::Value>> {
     static unsigned hash(JS::Handle<JS::Value> const& handle) { return Traits<JS::Value>::hash(handle.value()); }
 };
 
diff --git a/Userland/Libraries/LibJS/Runtime/PropertyKey.h b/Userland/Libraries/LibJS/Runtime/PropertyKey.h
index 9230fed8496..0d0203a908d 100644
--- a/Userland/Libraries/LibJS/Runtime/PropertyKey.h
+++ b/Userland/Libraries/LibJS/Runtime/PropertyKey.h
@@ -195,7 +195,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<JS::PropertyKey> : public GenericTraits<JS::PropertyKey> {
+struct Traits<JS::PropertyKey> : public DefaultTraits<JS::PropertyKey> {
     static unsigned hash(JS::PropertyKey const& name)
     {
         VERIFY(name.is_valid());
diff --git a/Userland/Libraries/LibJS/Runtime/Shape.h b/Userland/Libraries/LibJS/Runtime/Shape.h
index 45a0a4cf181..be591f35637 100644
--- a/Userland/Libraries/LibJS/Runtime/Shape.h
+++ b/Userland/Libraries/LibJS/Runtime/Shape.h
@@ -119,7 +119,7 @@ private:
 }
 
 template<>
-struct AK::Traits<JS::TransitionKey> : public GenericTraits<JS::TransitionKey> {
+struct AK::Traits<JS::TransitionKey> : public DefaultTraits<JS::TransitionKey> {
     static unsigned hash(const JS::TransitionKey& key)
     {
         return pair_int_hash(key.attributes.bits(), Traits<JS::StringOrSymbol>::hash(key.property_key));
diff --git a/Userland/Libraries/LibJS/Runtime/StringOrSymbol.h b/Userland/Libraries/LibJS/Runtime/StringOrSymbol.h
index bb835277537..9d5037d8770 100644
--- a/Userland/Libraries/LibJS/Runtime/StringOrSymbol.h
+++ b/Userland/Libraries/LibJS/Runtime/StringOrSymbol.h
@@ -154,7 +154,7 @@ private:
 }
 
 template<>
-struct AK::Traits<JS::StringOrSymbol> : public GenericTraits<JS::StringOrSymbol> {
+struct AK::Traits<JS::StringOrSymbol> : public DefaultTraits<JS::StringOrSymbol> {
     static unsigned hash(JS::StringOrSymbol const& key)
     {
         return key.hash();
diff --git a/Userland/Libraries/LibJS/Runtime/Value.h b/Userland/Libraries/LibJS/Runtime/Value.h
index 94f3957a4b6..8882799847f 100644
--- a/Userland/Libraries/LibJS/Runtime/Value.h
+++ b/Userland/Libraries/LibJS/Runtime/Value.h
@@ -706,7 +706,7 @@ struct Formatter<JS::Value> : Formatter<StringView> {
 };
 
 template<>
-struct Traits<JS::Value> : GenericTraits<JS::Value> {
+struct Traits<JS::Value> : DefaultTraits<JS::Value> {
     static unsigned hash(JS::Value value) { return Traits<u64>::hash(value.encoded()); }
 };
 
diff --git a/Userland/Libraries/LibLine/KeyCallbackMachine.h b/Userland/Libraries/LibLine/KeyCallbackMachine.h
index bac18789678..a18814b0197 100644
--- a/Userland/Libraries/LibLine/KeyCallbackMachine.h
+++ b/Userland/Libraries/LibLine/KeyCallbackMachine.h
@@ -66,13 +66,13 @@ private:
 namespace AK {
 
 template<>
-struct Traits<Line::Key> : public GenericTraits<Line::Key> {
+struct Traits<Line::Key> : public DefaultTraits<Line::Key> {
     static constexpr bool is_trivial() { return true; }
     static unsigned hash(Line::Key k) { return pair_int_hash(k.key, k.modifiers); }
 };
 
 template<>
-struct Traits<Vector<Line::Key>> : public GenericTraits<Vector<Line::Key>> {
+struct Traits<Vector<Line::Key>> : public DefaultTraits<Vector<Line::Key>> {
     static constexpr bool is_trivial() { return false; }
     static unsigned hash(Vector<Line::Key> const& ks)
     {
diff --git a/Userland/Libraries/LibManual/Node.h b/Userland/Libraries/LibManual/Node.h
index c96fafbddfe..947d8e8ff5a 100644
--- a/Userland/Libraries/LibManual/Node.h
+++ b/Userland/Libraries/LibManual/Node.h
@@ -54,7 +54,7 @@ public:
 namespace AK {
 
 template<typename T>
-requires(IsBaseOf<Manual::Node, T>) struct Traits<T> : public GenericTraits<T> {
+requires(IsBaseOf<Manual::Node, T>) struct Traits<T> : public DefaultTraits<T> {
     static unsigned hash(T p) { return Traits::hash(p.path()); }
 };
 
diff --git a/Userland/Libraries/LibPDF/Fonts/Type1Font.h b/Userland/Libraries/LibPDF/Fonts/Type1Font.h
index 7faa3cf8b96..dedd2b461ef 100644
--- a/Userland/Libraries/LibPDF/Fonts/Type1Font.h
+++ b/Userland/Libraries/LibPDF/Fonts/Type1Font.h
@@ -41,7 +41,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<PDF::Type1GlyphCacheKey> : public GenericTraits<PDF::Type1GlyphCacheKey> {
+struct Traits<PDF::Type1GlyphCacheKey> : public DefaultTraits<PDF::Type1GlyphCacheKey> {
     static unsigned hash(PDF::Type1GlyphCacheKey const& index)
     {
         return pair_int_hash(pair_int_hash(index.glyph_id, (index.subpixel_offset.x << 8) | index.subpixel_offset.y), int_hash(bit_cast<u32>(index.width)));
diff --git a/Userland/Libraries/LibPDF/Renderer.h b/Userland/Libraries/LibPDF/Renderer.h
index 201802af0cf..685e9194fa3 100644
--- a/Userland/Libraries/LibPDF/Renderer.h
+++ b/Userland/Libraries/LibPDF/Renderer.h
@@ -172,7 +172,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<PDF::Renderer::FontCacheKey> : public GenericTraits<PDF::Renderer::FontCacheKey> {
+struct Traits<PDF::Renderer::FontCacheKey> : public DefaultTraits<PDF::Renderer::FontCacheKey> {
     static unsigned hash(PDF::Renderer::FontCacheKey const& key)
     {
         return pair_int_hash(key.font_dictionary_key.hash(), int_hash(bit_cast<u32>(key.font_size)));
diff --git a/Userland/Libraries/LibSyntax/Highlighter.h b/Userland/Libraries/LibSyntax/Highlighter.h
index b9ac566679b..1fa86821035 100644
--- a/Userland/Libraries/LibSyntax/Highlighter.h
+++ b/Userland/Libraries/LibSyntax/Highlighter.h
@@ -149,7 +149,7 @@ private:
 }
 
 template<>
-struct AK::Traits<Syntax::Highlighter::MatchingTokenPair> : public AK::GenericTraits<Syntax::Highlighter::MatchingTokenPair> {
+struct AK::Traits<Syntax::Highlighter::MatchingTokenPair> : public AK::DefaultTraits<Syntax::Highlighter::MatchingTokenPair> {
     static unsigned hash(Syntax::Highlighter::MatchingTokenPair const& pair)
     {
         return pair_int_hash(u64_hash(pair.open), u64_hash(pair.close));
diff --git a/Userland/Libraries/LibVideo/Track.h b/Userland/Libraries/LibVideo/Track.h
index d16ae1c024f..9e7b0b0ae37 100644
--- a/Userland/Libraries/LibVideo/Track.h
+++ b/Userland/Libraries/LibVideo/Track.h
@@ -77,6 +77,6 @@ private:
 }
 
 template<>
-struct AK::Traits<Video::Track> : public GenericTraits<Video::Track> {
+struct AK::Traits<Video::Track> : public DefaultTraits<Video::Track> {
     static unsigned hash(Video::Track const& t) { return t.hash(); }
 };
diff --git a/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h b/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h
index f6ac5f93ad1..18dbe58efd5 100644
--- a/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h
+++ b/Userland/Libraries/LibWasm/AbstractMachine/AbstractMachine.h
@@ -670,7 +670,7 @@ private:
 }
 
 template<>
-struct AK::Traits<Wasm::Linker::Name> : public AK::GenericTraits<Wasm::Linker::Name> {
+struct AK::Traits<Wasm::Linker::Name> : public AK::DefaultTraits<Wasm::Linker::Name> {
     static constexpr bool is_trivial() { return false; }
     static unsigned hash(Wasm::Linker::Name const& entry) { return pair_int_hash(entry.module.hash(), entry.name.hash()); }
     static bool equals(Wasm::Linker::Name const& a, Wasm::Linker::Name const& b) { return a.name == b.name && a.module == b.module; }
diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
index 4856b1bbbec..1900511233d 100644
--- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
+++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
@@ -69,7 +69,7 @@ namespace AK {
 
 // traits for FontFaceKey
 template<>
-struct Traits<Web::CSS::FontFaceKey> : public GenericTraits<Web::CSS::FontFaceKey> {
+struct Traits<Web::CSS::FontFaceKey> : public DefaultTraits<Web::CSS::FontFaceKey> {
     static unsigned hash(Web::CSS::FontFaceKey const& key) { return pair_int_hash(key.family_name.hash(), pair_int_hash(key.weight, key.slope)); }
 };
 
diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.h b/Userland/Libraries/LibWeb/CSS/StyleComputer.h
index 5a0f3ef225c..2145dc006db 100644
--- a/Userland/Libraries/LibWeb/CSS/StyleComputer.h
+++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.h
@@ -250,7 +250,7 @@ private:
 }
 
 template<>
-struct AK::Traits<Web::CSS::StyleComputer::AnimationKey> : public AK::GenericTraits<Web::CSS::StyleComputer::AnimationKey> {
+struct AK::Traits<Web::CSS::StyleComputer::AnimationKey> : public AK::DefaultTraits<Web::CSS::StyleComputer::AnimationKey> {
     static unsigned hash(Web::CSS::StyleComputer::AnimationKey const& k) { return pair_int_hash(ptr_hash(k.source_declaration), ptr_hash(k.element)); }
     static bool equals(Web::CSS::StyleComputer::AnimationKey const& a, Web::CSS::StyleComputer::AnimationKey const& b)
     {
diff --git a/Userland/Libraries/LibWeb/FontCache.h b/Userland/Libraries/LibWeb/FontCache.h
index fedb577193a..536436c9c82 100644
--- a/Userland/Libraries/LibWeb/FontCache.h
+++ b/Userland/Libraries/LibWeb/FontCache.h
@@ -45,7 +45,7 @@ private:
 
 namespace AK {
 template<>
-struct Traits<Web::FontSelector> : public GenericTraits<Web::FontSelector> {
+struct Traits<Web::FontSelector> : public DefaultTraits<Web::FontSelector> {
     static unsigned hash(Web::FontSelector const& key) { return pair_int_hash(pair_int_hash(key.family.hash(), key.weight), key.point_size); }
 };
 }
diff --git a/Userland/Libraries/LibWeb/HTML/CrossOrigin/CrossOriginPropertyDescriptorMap.h b/Userland/Libraries/LibWeb/HTML/CrossOrigin/CrossOriginPropertyDescriptorMap.h
index acd8d8b34f8..e08c05072a4 100644
--- a/Userland/Libraries/LibWeb/HTML/CrossOrigin/CrossOriginPropertyDescriptorMap.h
+++ b/Userland/Libraries/LibWeb/HTML/CrossOrigin/CrossOriginPropertyDescriptorMap.h
@@ -34,7 +34,7 @@ using CrossOriginPropertyDescriptorMap = HashMap<CrossOriginKey, JS::PropertyDes
 namespace AK {
 
 template<>
-struct Traits<Web::HTML::CrossOriginKey> : public GenericTraits<Web::HTML::CrossOriginKey> {
+struct Traits<Web::HTML::CrossOriginKey> : public DefaultTraits<Web::HTML::CrossOriginKey> {
     static unsigned hash(Web::HTML::CrossOriginKey const& key)
     {
         return pair_int_hash(
diff --git a/Userland/Libraries/LibWeb/HTML/ListOfAvailableImages.h b/Userland/Libraries/LibWeb/HTML/ListOfAvailableImages.h
index 3591a395b75..2d555ae95c0 100644
--- a/Userland/Libraries/LibWeb/HTML/ListOfAvailableImages.h
+++ b/Userland/Libraries/LibWeb/HTML/ListOfAvailableImages.h
@@ -57,7 +57,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<Web::HTML::ListOfAvailableImages::Key> : public GenericTraits<Web::HTML::ListOfAvailableImages::Key> {
+struct Traits<Web::HTML::ListOfAvailableImages::Key> : public DefaultTraits<Web::HTML::ListOfAvailableImages::Key> {
     static unsigned hash(Web::HTML::ListOfAvailableImages::Key const& key)
     {
         return key.hash();
diff --git a/Userland/Libraries/LibWeb/HTML/Origin.h b/Userland/Libraries/LibWeb/HTML/Origin.h
index e7b252eddb2..44bcddac02e 100644
--- a/Userland/Libraries/LibWeb/HTML/Origin.h
+++ b/Userland/Libraries/LibWeb/HTML/Origin.h
@@ -122,7 +122,7 @@ private:
 
 namespace AK {
 template<>
-struct Traits<Web::HTML::Origin> : public GenericTraits<Web::HTML::Origin> {
+struct Traits<Web::HTML::Origin> : public DefaultTraits<Web::HTML::Origin> {
     static unsigned hash(Web::HTML::Origin const& origin)
     {
         auto hash_without_host = pair_int_hash(origin.scheme().hash(), origin.port());
diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h
index 032f8e3f394..366c66d8300 100644
--- a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h
+++ b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h
@@ -78,7 +78,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<Web::HTML::ModuleLocationTuple> : public GenericTraits<Web::HTML::ModuleLocationTuple> {
+struct Traits<Web::HTML::ModuleLocationTuple> : public DefaultTraits<Web::HTML::ModuleLocationTuple> {
     static unsigned hash(Web::HTML::ModuleLocationTuple const& tuple)
     {
         return pair_int_hash(tuple.url().to_deprecated_string().hash(), tuple.type().hash());
diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
index e18edbd4276..49e8e8d055c 100644
--- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
+++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
@@ -2470,7 +2470,7 @@ CSSPixels GridFormattingContext::calculate_minimum_contribution(GridItem const&
 
 namespace AK {
 template<>
-struct Traits<Web::Layout::GridPosition> : public GenericTraits<Web::Layout::GridPosition> {
+struct Traits<Web::Layout::GridPosition> : public DefaultTraits<Web::Layout::GridPosition> {
     static unsigned hash(Web::Layout::GridPosition const& key) { return pair_int_hash(key.row, key.column); }
 };
 }
diff --git a/Userland/Libraries/LibWeb/Layout/TableGrid.h b/Userland/Libraries/LibWeb/Layout/TableGrid.h
index 5445b6261f7..231a300edb7 100644
--- a/Userland/Libraries/LibWeb/Layout/TableGrid.h
+++ b/Userland/Libraries/LibWeb/Layout/TableGrid.h
@@ -89,7 +89,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<Web::Layout::TableGrid::GridPosition> : public GenericTraits<Web::Layout::TableGrid::GridPosition> {
+struct Traits<Web::Layout::TableGrid::GridPosition> : public DefaultTraits<Web::Layout::TableGrid::GridPosition> {
     static unsigned hash(Web::Layout::TableGrid::GridPosition const& key)
     {
         return pair_int_hash(key.x, key.y);
diff --git a/Userland/Libraries/LibWeb/Loader/LoadRequest.h b/Userland/Libraries/LibWeb/Loader/LoadRequest.h
index dc49d6502ba..5506de76dc5 100644
--- a/Userland/Libraries/LibWeb/Loader/LoadRequest.h
+++ b/Userland/Libraries/LibWeb/Loader/LoadRequest.h
@@ -88,7 +88,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<Web::LoadRequest> : public GenericTraits<Web::LoadRequest> {
+struct Traits<Web::LoadRequest> : public DefaultTraits<Web::LoadRequest> {
     static unsigned hash(Web::LoadRequest const& request) { return request.hash(); }
 };
 
diff --git a/Userland/Libraries/LibWeb/Painting/TableBordersPainting.cpp b/Userland/Libraries/LibWeb/Painting/TableBordersPainting.cpp
index b03c79203ec..18a2c6e1149 100644
--- a/Userland/Libraries/LibWeb/Painting/TableBordersPainting.cpp
+++ b/Userland/Libraries/LibWeb/Painting/TableBordersPainting.cpp
@@ -23,7 +23,7 @@ struct CellCoordinates {
 
 namespace AK {
 template<>
-struct Traits<CellCoordinates> : public GenericTraits<CellCoordinates> {
+struct Traits<CellCoordinates> : public DefaultTraits<CellCoordinates> {
     static unsigned hash(CellCoordinates const& key) { return pair_int_hash(key.row_index, key.column_index); }
 };
 }
diff --git a/Userland/Libraries/LibWeb/PixelUnits.h b/Userland/Libraries/LibWeb/PixelUnits.h
index 2ccdeacd441..e39172415cc 100644
--- a/Userland/Libraries/LibWeb/PixelUnits.h
+++ b/Userland/Libraries/LibWeb/PixelUnits.h
@@ -462,7 +462,7 @@ template<>
 namespace AK {
 
 template<>
-struct Traits<Web::CSSPixels> : public GenericTraits<Web::CSSPixels> {
+struct Traits<Web::CSSPixels> : public DefaultTraits<Web::CSSPixels> {
     static unsigned hash(Web::CSSPixels const& key)
     {
         return Traits<int>::hash(key.raw_value());
@@ -475,7 +475,7 @@ struct Traits<Web::CSSPixels> : public GenericTraits<Web::CSSPixels> {
 };
 
 template<>
-struct Traits<Web::DevicePixels> : public GenericTraits<Web::DevicePixels> {
+struct Traits<Web::DevicePixels> : public DefaultTraits<Web::DevicePixels> {
     static unsigned hash(Web::DevicePixels const& key)
     {
         return Traits<Web::DevicePixels::Type>::hash(key.value());
diff --git a/Userland/Libraries/LibWebView/CookieJar.h b/Userland/Libraries/LibWebView/CookieJar.h
index 427901d94e0..18ac7ac402e 100644
--- a/Userland/Libraries/LibWebView/CookieJar.h
+++ b/Userland/Libraries/LibWebView/CookieJar.h
@@ -91,7 +91,7 @@ private:
 }
 
 template<>
-struct AK::Traits<WebView::CookieStorageKey> : public AK::GenericTraits<WebView::CookieStorageKey> {
+struct AK::Traits<WebView::CookieStorageKey> : public AK::DefaultTraits<WebView::CookieStorageKey> {
     static unsigned hash(WebView::CookieStorageKey const& key)
     {
         unsigned hash = 0;
diff --git a/Userland/Services/DHCPClient/DHCPv4.h b/Userland/Services/DHCPClient/DHCPv4.h
index 87b6d28abd7..fbc9beee797 100644
--- a/Userland/Services/DHCPClient/DHCPv4.h
+++ b/Userland/Services/DHCPClient/DHCPv4.h
@@ -106,7 +106,7 @@ enum class DHCPMessageType : u8 {
 };
 
 template<>
-struct AK::Traits<DHCPOption> : public GenericTraits<DHCPOption> {
+struct AK::Traits<DHCPOption> : public DefaultTraits<DHCPOption> {
     static constexpr bool is_trivial() { return true; }
     static unsigned hash(DHCPOption u) { return int_hash((u8)u); }
 };
diff --git a/Userland/Services/DeviceMapper/RegisteredDeviceNode.h b/Userland/Services/DeviceMapper/RegisteredDeviceNode.h
index c04eab53fff..ff0ef2a8611 100644
--- a/Userland/Services/DeviceMapper/RegisteredDeviceNode.h
+++ b/Userland/Services/DeviceMapper/RegisteredDeviceNode.h
@@ -34,7 +34,7 @@ private:
 namespace AK {
 
 template<>
-struct Traits<DeviceMapper::RegisteredDeviceNode> : public GenericTraits<DeviceMapper::RegisteredDeviceNode> {
+struct Traits<DeviceMapper::RegisteredDeviceNode> : public DefaultTraits<DeviceMapper::RegisteredDeviceNode> {
     static unsigned hash(DeviceMapper::RegisteredDeviceNode const& node)
     {
         return int_hash(node.minor_number().value());
diff --git a/Userland/Services/RequestServer/ConnectionCache.h b/Userland/Services/RequestServer/ConnectionCache.h
index ec42a2bf972..2cbd3546067 100644
--- a/Userland/Services/RequestServer/ConnectionCache.h
+++ b/Userland/Services/RequestServer/ConnectionCache.h
@@ -111,7 +111,7 @@ struct ConnectionKey {
 };
 
 template<>
-struct AK::Traits<RequestServer::ConnectionCache::ConnectionKey> : public AK::GenericTraits<RequestServer::ConnectionCache::ConnectionKey> {
+struct AK::Traits<RequestServer::ConnectionCache::ConnectionKey> : public AK::DefaultTraits<RequestServer::ConnectionCache::ConnectionKey> {
     static u32 hash(RequestServer::ConnectionCache::ConnectionKey const& key)
     {
         return pair_int_hash(pair_int_hash(key.proxy_data.host_ipv4, key.proxy_data.port), pair_int_hash(key.hostname.hash(), key.port));
diff --git a/Userland/Services/SpiceAgent/ChunkHeader.h b/Userland/Services/SpiceAgent/ChunkHeader.h
index bcf9c21e679..041b1218b7e 100644
--- a/Userland/Services/SpiceAgent/ChunkHeader.h
+++ b/Userland/Services/SpiceAgent/ChunkHeader.h
@@ -39,6 +39,6 @@ private:
 }
 
 template<>
-struct AK::Traits<SpiceAgent::ChunkHeader> : public AK::GenericTraits<SpiceAgent::ChunkHeader> {
+struct AK::Traits<SpiceAgent::ChunkHeader> : public AK::DefaultTraits<SpiceAgent::ChunkHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
diff --git a/Userland/Services/SpiceAgent/MessageHeader.h b/Userland/Services/SpiceAgent/MessageHeader.h
index 41edec8f1a8..7d1806851cc 100644
--- a/Userland/Services/SpiceAgent/MessageHeader.h
+++ b/Userland/Services/SpiceAgent/MessageHeader.h
@@ -48,7 +48,7 @@ private:
 }
 
 template<>
-struct AK::Traits<SpiceAgent::MessageHeader> : public AK::GenericTraits<SpiceAgent::MessageHeader> {
+struct AK::Traits<SpiceAgent::MessageHeader> : public AK::DefaultTraits<SpiceAgent::MessageHeader> {
     static constexpr bool is_trivially_serializable() { return true; }
 };
 
diff --git a/Userland/Services/Taskbar/WindowIdentifier.h b/Userland/Services/Taskbar/WindowIdentifier.h
index 98a52122402..b16e9d36f1d 100644
--- a/Userland/Services/Taskbar/WindowIdentifier.h
+++ b/Userland/Services/Taskbar/WindowIdentifier.h
@@ -37,7 +37,7 @@ private:
 
 namespace AK {
 template<>
-struct Traits<WindowIdentifier> : public GenericTraits<WindowIdentifier> {
+struct Traits<WindowIdentifier> : public DefaultTraits<WindowIdentifier> {
     static unsigned hash(WindowIdentifier const& w) { return pair_int_hash(w.client_id(), w.window_id()); }
 };
 }
diff --git a/Userland/Shell/Shell.h b/Userland/Shell/Shell.h
index dee13616c85..98451ffac32 100644
--- a/Userland/Shell/Shell.h
+++ b/Userland/Shell/Shell.h
@@ -594,7 +594,7 @@ inline size_t find_offset_into_node(StringView unescaped_text, size_t escaped_of
 namespace AK {
 
 template<>
-struct Traits<Shell::Shell::RunnablePath> : public GenericTraits<Shell::Shell::RunnablePath> {
+struct Traits<Shell::Shell::RunnablePath> : public DefaultTraits<Shell::Shell::RunnablePath> {
     static constexpr bool is_trivial() { return false; }
 
     static bool equals(Shell::Shell::RunnablePath const& self, Shell::Shell::RunnablePath const& other)
diff --git a/Userland/Utilities/du.cpp b/Userland/Utilities/du.cpp
index 38d2ddf14b9..6415a3d80aa 100644
--- a/Userland/Utilities/du.cpp
+++ b/Userland/Utilities/du.cpp
@@ -43,7 +43,7 @@ struct VisitedFile {
 };
 
 template<>
-struct AK::Traits<VisitedFile> : public GenericTraits<VisitedFile> {
+struct AK::Traits<VisitedFile> : public DefaultTraits<VisitedFile> {
     static unsigned hash(VisitedFile const& visited_file)
     {
         return pair_int_hash(u64_hash(visited_file.device), u64_hash(visited_file.inode));
diff --git a/Userland/Utilities/sort.cpp b/Userland/Utilities/sort.cpp
index 3f058c06c0f..1d97118302d 100644
--- a/Userland/Utilities/sort.cpp
+++ b/Userland/Utilities/sort.cpp
@@ -41,7 +41,7 @@ private:
 };
 
 template<>
-struct AK::Traits<Line> : public GenericTraits<Line> {
+struct AK::Traits<Line> : public DefaultTraits<Line> {
     static unsigned hash(Line l)
     {
         if (l.numeric)
diff --git a/Userland/Utilities/top.cpp b/Userland/Utilities/top.cpp
index ef09d123f64..19b54320f1c 100644
--- a/Userland/Utilities/top.cpp
+++ b/Userland/Utilities/top.cpp
@@ -78,7 +78,7 @@ struct PidAndTid {
 
 namespace AK {
 template<>
-struct Traits<PidAndTid> : public GenericTraits<PidAndTid> {
+struct Traits<PidAndTid> : public DefaultTraits<PidAndTid> {
     static unsigned hash(PidAndTid const& value) { return pair_int_hash(value.pid, value.tid); }
 };
 }