diff --git a/screen/screenDoubleHiRes.go b/screen/doubleHiRes.go
similarity index 100%
rename from screen/screenDoubleHiRes.go
rename to screen/doubleHiRes.go
diff --git a/screen/screenHiRes.go b/screen/hiRes.go
similarity index 100%
rename from screen/screenHiRes.go
rename to screen/hiRes.go
diff --git a/screen/screenHiRes_test.go b/screen/hiRes_test.go
similarity index 100%
rename from screen/screenHiRes_test.go
rename to screen/hiRes_test.go
diff --git a/screen/screenLoRes.go b/screen/loRes.go
similarity index 100%
rename from screen/screenLoRes.go
rename to screen/loRes.go
diff --git a/screen/screenNtscFilter.go b/screen/ntscFilter.go
similarity index 100%
rename from screen/screenNtscFilter.go
rename to screen/ntscFilter.go
diff --git a/screen/screen.go b/screen/snapshots.go
similarity index 100%
rename from screen/screen.go
rename to screen/snapshots.go
diff --git a/screen/screenDebugParts.go b/screen/snapshotsDebug.go
similarity index 100%
rename from screen/screenDebugParts.go
rename to screen/snapshotsDebug.go
diff --git a/screen/screenSuperHiRes.go b/screen/superHiRes.go
similarity index 100%
rename from screen/screenSuperHiRes.go
rename to screen/superHiRes.go
diff --git a/screen/screenText.go b/screen/text.go
similarity index 100%
rename from screen/screenText.go
rename to screen/text.go
diff --git a/screen/screenText_test.go b/screen/text_test.go
similarity index 100%
rename from screen/screenText_test.go
rename to screen/text_test.go