diff --git a/internal/files/files.go b/internal/files/files.go
index 0b9154a..b880ab7 100644
--- a/internal/files/files.go
+++ b/internal/files/files.go
@@ -235,6 +235,7 @@ func ListNewSnapshots() ([]SnapshotInfo, error) {
 
 		for _, entry := range entries {
 			if !entry.IsDir() && strings.HasSuffix(entry.Name(), ".snap.new") {
+				// Remove .snap.new extension to get the title
 				name := strings.TrimSuffix(entry.Name(), ".snap.new")
 				fullPath := filepath.Join(dir, entry.Name())
 				newSnapshots = append(newSnapshots, SnapshotInfo{
diff --git a/internal/pretty/__snapshots__/diff_box_complex_mixed.snap b/internal/pretty/__snapshots__/diff_box_complex_mixed.snap
index 045c024..a1136e0 100644
--- a/internal/pretty/__snapshots__/diff_box_complex_mixed.snap
+++ b/internal/pretty/__snapshots__/diff_box_complex_mixed.snap
@@ -8,7 +8,7 @@ version: 0.1.0
 
   title: Visual Complex
   test: TestVisualComplex
-  file: testvisualcomplex.snap
+  file: visual_complex.snap
 
 ──────┬─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
     1 │ unchanged1
diff --git a/internal/pretty/__snapshots__/diff_box_large_line_numbers.snap b/internal/pretty/__snapshots__/diff_box_large_line_numbers.snap
index 2787df0..a458842 100644
--- a/internal/pretty/__snapshots__/diff_box_large_line_numbers.snap
+++ b/internal/pretty/__snapshots__/diff_box_large_line_numbers.snap
@@ -8,7 +8,7 @@ version: 0.1.0
 
   title: Large Line Numbers
   test: TestVisualLarge
-  file: testvisuallarge.snap
+  file: large_line_numbers.snap
 
 ──────────┬─────────────────────────────────────────────────────────────────────────────────────────────────────────────────
         1 │ line 1
diff --git a/internal/pretty/__snapshots__/diff_box_simple_modification.snap b/internal/pretty/__snapshots__/diff_box_simple_modification.snap
index 25a8eb5..285fec4 100644
--- a/internal/pretty/__snapshots__/diff_box_simple_modification.snap
+++ b/internal/pretty/__snapshots__/diff_box_simple_modification.snap
@@ -8,7 +8,7 @@ version: 0.1.0
 
   title: Visual Test
   test: TestVisualSimple
-  file: testvisualsimple.snap
+  file: visual_test.snap
 
 ──────┬─────────────────────────────────────────────────────────────────────────────────────────────────
     1 │ line1
diff --git a/internal/pretty/boxes.go b/internal/pretty/boxes.go
index 87bef66..1786e1d 100644
--- a/internal/pretty/boxes.go
+++ b/internal/pretty/boxes.go
@@ -33,7 +33,7 @@ func formatColoredLine(line string, kind diff.DiffKind) string {
 
 func DiffSnapshotBox(old, newSnapshot *files.Snapshot, diffLines []diff.DiffLine) string {
 	width := TerminalWidth()
-	snapshotFileName := files.SnapshotFileName(newSnapshot.Test) + ".snap"
+	snapshotFileName := files.SnapshotFileName(newSnapshot.Title) + ".snap"
 
 	var sb strings.Builder
 	sb.WriteString("─── " + "Snapshot Diff " + strings.Repeat("─", width-15) + "\n\n")
diff --git a/internal/pretty/boxes_test.go b/internal/pretty/boxes_test.go
index d9f8957..d74f5f0 100644
--- a/internal/pretty/boxes_test.go
+++ b/internal/pretty/boxes_test.go
@@ -197,7 +197,7 @@ func TestDiffSnapshotBox_SimpleModification(t *testing.T) {
 	validation := BoxValidation{
 		Title:           "Simple Modification",
 		TestName:        "TestSimple",
-		FileName:        "testsimple.snap",
+		FileName:        "simple_modification.snap",
 		HasTitle:        true,
 		HasTestName:     true,
 		HasFileName:     true,
@@ -239,7 +239,7 @@ func TestDiffSnapshotBox_PureAddition(t *testing.T) {
 	validation := BoxValidation{
 		Title:           "Pure Addition",
 		TestName:        "TestAddition",
-		FileName:        "testaddition.snap",
+		FileName:        "pure_addition.snap",
 		HasTitle:        true,
 		HasTestName:     true,
 		HasFileName:     true,
@@ -281,7 +281,7 @@ func TestDiffSnapshotBox_PureDeletion(t *testing.T) {
 	validation := BoxValidation{
 		Title:           "Pure Deletion",
 		TestName:        "TestDeletion",
-		FileName:        "testdeletion.snap",
+		FileName:        "pure_deletion.snap",
 		HasTitle:        true,
 		HasTestName:     true,
 		HasFileName:     true,
@@ -334,7 +334,7 @@ add2`
 	validation := BoxValidation{
 		Title:           "Complex Mixed",
 		TestName:        "TestComplexMixed",
-		FileName:        "testcomplexmixed.snap",
+		FileName:        "complex_mixed.snap",
 		HasTitle:        true,
 		HasTestName:     true,
 		HasFileName:     true,
@@ -376,7 +376,7 @@ func TestDiffSnapshotBox_EmptyOld(t *testing.T) {
 	validation := BoxValidation{
 		Title:           "Empty to Content",
 		TestName:        "TestEmptyOld",
-		FileName:        "testemptyold.snap",
+		FileName:        "empty_to_content.snap",
 		HasTitle:        true,
 		HasTestName:     true,
 		HasFileName:     true,
@@ -418,7 +418,7 @@ func TestDiffSnapshotBox_EmptyNew(t *testing.T) {
 	validation := BoxValidation{
 		Title:           "Content to Empty",
 		TestName:        "TestEmptyNew",
-		FileName:        "testemptynew.snap",
+		FileName:        "content_to_empty.snap",
 		HasTitle:        true,
 		HasTestName:     true,
 		HasFileName:     true,
@@ -468,7 +468,8 @@ func TestDiffSnapshotBox_NoTitle(t *testing.T) {
 	if !strings.Contains(stripped, "test: TestNoTitle") {
 		t.Error("Expected test name to be present")
 	}
-	if !strings.Contains(stripped, "file: testnotitle.snap") {
+	// When title is empty, filename should be based on test name
+	if !strings.Contains(stripped, "file: .snap") {
 		t.Error("Expected file name to be present")
 	}
 }
@@ -574,7 +575,7 @@ func TestDiffSnapshotBox_UnicodeContent(t *testing.T) {
 	validation := BoxValidation{
 		Title:           "Unicode Test",
 		TestName:        "TestUnicode",
-		FileName:        "testunicode.snap",
+		FileName:        "unicode_test.snap",
 		HasTitle:        true,
 		HasTestName:     true,
 		HasFileName:     true,