diff --git a/ui/v2.5/src/App.tsx b/ui/v2.5/src/App.tsx
index 7aba652cd..f3229d36f 100644
--- a/ui/v2.5/src/App.tsx
+++ b/ui/v2.5/src/App.tsx
@@ -66,7 +66,7 @@ const Galleries = lazyComponent(
   () => import("./components/Galleries/Galleries")
 );
 
-const Groups = lazyComponent(() => import("./components/Movies/Movies"));
+const Groups = lazyComponent(() => import("./components/Groups/Groups"));
 const Tags = lazyComponent(() => import("./components/Tags/Tags"));
 const Images = lazyComponent(() => import("./components/Images/Images"));
 const Setup = lazyComponent(() => import("./components/Setup/Setup"));
diff --git a/ui/v2.5/src/components/FrontPage/Control.tsx b/ui/v2.5/src/components/FrontPage/Control.tsx
index 495fbc852..7ce32cb44 100644
--- a/ui/v2.5/src/components/FrontPage/Control.tsx
+++ b/ui/v2.5/src/components/FrontPage/Control.tsx
@@ -7,7 +7,7 @@ import { ConfigurationContext } from "src/hooks/Config";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { GalleryRecommendationRow } from "../Galleries/GalleryRecommendationRow";
 import { ImageRecommendationRow } from "../Images/ImageRecommendationRow";
-import { GroupRecommendationRow } from "../Movies/MovieRecommendationRow";
+import { GroupRecommendationRow } from "../Groups/GroupRecommendationRow";
 import { PerformerRecommendationRow } from "../Performers/PerformerRecommendationRow";
 import { SceneRecommendationRow } from "../Scenes/SceneRecommendationRow";
 import { StudioRecommendationRow } from "../Studios/StudioRecommendationRow";
