diff --git a/.gitignore b/.gitignore
index c6df7f808..2622fa6b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ Example/ReferenceImages/**/*.png
 !.claude/commands/
 .docs
 gh-pages
+.swift_pd_guess
+.claude/commands/guess_filename.md
\ No newline at end of file
diff --git a/Sources/OpenSwiftUICore/Data/Codable/CodableProxy.swift b/Sources/OpenSwiftUICore/Data/Codable/CodableHelpers.swift
similarity index 99%
rename from Sources/OpenSwiftUICore/Data/Codable/CodableProxy.swift
rename to Sources/OpenSwiftUICore/Data/Codable/CodableHelpers.swift
index 20ba41c6b..83574fca5 100644
--- a/Sources/OpenSwiftUICore/Data/Codable/CodableProxy.swift
+++ b/Sources/OpenSwiftUICore/Data/Codable/CodableHelpers.swift
@@ -1,10 +1,10 @@
 //
-//  CodableProxy.swift
+//  CodableHelpers.swift
 //  OpenSwiftUICore
 //
 //  Audited for 6.5.4
 //  Status: Complete
-//  ID: A66FCB65C49D586C0CA23AF611BF2C2B (SwiftUICore?)
+//  ID: A66FCB65C49D586C0CA23AF611BF2C2B (SwiftUICore)
 
 package import Foundation
 
diff --git a/Sources/OpenSwiftUICore/Event/Responder/ContentPathObservers.swift b/Sources/OpenSwiftUICore/Event/Responder/LeafViewResponder.swift
similarity index 91%
rename from Sources/OpenSwiftUICore/Event/Responder/ContentPathObservers.swift
rename to Sources/OpenSwiftUICore/Event/Responder/LeafViewResponder.swift
index 9ca614620..e8cf64015 100644
--- a/Sources/OpenSwiftUICore/Event/Responder/ContentPathObservers.swift
+++ b/Sources/OpenSwiftUICore/Event/Responder/LeafViewResponder.swift
@@ -1,9 +1,10 @@
 //
-//  ContentPathObservers.swift
+//  LeafViewResponder.swift
 //  OpenSwiftUICore
 //
