diff --git a/static/app/components/events/styles.tsx b/static/app/components/events/dataSection.tsx
similarity index 100%
rename from static/app/components/events/styles.tsx
rename to static/app/components/events/dataSection.tsx
diff --git a/static/app/components/events/eventDataSection.tsx b/static/app/components/events/eventDataSection.tsx
index 46a5e2eaf22515..3262e0035cd553 100644
--- a/static/app/components/events/eventDataSection.tsx
+++ b/static/app/components/events/eventDataSection.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled';
 
 import {ExternalLink} from '@sentry/scraps/link';
 
-import {DataSection} from 'sentry/components/events/styles';
+import {DataSection} from 'sentry/components/events/dataSection';
 import {QuestionTooltip} from 'sentry/components/questionTooltip';
 import {IconLink} from 'sentry/icons';
 
diff --git a/static/app/components/events/eventProcessingErrors.spec.tsx b/static/app/components/events/eventProcessingErrors.spec.tsx
index 668c55b32d5cdb..d9f11debc30c93 100644
--- a/static/app/components/events/eventProcessingErrors.spec.tsx
+++ b/static/app/components/events/eventProcessingErrors.spec.tsx
@@ -7,7 +7,7 @@ import {
   DOCS_URLS,
   EventProcessingErrors,
 } from 'sentry/components/events/eventProcessingErrors';