diff --git a/ui/v2.5/src/components/Movies/EditMoviesDialog.tsx b/ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
similarity index 100%
rename from ui/v2.5/src/components/Movies/EditMoviesDialog.tsx
rename to ui/v2.5/src/components/Groups/EditGroupsDialog.tsx
diff --git a/ui/v2.5/src/components/Movies/MovieCard.tsx b/ui/v2.5/src/components/Groups/GroupCard.tsx
similarity index 100%
rename from ui/v2.5/src/components/Movies/MovieCard.tsx
rename to ui/v2.5/src/components/Groups/GroupCard.tsx
diff --git a/ui/v2.5/src/components/Movies/MovieCardGrid.tsx b/ui/v2.5/src/components/Groups/GroupCardGrid.tsx
similarity index 95%
rename from ui/v2.5/src/components/Movies/MovieCardGrid.tsx
rename to ui/v2.5/src/components/Groups/GroupCardGrid.tsx
index a08ec58fe..9b96e4b64 100644
--- a/ui/v2.5/src/components/Movies/MovieCardGrid.tsx
+++ b/ui/v2.5/src/components/Groups/GroupCardGrid.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GroupCard } from "./MovieCard";
+import { GroupCard } from "./GroupCard";
 import { useContainerDimensions } from "../Shared/GridCard/GridCard";
 
 interface IGroupCardGrid {
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/Movie.tsx b/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
similarity index 98%
rename from ui/v2.5/src/components/Movies/MovieDetails/Movie.tsx
rename to ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
index 731818da4..1fddfa967 100644
--- a/ui/v2.5/src/components/Movies/MovieDetails/Movie.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/Group.tsx
@@ -17,12 +17,12 @@ import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { useLightbox } from "src/hooks/Lightbox/hooks";
 import { ModalComponent } from "src/components/Shared/Modal";
 import { useToast } from "src/hooks/Toast";
-import { GroupScenesPanel } from "./MovieScenesPanel";
+import { GroupScenesPanel } from "./GroupScenesPanel";
 import {
   CompressedGroupDetailsPanel,
   GroupDetailsPanel,
-} from "./MovieDetailsPanel";
-import { GroupEditPanel } from "./MovieEditPanel";
+} from "./GroupDetailsPanel";
+import { GroupEditPanel } from "./GroupEditPanel";
 import {
   faChevronDown,
   faChevronUp,
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieCreate.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupCreate.tsx
similarity index 98%
rename from ui/v2.5/src/components/Movies/MovieDetails/MovieCreate.tsx
rename to ui/v2.5/src/components/Groups/GroupDetails/GroupCreate.tsx
index 5d15afbd0..9dd3e22b9 100644
--- a/ui/v2.5/src/components/Movies/MovieDetails/MovieCreate.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupCreate.tsx
@@ -5,7 +5,7 @@ import { useHistory, useLocation } from "react-router-dom";
 import { useIntl } from "react-intl";
 import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
 import { useToast } from "src/hooks/Toast";
-import { GroupEditPanel } from "./MovieEditPanel";
+import { GroupEditPanel } from "./GroupEditPanel";
 
 const GroupCreate: React.FC = () => {
   const history = useHistory();
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieDetailsPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx
similarity index 100%
rename from ui/v2.5/src/components/Movies/MovieDetails/MovieDetailsPanel.tsx
rename to ui/v2.5/src/components/Groups/GroupDetails/GroupDetailsPanel.tsx
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
similarity index 99%
rename from ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
rename to ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
index 5b8584f6a..a3ccf5b8b 100644
--- a/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupEditPanel.tsx
@@ -15,7 +15,7 @@ import TextUtils from "src/utils/text";
 import ImageUtils from "src/utils/image";
 import { useFormik } from "formik";
 import { Prompt } from "react-router-dom";
-import { GroupScrapeDialog } from "./MovieScrapeDialog";
+import { GroupScrapeDialog } from "./GroupScrapeDialog";
 import isEqual from "lodash-es/isEqual";
 import { handleUnsavedChanges } from "src/utils/navigation";
 import { formikUtils } from "src/utils/form";
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupScenesPanel.tsx
similarity index 94%
rename from ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
rename to ui/v2.5/src/components/Groups/GroupDetails/GroupScenesPanel.tsx
index deb1f31a7..acca9f0aa 100644
--- a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
+++ b/ui/v2.5/src/components/Groups/GroupDetails/GroupScenesPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GroupsCriterion as GroupsCriterion } from "src/models/list-filter/criteria/movies";
+import { GroupsCriterion } from "src/models/list-filter/criteria/groups";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { SceneList } from "src/components/Scenes/SceneList";
 import { View } from "src/components/List/views";
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieScrapeDialog.tsx b/ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
similarity index 100%
rename from ui/v2.5/src/components/Movies/MovieDetails/MovieScrapeDialog.tsx
rename to ui/v2.5/src/components/Groups/GroupDetails/GroupScrapeDialog.tsx
diff --git a/ui/v2.5/src/components/Movies/MovieList.tsx b/ui/v2.5/src/components/Groups/GroupList.tsx
similarity index 97%
rename from ui/v2.5/src/components/Movies/MovieList.tsx
rename to ui/v2.5/src/components/Groups/GroupList.tsx
index 28c4baadd..727587496 100644
--- a/ui/v2.5/src/components/Movies/MovieList.tsx
+++ b/ui/v2.5/src/components/Groups/GroupList.tsx
@@ -14,8 +14,8 @@ import {
 import { makeItemList, showWhenSelected } from "../List/ItemList";
 import { ExportDialog } from "../Shared/ExportDialog";
 import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
-import { GroupCardGrid } from "./MovieCardGrid";
-import { EditGroupsDialog } from "./EditMoviesDialog";
+import { GroupCardGrid } from "./GroupCardGrid";
+import { EditGroupsDialog } from "./EditGroupsDialog";
 import { View } from "../List/views";
 
 const GroupItemList = makeItemList({
diff --git a/ui/v2.5/src/components/Movies/MovieRecommendationRow.tsx b/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx
similarity index 97%
rename from ui/v2.5/src/components/Movies/MovieRecommendationRow.tsx
rename to ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx
index 5ecf36161..3a8fee856 100644
--- a/ui/v2.5/src/components/Movies/MovieRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Groups/GroupRecommendationRow.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { Link } from "react-router-dom";
 import { useFindGroups } from "src/core/StashService";
 import Slider from "@ant-design/react-slick";
-import { GroupCard } from "./MovieCard";
+import { GroupCard } from "./GroupCard";
 import { ListFilterModel } from "src/models/list-filter/filter";
 import { getSlickSliderSettings } from "src/core/recommendations";
 import { RecommendationRow } from "../FrontPage/RecommendationRow";
diff --git a/ui/v2.5/src/components/Movies/MovieSelect.tsx b/ui/v2.5/src/components/Groups/GroupSelect.tsx
similarity index 100%
rename from ui/v2.5/src/components/Movies/MovieSelect.tsx
rename to ui/v2.5/src/components/Groups/GroupSelect.tsx
diff --git a/ui/v2.5/src/components/Movies/Movies.tsx b/ui/v2.5/src/components/Groups/Groups.tsx
similarity index 85%
rename from ui/v2.5/src/components/Movies/Movies.tsx
rename to ui/v2.5/src/components/Groups/Groups.tsx
index 202d8f494..a2e4d9083 100644
--- a/ui/v2.5/src/components/Movies/Movies.tsx
+++ b/ui/v2.5/src/components/Groups/Groups.tsx
@@ -2,9 +2,9 @@ import React from "react";
 import { Route, Switch } from "react-router-dom";
 import { Helmet } from "react-helmet";
 import { useTitleProps } from "src/hooks/title";
-import Group from "./MovieDetails/Movie";
-import GroupCreate from "./MovieDetails/MovieCreate";
-import { GroupList } from "./MovieList";
+import Group from "./GroupDetails/Group";
+import GroupCreate from "./GroupDetails/GroupCreate";
+import { GroupList } from "./GroupList";
 import { useScrollToTopOnMount } from "src/hooks/scrollToTop";
 import { View } from "../List/views";
 
diff --git a/ui/v2.5/src/components/Movies/styles.scss b/ui/v2.5/src/components/Groups/styles.scss
similarity index 100%
rename from ui/v2.5/src/components/Movies/styles.scss
rename to ui/v2.5/src/components/Groups/styles.scss
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
index 6d67ec888..b5046e0fc 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -27,7 +27,7 @@ import {
 } from "./PerformerDetailsPanel";
 import { PerformerScenesPanel } from "./PerformerScenesPanel";
 import { PerformerGalleriesPanel } from "./PerformerGalleriesPanel";
-import { PerformerGroupsPanel } from "./PerformerMoviesPanel";
+import { PerformerGroupsPanel } from "./PerformerGroupsPanel";
 import { PerformerImagesPanel } from "./PerformerImagesPanel";
 import { PerformerAppearsWithPanel } from "./performerAppearsWithPanel";
 import { PerformerEditPanel } from "./PerformerEditPanel";
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerMoviesPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGroupsPanel.tsx
similarity index 90%
rename from ui/v2.5/src/components/Performers/PerformerDetails/PerformerMoviesPanel.tsx
rename to ui/v2.5/src/components/Performers/PerformerDetails/PerformerGroupsPanel.tsx
index f9a1f7f5a..4e75ef279 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerMoviesPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerGroupsPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GroupList } from "src/components/Movies/MovieList";
+import { GroupList } from "src/components/Groups/GroupList";
 import { usePerformerFilterHook } from "src/core/performers";
 import { View } from "src/components/List/views";
 
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 84754f184..a21c23290 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -70,7 +70,7 @@ const SceneMarkersPanel = lazyComponent(() => import("./SceneMarkersPanel"));
 const SceneFileInfoPanel = lazyComponent(() => import("./SceneFileInfoPanel"));
 const SceneDetailPanel = lazyComponent(() => import("./SceneDetailPanel"));
 const SceneHistoryPanel = lazyComponent(() => import("./SceneHistoryPanel"));
-const SceneGroupPanel = lazyComponent(() => import("./SceneMoviePanel"));
+const SceneGroupPanel = lazyComponent(() => import("./SceneGroupPanel"));
 const SceneGalleriesPanel = lazyComponent(
   () => import("./SceneGalleriesPanel")
 );
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
index 7b853b98c..d41d30817 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
@@ -29,7 +29,7 @@ import { useFormik } from "formik";
 import { Prompt } from "react-router-dom";
 import { ConfigurationContext } from "src/hooks/Config";
 import { stashboxDisplayName } from "src/utils/stashbox";
-import { IGroupEntry, SceneGroupTable } from "./SceneMovieTable";
+import { IGroupEntry, SceneGroupTable } from "./SceneGroupTable";
 import { faSearch, faSyncAlt } from "@fortawesome/free-solid-svg-icons";
 import { objectTitle } from "src/core/files";
 import { galleryTitle } from "src/core/galleries";
@@ -47,7 +47,7 @@ import {
 import { formikUtils } from "src/utils/form";
 import { Studio, StudioSelect } from "src/components/Studios/StudioSelect";
 import { Gallery, GallerySelect } from "src/components/Galleries/GallerySelect";
-import { Group } from "src/components/Movies/MovieSelect";
+import { Group } from "src/components/Groups/GroupSelect";
 import { useTagsEdit } from "src/hooks/tagsEdit";
 
 const SceneScrapeDialog = lazyComponent(() => import("./SceneScrapeDialog"));
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMoviePanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneGroupPanel.tsx
similarity index 90%
rename from ui/v2.5/src/components/Scenes/SceneDetails/SceneMoviePanel.tsx
rename to ui/v2.5/src/components/Scenes/SceneDetails/SceneGroupPanel.tsx
index 78fc7875a..6f58b504c 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMoviePanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneGroupPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GroupCard } from "src/components/Movies/MovieCard";
+import { GroupCard } from "src/components/Groups/GroupCard";
 
 interface ISceneGroupPanelProps {
   scene: GQL.SceneDataFragment;
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMovieTable.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneGroupTable.tsx
similarity index 98%
rename from ui/v2.5/src/components/Scenes/SceneDetails/SceneMovieTable.tsx
rename to ui/v2.5/src/components/Scenes/SceneDetails/SceneGroupTable.tsx
index 5b85c8352..ed721ab4b 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMovieTable.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneGroupTable.tsx
@@ -2,7 +2,7 @@ import React, { useMemo } from "react";
 import { useIntl } from "react-intl";
 import * as GQL from "src/core/generated-graphql";
 import { Form, Row, Col } from "react-bootstrap";
-import { Group, GroupSelect } from "src/components/Movies/MovieSelect";
+import { Group, GroupSelect } from "src/components/Groups/GroupSelect";
 import cx from "classnames";
 
 export type GroupSceneIndexMap = Map<string, number | undefined>;
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
index 59f13b1ec..e66ee8b36 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
@@ -28,7 +28,7 @@ import {
 } from "src/components/Shared/ScrapeDialog/createObjects";
 import { Tag } from "src/components/Tags/TagSelect";
 import { Studio } from "src/components/Studios/StudioSelect";
-import { Group } from "src/components/Movies/MovieSelect";
+import { Group } from "src/components/Groups/GroupSelect";
 import { useScrapedTags } from "src/components/Shared/ScrapeDialog/scrapedTags";
 
 interface ISceneScrapeDialogProps {
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
index 1ec41386b..078655338 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/ScrapedObjectsRow.tsx
@@ -8,7 +8,7 @@ import {
 } from "src/components/Shared/ScrapeDialog/scrapeResult";
 import { TagSelect } from "src/components/Tags/TagSelect";
 import { StudioSelect } from "src/components/Studios/StudioSelect";
-import { GroupSelect } from "src/components/Movies/MovieSelect";
+import { GroupSelect } from "src/components/Groups/GroupSelect";
 
 interface IScrapedStudioRow {
   title: string;
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts b/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts
index 61311e546..c4ba3a3e7 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog/createObjects.ts
@@ -9,7 +9,7 @@ import {
 import { ObjectScrapeResult, ScrapeResult } from "./scrapeResult";
 import { useIntl } from "react-intl";
 import { scrapedPerformerToCreateInput } from "src/core/performers";
-import { scrapedGroupToCreateInput } from "src/core/movies";
+import { scrapedGroupToCreateInput } from "src/core/groups";
 
 function useCreateObject<T>(
   entityTypeID: string,
diff --git a/ui/v2.5/src/components/Shared/Select.tsx b/ui/v2.5/src/components/Shared/Select.tsx
index e989c886d..4ae547cfe 100644
--- a/ui/v2.5/src/components/Shared/Select.tsx
+++ b/ui/v2.5/src/components/Shared/Select.tsx
@@ -26,7 +26,7 @@ import { faTableColumns } from "@fortawesome/free-solid-svg-icons";
 import { TagIDSelect } from "../Tags/TagSelect";
 import { StudioIDSelect } from "../Studios/StudioSelect";
 import { GalleryIDSelect } from "../Galleries/GallerySelect";
-import { GroupIDSelect } from "../Movies/MovieSelect";
+import { GroupIDSelect } from "../Groups/GroupSelect";
 import { SceneIDSelect } from "../Scenes/SceneSelect";
 
 export type SelectObject = {
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
index 20291e2a7..63eb47ed4 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/Studio.tsx
@@ -31,7 +31,7 @@ import {
   CompressedStudioDetailsPanel,
   StudioDetailsPanel,
 } from "./StudioDetailsPanel";
-import { StudioGroupsPanel } from "./StudioMoviesPanel";
+import { StudioGroupsPanel } from "./StudioGroupsPanel";
 import {
   faTrashAlt,
   faLink,
diff --git a/ui/v2.5/src/components/Studios/StudioDetails/StudioMoviesPanel.tsx b/ui/v2.5/src/components/Studios/StudioDetails/StudioGroupsPanel.tsx
similarity index 89%
rename from ui/v2.5/src/components/Studios/StudioDetails/StudioMoviesPanel.tsx
rename to ui/v2.5/src/components/Studios/StudioDetails/StudioGroupsPanel.tsx
index 1016ec2bc..f129ca687 100644
--- a/ui/v2.5/src/components/Studios/StudioDetails/StudioMoviesPanel.tsx
+++ b/ui/v2.5/src/components/Studios/StudioDetails/StudioGroupsPanel.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
-import { GroupList } from "src/components/Movies/MovieList";
+import { GroupList } from "src/components/Groups/GroupList";
 import { useStudioFilterHook } from "src/core/studios";
 import { View } from "src/components/List/views";
 
diff --git a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
index 7b794e9bf..13fb2664f 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/Tag.tsx
@@ -42,7 +42,7 @@ import {
 import { DetailImage } from "src/components/Shared/DetailImage";
 import { useLoadStickyHeader } from "src/hooks/detailsPanel";
 import { useScrollToTopOnMount } from "src/hooks/scrollToTop";
-import { TagGroupsPanel } from "./TagMoviesPanel";
+import { TagGroupsPanel } from "./TagGroupsPanel";
 
 interface IProps {
   tag: GQL.TagDataFragment;
diff --git a/ui/v2.5/src/components/Tags/TagDetails/TagMoviesPanel.tsx b/ui/v2.5/src/components/Tags/TagDetails/TagGroupsPanel.tsx
similarity index 85%
rename from ui/v2.5/src/components/Tags/TagDetails/TagMoviesPanel.tsx
rename to ui/v2.5/src/components/Tags/TagDetails/TagGroupsPanel.tsx
index bb6d6ba72..f8903154e 100644
--- a/ui/v2.5/src/components/Tags/TagDetails/TagMoviesPanel.tsx
+++ b/ui/v2.5/src/components/Tags/TagDetails/TagGroupsPanel.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import * as GQL from "src/core/generated-graphql";
 import { useTagFilterHook } from "src/core/tags";
-import { GroupList } from "src/components/Movies/MovieList";
+import { GroupList } from "src/components/Groups/GroupList";
 
 export const TagGroupsPanel: React.FC<{
   active: boolean;
diff --git a/ui/v2.5/src/core/movies.ts b/ui/v2.5/src/core/groups.ts
similarity index 100%
rename from ui/v2.5/src/core/movies.ts
rename to ui/v2.5/src/core/groups.ts
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index df3cd9e24..7bdb49040 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -6,7 +6,7 @@
 @import "src/components/Help/styles.scss";
 @import "src/components/Images/styles.scss";
 @import "src/components/List/styles.scss";
-@import "src/components/Movies/styles.scss";
+@import "src/components/Groups/styles.scss";
 @import "src/components/Performers/styles.scss";
 @import "src/components/FrontPage/styles.scss";
 @import "src/components/Scenes/styles.scss";
diff --git a/ui/v2.5/src/models/list-filter/criteria/movies.ts b/ui/v2.5/src/models/list-filter/criteria/groups.ts
similarity index 100%
rename from ui/v2.5/src/models/list-filter/criteria/movies.ts
rename to ui/v2.5/src/models/list-filter/criteria/groups.ts
diff --git a/ui/v2.5/src/models/list-filter/factory.ts b/ui/v2.5/src/models/list-filter/factory.ts
index 1677358e3..f2d76abc3 100644
--- a/ui/v2.5/src/models/list-filter/factory.ts
+++ b/ui/v2.5/src/models/list-filter/factory.ts
@@ -2,7 +2,7 @@ import { FilterMode } from "src/core/generated-graphql";
 import { ListFilterOptions } from "./filter-options";
 import { GalleryListFilterOptions } from "./galleries";
 import { ImageListFilterOptions } from "./images";
-import { GroupListFilterOptions } from "./movies";
+import { GroupListFilterOptions } from "./groups";
 import { PerformerListFilterOptions } from "./performers";
 import { SceneMarkerListFilterOptions } from "./scene-markers";
 import { SceneListFilterOptions } from "./scenes";
diff --git a/ui/v2.5/src/models/list-filter/movies.ts b/ui/v2.5/src/models/list-filter/groups.ts
similarity index 100%
rename from ui/v2.5/src/models/list-filter/movies.ts
rename to ui/v2.5/src/models/list-filter/groups.ts
diff --git a/ui/v2.5/src/models/list-filter/scenes.ts b/ui/v2.5/src/models/list-filter/scenes.ts
index 92b9eadfa..965fa31be 100644
--- a/ui/v2.5/src/models/list-filter/scenes.ts
+++ b/ui/v2.5/src/models/list-filter/scenes.ts
@@ -8,7 +8,7 @@ import {
 } from "./criteria/criterion";
 import { HasMarkersCriterionOption } from "./criteria/has-markers";
 import { SceneIsMissingCriterionOption } from "./criteria/is-missing";
-import { GroupsCriterionOption } from "./criteria/movies";
+import { GroupsCriterionOption } from "./criteria/groups";
 import { GalleriesCriterionOption } from "./criteria/galleries";
 import { OrganizedCriterionOption } from "./criteria/organized";
 import { PerformersCriterionOption } from "./criteria/performers";
@@ -60,7 +60,7 @@ const sortByOptions = [
     },
     {
       messageID: "group_scene_number",
-      value: "movie_scene_number",
+      value: "group_scene_number",
     },
   ]);
 const displayModeOptions = [
diff --git a/ui/v2.5/src/models/list-filter/tags.ts b/ui/v2.5/src/models/list-filter/tags.ts
index 9aa4c80e6..b400d9d60 100644
--- a/ui/v2.5/src/models/list-filter/tags.ts
+++ b/ui/v2.5/src/models/list-filter/tags.ts
@@ -37,7 +37,7 @@ const sortByOptions = ["name", "random"]
     },
     {
       messageID: "group_count",
-      value: "movies_count",
+      value: "groups_count",
     },
     {
       messageID: "marker_count",
diff --git a/ui/v2.5/src/utils/navigation.ts b/ui/v2.5/src/utils/navigation.ts
index d30da8d7a..f0e06b0b7 100644
--- a/ui/v2.5/src/utils/navigation.ts
+++ b/ui/v2.5/src/utils/navigation.ts
@@ -12,7 +12,7 @@ import {
   TagsCriterionOption,
 } from "src/models/list-filter/criteria/tags";
 import { ListFilterModel } from "src/models/list-filter/filter";
-import { GroupsCriterion } from "src/models/list-filter/criteria/movies";
+import { GroupsCriterion } from "src/models/list-filter/criteria/groups";
 import {
   Criterion,
   CriterionOption,