-//  Status: Complete
-//  ID: A7CB304DFEF7D87240811B051B15E2CD (SwiftUICore?)
+//  Audited for 6.5.4
+//  Status: WIP
+//  ID: A7CB304DFEF7D87240811B051B15E2CD (SwiftUICore)
 
 struct ContentPathObservers {
     private struct Observer {
diff --git a/Sources/OpenSwiftUICore/Event/Responder/MultiViewResponder.swift b/Sources/OpenSwiftUICore/Event/Responder/MultiViewResponder.swift
index b10d3fb1d..1018b566d 100644
--- a/Sources/OpenSwiftUICore/Event/Responder/MultiViewResponder.swift
+++ b/Sources/OpenSwiftUICore/Event/Responder/MultiViewResponder.swift
@@ -3,7 +3,7 @@
 //  OpenSwiftUICore
 //
 //  Status: Blocked by children.setter
-//  ID: 4A74C6B0E69BD6BC864CC77E33CF2D28 (SwiftUICore?)
+//  ID: 4A74C6B0E69BD6BC864CC77E33CF2D28 (SwiftUICore)
 
 public import Foundation
 
diff --git a/Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutComputer.swift b/Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutView.swift
similarity index 99%
rename from Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutComputer.swift
rename to Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutView.swift
index 84a8f31fb..2c3315f76 100644
--- a/Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutComputer.swift
+++ b/Sources/OpenSwiftUICore/Layout/LayoutComputer/UnaryLayoutView.swift
@@ -1,10 +1,10 @@
 //
-//  UnaryLayoutComputer.swift
+//  UnaryLayoutView.swift
 //  OpenSwiftUICore
 //
 //  Audited for 6.5.4
 //  Status: Complete
-//  ID: 1C3B77B617AD058A6802F719E38F5D79 (SwiftUICore?)
+//  ID: 1C3B77B617AD058A6802F719E38F5D79 (SwiftUICore)
 
 import Foundation
 package import OpenAttributeGraphShims
diff --git a/Sources/OpenSwiftUICore/View/Input/ViewListView.swift b/Sources/OpenSwiftUICore/View/Input/ViewListContent.swift
similarity index 98%
rename from Sources/OpenSwiftUICore/View/Input/ViewListView.swift
rename to Sources/OpenSwiftUICore/View/Input/ViewListContent.swift
index 097ffb98e..9bc763255 100644
--- a/Sources/OpenSwiftUICore/View/Input/ViewListView.swift
+++ b/Sources/OpenSwiftUICore/View/Input/ViewListContent.swift
@@ -1,11 +1,11 @@
 //
-//  ViewListView.swift
+//  ViewListContent.swift
 //  OpenSwiftUICore
 //
 //  Audited for 6.5.4
 //  Status: Complete
-//  ID: 52A2FFECFBCF37BFFEED558E33EBD1E3 (SwiftUI?)
-//  ID: 9B09D1820E97ECBB666F7560EA2A2D2C (SwiftUICore?)
+//  ID: 52A2FFECFBCF37BFFEED558E33EBD1E3 (SwiftUI)
+//  ID: 9B09D1820E97ECBB666F7560EA2A2D2C (SwiftUICore)
 
 package import OpenAttributeGraphShims
 
diff --git a/Sources/OpenSwiftUICore/View/Text/Font/CustomFont.swift b/Sources/OpenSwiftUICore/View/Text/Font/CustomFont.swift
new file mode 100644
index 000000000..38f828ca9
--- /dev/null
+++ b/Sources/OpenSwiftUICore/View/Text/Font/CustomFont.swift
@@ -0,0 +1,6 @@
+//
+//  CustomFont.swift
+//  OpenSwiftUICore
+//
+//  Status: TODO
+//  ID: A1A6E08ED7787270EADAD2AE750791A9 (SwiftUICore)
diff --git a/Sources/OpenSwiftUICore/View/Text/Font/NamedFont.swift b/Sources/OpenSwiftUICore/View/Text/Font/NamedFont.swift
deleted file mode 100644
index 7ef69401c..000000000
--- a/Sources/OpenSwiftUICore/View/Text/Font/NamedFont.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-//  NamedFont.swift
-//  OpenSwiftUICore
-//
-//  Status: TODO
-//  ID: A1A6E08ED7787270EADAD2AE750791A9 (SwiftUICore?)
diff --git a/Sources/OpenSwiftUICore/View/Text/Text/Text+Text.swift b/Sources/OpenSwiftUICore/View/Text/Text/Text+Concatenation.swift
similarity index 95%
rename from Sources/OpenSwiftUICore/View/Text/Text/Text+Text.swift
rename to Sources/OpenSwiftUICore/View/Text/Text/Text+Concatenation.swift
index 84a300bc5..44691bb65 100644
--- a/Sources/OpenSwiftUICore/View/Text/Text/Text+Text.swift
+++ b/Sources/OpenSwiftUICore/View/Text/Text/Text+Concatenation.swift
@@ -1,10 +1,10 @@
 //
-//  Text+Text.swift
+//  Text+Concatenation.swift
 //  OpenSwiftUICore
 //
 //  Audited for 6.5.4
 //  Status: Complete
-//  ID: 3AC20F2C4A28F04412970732648A1058 (SwiftUICore?)
+//  ID: 3AC20F2C4A28F04412970732648A1058 (SwiftUICore)
 
 // MARK: - Text + Text
 
diff --git a/Sources/OpenSwiftUICore/View/Text/Util/TruncationMode.swift b/Sources/OpenSwiftUICore/View/Text/Util/EnvironmentParagraphStyle.swift
similarity index 99%
rename from Sources/OpenSwiftUICore/View/Text/Util/TruncationMode.swift
rename to Sources/OpenSwiftUICore/View/Text/Util/EnvironmentParagraphStyle.swift
index bd1c8c5f1..b63fb4417 100644
--- a/Sources/OpenSwiftUICore/View/Text/Util/TruncationMode.swift
+++ b/Sources/OpenSwiftUICore/View/Text/Util/EnvironmentParagraphStyle.swift
@@ -1,10 +1,10 @@
 //
-//  TruncationMode.swift
+//  EnvironmentParagraphStyle.swift
 //  OpenSwiftUICore
 //
 //  Audited for 6.5.4
 //  Status: Complete
-//  ID: 52803FDE2123C3846E0286DE7934BA01 (SwiftUICore?)
+//  ID: 52803FDE2123C3846E0286DE7934BA01 (SwiftUICore)
 
 public import Foundation
 
diff --git a/Sources/OpenSwiftUICore/View/Text/Util/WatchDisplayVariant.swift b/Sources/OpenSwiftUICore/View/Text/Util/WatchEnvironment.swift
similarity index 96%
rename from Sources/OpenSwiftUICore/View/Text/Util/WatchDisplayVariant.swift
rename to Sources/OpenSwiftUICore/View/Text/Util/WatchEnvironment.swift
index 688c39d03..6ddd0d8f4 100644
--- a/Sources/OpenSwiftUICore/View/Text/Util/WatchDisplayVariant.swift
+++ b/Sources/OpenSwiftUICore/View/Text/Util/WatchEnvironment.swift
@@ -1,10 +1,10 @@
 //
-//  WatchDisplayVariant.swift
+//  WatchEnvironment.swift
 //  OpenSwiftUICore
 //
 //  Audited for 6.5.4
 //  Status: Complete
-//  ID: 1DA60AC25654F83E54CB649774D3C2D4 (SwiftUICore?)
+//  ID: 1DA60AC25654F83E54CB649774D3C2D4 (SwiftUICore)
 
 @available(iOS, unavailable)
 @available(macOS, unavailable)