diff --git a/static/app/components/feedback/feedbackItem/feedbackShortId.tsx b/static/app/components/feedback/feedbackItem/feedbackShortId.tsx
index b3b786c6428211..03f10331ca78a4 100644
--- a/static/app/components/feedback/feedbackItem/feedbackShortId.tsx
+++ b/static/app/components/feedback/feedbackItem/feedbackShortId.tsx
@@ -13,7 +13,7 @@ import {t} from 'sentry/locale';
 import type {FeedbackIssue} from 'sentry/utils/feedback/types';
 import useCopyToClipboard from 'sentry/utils/useCopyToClipboard';
 import useOrganization from 'sentry/utils/useOrganization';
-import {makeFeedbackPathname} from 'sentry/views/userFeedback/pathnames';
+import {makeFeedbackPathname} from 'sentry/views/feedback/pathnames';
 
 interface Props {
   feedbackItem: FeedbackIssue;
diff --git a/static/app/components/feedback/list/feedbackListItem.tsx b/static/app/components/feedback/list/feedbackListItem.tsx
index de7dc3781fb3b4..058ef43062b2a9 100644
--- a/static/app/components/feedback/list/feedbackListItem.tsx
+++ b/static/app/components/feedback/list/feedbackListItem.tsx
@@ -22,7 +22,7 @@ import useReplayCountForFeedbacks from 'sentry/utils/replayCount/useReplayCountF
 import useLocationQuery from 'sentry/utils/url/useLocationQuery';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
-import {makeFeedbackPathname} from 'sentry/views/userFeedback/pathnames';
+import {makeFeedbackPathname} from 'sentry/views/feedback/pathnames';
 
 interface Props {
   feedbackItem: FeedbackIssueListItem;
diff --git a/static/app/components/feedback/useDeleteFeedback.tsx b/static/app/components/feedback/useDeleteFeedback.tsx
index b1269227428d4b..985184a299b194 100644
--- a/static/app/components/feedback/useDeleteFeedback.tsx
+++ b/static/app/components/feedback/useDeleteFeedback.tsx
@@ -10,7 +10,7 @@ import useApi from 'sentry/utils/useApi';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
-import {makeFeedbackPathname} from 'sentry/views/userFeedback/pathnames';
+import {makeFeedbackPathname} from 'sentry/views/feedback/pathnames';
 
 export const useDeleteFeedback = (feedbackIds: any, projectId: any) => {
   const organization = useOrganization();
diff --git a/static/app/components/feedback/useRedirectToFeedbackFromEvent.tsx b/static/app/components/feedback/useRedirectToFeedbackFromEvent.tsx
index da88fec4c718e5..798acae4ad6c4c 100644
--- a/static/app/components/feedback/useRedirectToFeedbackFromEvent.tsx
+++ b/static/app/components/feedback/useRedirectToFeedbackFromEvent.tsx
@@ -6,7 +6,7 @@ import {decodeScalar} from 'sentry/utils/queryString';
 import useLocationQuery from 'sentry/utils/url/useLocationQuery';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import useOrganization from 'sentry/utils/useOrganization';
-import {makeFeedbackPathname} from 'sentry/views/userFeedback/pathnames';
+import {makeFeedbackPathname} from 'sentry/views/feedback/pathnames';
 
 export default function useRedirectToFeedbackFromEvent() {
   const organization = useOrganization();
diff --git a/static/app/components/replays/breadcrumbs/breadcrumbIssueLink.tsx b/static/app/components/replays/breadcrumbs/breadcrumbIssueLink.tsx
index 98a6bc4446a884..471be01a4d19e7 100644
--- a/static/app/components/replays/breadcrumbs/breadcrumbIssueLink.tsx
+++ b/static/app/components/replays/breadcrumbs/breadcrumbIssueLink.tsx
@@ -8,7 +8,7 @@ import type {ErrorFrame, FeedbackFrame, ReplayFrame} from 'sentry/utils/replays/
 import {isErrorFrame, isFeedbackFrame} from 'sentry/utils/replays/types';
 import useOrganization from 'sentry/utils/useOrganization';
 import useProjectFromSlug from 'sentry/utils/useProjectFromSlug';
-import {makeFeedbackPathname} from 'sentry/views/userFeedback/pathnames';
+import {makeFeedbackPathname} from 'sentry/views/feedback/pathnames';
 
 interface Props {
   frame: ReplayFrame;
diff --git a/static/app/views/alerts/rules/issue/details/issuesList.tsx b/static/app/views/alerts/rules/issue/details/issuesList.tsx
index 46ea07d8f3d9da..e0d7c85e737a2c 100644
--- a/static/app/views/alerts/rules/issue/details/issuesList.tsx
+++ b/static/app/views/alerts/rules/issue/details/issuesList.tsx
@@ -18,7 +18,7 @@ import {getMessage, getTitle} from 'sentry/utils/events';
 import type {FeedbackIssue} from 'sentry/utils/feedback/types';
 import {useApiQuery} from 'sentry/utils/queryClient';
 import useOrganization from 'sentry/utils/useOrganization';
-import {makeFeedbackPathname} from 'sentry/views/userFeedback/pathnames';
+import {makeFeedbackPathname} from 'sentry/views/feedback/pathnames';
 
 type GroupHistory = {
   count: number;
diff --git a/static/app/views/userFeedback/userFeedbackEmpty.spec.tsx b/static/app/views/feedback/feedbackEmptyState.spec.tsx
similarity index 79%
rename from static/app/views/userFeedback/userFeedbackEmpty.spec.tsx
rename to static/app/views/feedback/feedbackEmptyState.spec.tsx
index c872431ac77c59..6d33f7f4b3d4dd 100644
--- a/static/app/views/userFeedback/userFeedbackEmpty.spec.tsx
+++ b/static/app/views/feedback/feedbackEmptyState.spec.tsx
@@ -3,21 +3,21 @@ import {ProjectFixture} from 'sentry-fixture/project';
 import {act, render, screen} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import {UserFeedbackEmpty} from 'sentry/views/userFeedback/userFeedbackEmpty';
+import {FeedbackEmptyState} from 'sentry/views/feedback/feedbackEmptyState';
 
-describe('UserFeedbackEmpty', () => {
+describe('FeedbackEmptyState', () => {
   const project = ProjectFixture({id: '1'});
   const projectWithReports = ProjectFixture({id: '2', hasUserReports: true});
   const projectWithoutReports = ProjectFixture({id: '3'});
 
   it('renders empty', () => {
-    render(<UserFeedbackEmpty />);
+    render(<FeedbackEmptyState />);
   });
 
   it('renders landing for project with no user feedback', () => {
     act(() => ProjectsStore.loadInitialData([project]));
 
-    render(<UserFeedbackEmpty />);
+    render(<FeedbackEmptyState />);
 
     expect(
       screen.getByRole('heading', {name: 'What do users think?'})
@@ -27,7 +27,7 @@ describe('UserFeedbackEmpty', () => {
   it('renders warning for project with any user feedback', () => {
     act(() => ProjectsStore.loadInitialData([projectWithReports]));
 
-    render(<UserFeedbackEmpty />);
+    render(<FeedbackEmptyState />);
 
     expect(
       screen.getByText('Sorry, no user reports match your filters.')
@@ -37,7 +37,7 @@ describe('UserFeedbackEmpty', () => {
   it('renders warning for projects with any user feedback', () => {
     act(() => ProjectsStore.loadInitialData([project, projectWithReports]));
 
-    render(<UserFeedbackEmpty />);
+    render(<FeedbackEmptyState />);
 
     expect(
       screen.getByText('Sorry, no user reports match your filters.')
@@ -47,7 +47,7 @@ describe('UserFeedbackEmpty', () => {
   it('renders warning for project query with user feedback', () => {
     act(() => ProjectsStore.loadInitialData([project, projectWithReports]));
 
-    render(<UserFeedbackEmpty projectIds={[projectWithReports.id]} />);
+    render(<FeedbackEmptyState projectIds={[projectWithReports.id]} />);
 
     expect(
       screen.getByText('Sorry, no user reports match your filters.')
@@ -57,7 +57,7 @@ describe('UserFeedbackEmpty', () => {
   it('renders landing for project query without any user feedback', () => {
     act(() => ProjectsStore.loadInitialData([project, projectWithReports]));
 
-    render(<UserFeedbackEmpty projectIds={[project.id]} />);
+    render(<FeedbackEmptyState projectIds={[project.id]} />);
 
     expect(
       screen.getByRole('heading', {name: 'What do users think?'})
@@ -67,7 +67,7 @@ describe('UserFeedbackEmpty', () => {
   it('renders warning for multi project query with any user feedback', () => {
     act(() => ProjectsStore.loadInitialData([project, projectWithReports]));
 
-    render(<UserFeedbackEmpty projectIds={[project.id, projectWithReports.id]} />);
+    render(<FeedbackEmptyState projectIds={[project.id, projectWithReports.id]} />);
 
     expect(
       screen.getByText('Sorry, no user reports match your filters.')
@@ -77,7 +77,7 @@ describe('UserFeedbackEmpty', () => {
   it('renders landing for multi project query without any user feedback', () => {
     act(() => ProjectsStore.loadInitialData([project, projectWithoutReports]));
 
-    render(<UserFeedbackEmpty projectIds={[project.id, projectWithoutReports.id]} />);
+    render(<FeedbackEmptyState projectIds={[project.id, projectWithoutReports.id]} />);
 
     expect(
       screen.getByRole('heading', {name: 'What do users think?'})
diff --git a/static/app/views/userFeedback/userFeedbackEmpty.tsx b/static/app/views/feedback/feedbackEmptyState.tsx
similarity index 98%
rename from static/app/views/userFeedback/userFeedbackEmpty.tsx
rename to static/app/views/feedback/feedbackEmptyState.tsx
index 91780d2a1a4713..674dd4c1feb0c7 100644
--- a/static/app/views/userFeedback/userFeedbackEmpty.tsx
+++ b/static/app/views/feedback/feedbackEmptyState.tsx
@@ -21,7 +21,7 @@ type Props = {
   projectIds?: string[];
 };
 
-export function UserFeedbackEmpty({projectIds, issueTab = false}: Props) {
+export function FeedbackEmptyState({projectIds, issueTab = false}: Props) {
   const {projects, initiallyLoaded} = useProjects();
   const loadingProjects = !initiallyLoaded;
   const organization = useOrganization();
diff --git a/static/app/views/userFeedback/pathnames.tsx b/static/app/views/feedback/pathnames.tsx
similarity index 100%
rename from static/app/views/userFeedback/pathnames.tsx
rename to static/app/views/feedback/pathnames.tsx
diff --git a/static/app/views/issueDetails/groupUserFeedback.tsx b/static/app/views/issueDetails/groupUserFeedback.tsx
index 547eb3cf791eb9..6a2e1ce7122fea 100644
--- a/static/app/views/issueDetails/groupUserFeedback.tsx
+++ b/static/app/views/issueDetails/groupUserFeedback.tsx
@@ -12,10 +12,10 @@ import {space} from 'sentry/styles/space';
 import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import {useParams} from 'sentry/utils/useParams';
+import {FeedbackEmptyState} from 'sentry/views/feedback/feedbackEmptyState';
 import {useGroup} from 'sentry/views/issueDetails/useGroup';
 import {useGroupUserFeedback} from 'sentry/views/issueDetails/useGroupUserFeedback';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
-import {UserFeedbackEmpty} from 'sentry/views/userFeedback/userFeedbackEmpty';
 
 function GroupUserFeedback() {
   const organization = useOrganization();
@@ -79,7 +79,7 @@ function GroupUserFeedback() {
           </FilterMessage>
         )}
         {reportList.length === 0 ? (
-          <UserFeedbackEmpty projectIds={[group.project.id]} issueTab />
+          <FeedbackEmptyState projectIds={[group.project.id]} issueTab />
         ) : (
           <Fragment>
             {reportList.map((item, idx) => (
diff --git a/static/app/views/performance/newTraceDetails/traceHeader/breadcrumbs.tsx b/static/app/views/performance/newTraceDetails/traceHeader/breadcrumbs.tsx
index dca1cd1a6901db..f7b63619273dba 100644
--- a/static/app/views/performance/newTraceDetails/traceHeader/breadcrumbs.tsx
+++ b/static/app/views/performance/newTraceDetails/traceHeader/breadcrumbs.tsx
@@ -12,6 +12,7 @@ import type {Project} from 'sentry/types/project';
 import normalizeUrl from 'sentry/utils/url/normalizeUrl';
 import {formatVersion} from 'sentry/utils/versions/formatVersion';
 import {makeDiscoverPathname} from 'sentry/views/discover/pathnames';
+import {makeFeedbackPathname} from 'sentry/views/feedback/pathnames';
 import type {
   RoutableModuleNames,
   URLBuilder,
@@ -27,7 +28,6 @@ import Tab from 'sentry/views/performance/transactionSummary/tabs';
 import {getTransactionSummaryBaseUrl} from 'sentry/views/performance/transactionSummary/utils';
 import {getPerformanceBaseUrl} from 'sentry/views/performance/utils';
 import {makeTracesPathname} from 'sentry/views/traces/pathnames';
-import {makeFeedbackPathname} from 'sentry/views/userFeedback/pathnames';
 
 export enum TraceViewSources {
   TRACES = 'traces',