-import type {ErrorMessage} from 'sentry/components/events/interfaces/crashContent/exception/actionableItems';
+import type {ErrorMessage} from 'sentry/components/events/interfaces/crashContent/exception/errorMessages';
 
 jest.mock(
   'sentry/components/events/interfaces/crashContent/exception/useActionableItems',
diff --git a/static/app/components/events/eventProcessingErrors.tsx b/static/app/components/events/eventProcessingErrors.tsx
index 524ba7079f9b6f..229c595eacd44b 100644
--- a/static/app/components/events/eventProcessingErrors.tsx
+++ b/static/app/components/events/eventProcessingErrors.tsx
@@ -5,7 +5,7 @@ import moment from 'moment-timezone';
 import {Flex} from '@sentry/scraps/layout';
 import {ExternalLink} from '@sentry/scraps/link';
 
-import type {ErrorMessage} from 'sentry/components/events/interfaces/crashContent/exception/actionableItems';
+import type {ErrorMessage} from 'sentry/components/events/interfaces/crashContent/exception/errorMessages';
 import {useActionableItemsWithProguardErrors} from 'sentry/components/events/interfaces/crashContent/exception/useActionableItems';
 import {KeyValueData} from 'sentry/components/keyValueData';
 import {QuestionTooltip} from 'sentry/components/questionTooltip';
diff --git a/static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx b/static/app/components/events/interfaces/crashContent/exception/errorMessages.tsx
similarity index 100%
rename from static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx
rename to static/app/components/events/interfaces/crashContent/exception/errorMessages.tsx
diff --git a/static/app/components/events/interfaces/crashContent/exception/useActionableItems.tsx b/static/app/components/events/interfaces/crashContent/exception/useActionableItems.tsx
index 737a9c8a1bf9fe..540c16e1ad0ba0 100644
--- a/static/app/components/events/interfaces/crashContent/exception/useActionableItems.tsx
+++ b/static/app/components/events/interfaces/crashContent/exception/useActionableItems.tsx
@@ -1,11 +1,11 @@
-import {
-  getErrorMessage,
-  type ErrorMessage,
-} from 'sentry/components/events/interfaces/crashContent/exception/actionableItems';
 import {
   shouldErrorBeShown,
   useFetchProguardMappingFiles,
 } from 'sentry/components/events/interfaces/crashContent/exception/actionableItemsUtils';
+import {
+  getErrorMessage,
+  type ErrorMessage,
+} from 'sentry/components/events/interfaces/crashContent/exception/errorMessages';
 import type {Event} from 'sentry/types/event';
 import type {Project} from 'sentry/types/project';
 import {defined} from 'sentry/utils';
diff --git a/static/app/components/group/inboxBadges/statusBadge.tsx b/static/app/components/group/inboxBadges/getBadgeProperties.tsx
similarity index 100%
rename from static/app/components/group/inboxBadges/statusBadge.tsx
rename to static/app/components/group/inboxBadges/getBadgeProperties.tsx
diff --git a/static/app/components/resolutionBox.tsx b/static/app/components/resolutionReason.tsx
similarity index 100%
rename from static/app/components/resolutionBox.tsx
rename to static/app/components/resolutionReason.tsx
diff --git a/static/app/components/stream/group.tsx b/static/app/components/stream/group.tsx
index beda07ed787d5e..95aa6e88bb8e17 100644
--- a/static/app/components/stream/group.tsx
+++ b/static/app/components/stream/group.tsx
@@ -14,7 +14,7 @@ import {GuideAnchor} from 'sentry/components/assistant/guideAnchor';
 import {GroupStatusChart} from 'sentry/components/charts/groupStatusChart';
 import {Count} from 'sentry/components/count';
 import {AssigneeSelector} from 'sentry/components/group/assigneeSelector';
-import {getBadgeProperties} from 'sentry/components/group/inboxBadges/statusBadge';
+import {getBadgeProperties} from 'sentry/components/group/inboxBadges/getBadgeProperties';
 import {GroupHeaderRow} from 'sentry/components/groupHeaderRow';
 import {GroupMetaRow} from 'sentry/components/groupMetaRow';
 import type {GroupListColumn} from 'sentry/components/issues/groupList';
diff --git a/static/app/views/discover/table/quickContext/releaseContext.tsx b/static/app/views/discover/table/quickContext/releaseContext.tsx
index 618d3b5b2335b1..47d13ad00dd6a0 100644
--- a/static/app/views/discover/table/quickContext/releaseContext.tsx
+++ b/static/app/views/discover/table/quickContext/releaseContext.tsx
@@ -5,7 +5,7 @@ import {useQuery} from '@tanstack/react-query';
 import {AvatarList} from '@sentry/scraps/avatar';
 
 import {QuickContextCommitRow} from 'sentry/components/discover/quickContextCommitRow';
-import {DataSection} from 'sentry/components/events/styles';
+import {DataSection} from 'sentry/components/events/dataSection';
 import {Panel} from 'sentry/components/panels/panel';
 import {TimeSince} from 'sentry/components/timeSince';
 import {IconNot} from 'sentry/icons';
diff --git a/static/app/views/issueDetails/actions/index.tsx b/static/app/views/issueDetails/actions/index.tsx
index f5dc4ab279bac3..d46f125e8b2e90 100644
--- a/static/app/views/issueDetails/actions/index.tsx
+++ b/static/app/views/issueDetails/actions/index.tsx
@@ -21,7 +21,7 @@ import {ResolveActions} from 'sentry/components/actions/resolve';
 import {renderArchiveReason} from 'sentry/components/archivedBox';
 import {openConfirmModal} from 'sentry/components/confirm';
 import {DropdownMenu} from 'sentry/components/dropdownMenu';
-import {ResolutionReason} from 'sentry/components/resolutionBox';
+import {ResolutionReason} from 'sentry/components/resolutionReason';
 import {
   IconCheckmark,
   IconEllipsis,
diff --git a/static/app/views/issueDetails/streamline/header/header.tsx b/static/app/views/issueDetails/streamline/header/header.tsx
index 09f8987e28a320..4fe2936b69865b 100644
--- a/static/app/views/issueDetails/streamline/header/header.tsx
+++ b/static/app/views/issueDetails/streamline/header/header.tsx
@@ -15,7 +15,7 @@ import {ErrorBoundary} from 'sentry/components/errorBoundary';
 import {EventMessage} from 'sentry/components/events/eventMessage';
 import {FeedbackButton} from 'sentry/components/feedbackButton/feedbackButton';
 import {useFeedbackSDKIntegration} from 'sentry/components/feedbackButton/useFeedbackSDKIntegration';
-import {getBadgeProperties} from 'sentry/components/group/inboxBadges/statusBadge';
+import {getBadgeProperties} from 'sentry/components/group/inboxBadges/getBadgeProperties';
 import {UnhandledTag} from 'sentry/components/group/inboxBadges/unhandledTag';
 import {TourElement} from 'sentry/components/tours/components';
 import {MAX_PICKABLE_DAYS} from 'sentry/constants';
diff --git a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
index dbeab032e8d23b..197e960fdcc415 100644
--- a/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
+++ b/static/app/views/performance/newTraceDetails/traceDrawer/details/styles.tsx
@@ -17,9 +17,9 @@ import {
   type DropdownMenuProps,
   type MenuItemProps,
 } from 'sentry/components/dropdownMenu';
+import {DataSection} from 'sentry/components/events/dataSection';
 import {EventTagsDataSection} from 'sentry/components/events/eventTagsAndScreenshot/tags';
 import {generateStats} from 'sentry/components/events/opsBreakdown';
-import {DataSection} from 'sentry/components/events/styles';
 import ProjectBadge from 'sentry/components/idBadge/projectBadge';
 import {
   CardPanel,