diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITopBarTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIAppTopBarTest.kt
similarity index 99%
rename from tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITopBarTest.kt
rename to tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIAppTopBarTest.kt
index cc7649aa..9ab85900 100644
--- a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUITopBarTest.kt
+++ b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/TUIAppTopBarTest.kt
@@ -22,7 +22,7 @@ import org.junit.Test
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 
-class TUITopBarTest {
+class TUIAppTopBarTest {
   @get:Rule val composeTestRule = createComposeRule()
 
   private val navigationIconTags = TUIIconButtonTags(parentTag = "NavigationIcon")
diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUITopBarScreenShotTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIAppTopBarScreenShotTest.kt
similarity index 97%
rename from tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUITopBarScreenShotTest.kt
rename to tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIAppTopBarScreenShotTest.kt
index 24281d62..3fd62af2 100644
--- a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUITopBarScreenShotTest.kt
+++ b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIAppTopBarScreenShotTest.kt
@@ -12,7 +12,7 @@ import org.junit.runners.Parameterized
 
 @OptIn(ExperimentalMaterial3Api::class)
 @RunWith(Parameterized::class)
-class TUITopBarScreenShotTest(
+class TUIAppTopBarScreenShotTest(
   private val testName: String,
   private val darkTheme: Boolean
 ) : ComposeScreenshotComparator() {
diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIThumbnailScreenShotTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMediaThumbnailScreenShotTest.kt
similarity index 98%
rename from tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIThumbnailScreenShotTest.kt
rename to tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMediaThumbnailScreenShotTest.kt
index 770339e8..2088a9df 100644
--- a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIThumbnailScreenShotTest.kt
+++ b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMediaThumbnailScreenShotTest.kt
@@ -15,7 +15,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(Parameterized::class)
-class TUIThumbnailScreenShotTest(
+class TUIMediaThumbnailScreenShotTest(
   private val showTrailingIcon: Boolean,
   private val thumbnailSize: TUIMediaThumbnailSize,
   private val testName: String,
diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileFooterScreenShotTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileOverlayFooterScreenShotTest.kt
similarity index 97%
rename from tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileFooterScreenShotTest.kt
rename to tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileOverlayFooterScreenShotTest.kt
index f487ce74..c1ea550f 100644
--- a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileFooterScreenShotTest.kt
+++ b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileOverlayFooterScreenShotTest.kt
@@ -11,7 +11,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(Parameterized::class)
-class TUIMobileFooterScreenShotTest(
+class TUIMobileOverlayFooterScreenShotTest(
   private val showMiddleDismiss: Boolean,
   private val showLeftArrow: Boolean,
   private val showRightArrow: Boolean,
diff --git a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileOverlayScreenShotTest.kt b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileOverlayHeaderScreenShotTest.kt
similarity index 97%
rename from tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileOverlayScreenShotTest.kt
rename to tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileOverlayHeaderScreenShotTest.kt
index 3c1d1a5e..63805d6d 100644
--- a/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileOverlayScreenShotTest.kt
+++ b/tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIMobileOverlayHeaderScreenShotTest.kt
@@ -15,7 +15,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
 
 @RunWith(Parameterized::class)
-class TUIMobileOverlayScreenShotTest(
+class TUIMobileOverlayHeaderScreenShotTest(
   private val testName: String,
   private val darkTheme: Boolean
 ) : ComposeScreenshotComparator() {