diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderFileName.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderFileName.tsx
index 74ae87380f..1bee86c25a 100644
--- a/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderFileName.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/FileInfo/RenderFileName.tsx
@@ -1,3 +1,4 @@
+import { nameAndExtension } from "@/next/file";
 import log from "@/next/log";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import PhotoOutlined from "@mui/icons-material/PhotoOutlined";
@@ -7,11 +8,7 @@ import { FILE_TYPE } from "constants/file";
 import { useEffect, useState } from "react";
 import { EnteFile } from "types/file";
 import { makeHumanReadableStorage } from "utils/billing";
-import {
-    changeFileName,
-    splitFilenameAndExtension,
-    updateExistingFilePubMetadata,
-} from "utils/file";
+import { changeFileName, updateExistingFilePubMetadata } from "utils/file";
 import { FileNameEditDialog } from "./FileNameEditDialog";
 import InfoItem from "./InfoItem";
 
@@ -65,9 +62,7 @@ export function RenderFileName({
     const [extension, setExtension] = useState<string>();
 
     useEffect(() => {
-        const [filename, extension] = splitFilenameAndExtension(
-            file.metadata.title,
-        );
+        const [filename, extension] = nameAndExtension(file.metadata.title);
         setFilename(filename);
         setExtension(extension);
     }, [file]);
diff --git a/web/apps/photos/src/services/export/migration.ts b/web/apps/photos/src/services/export/migration.ts
index 8591437e2b..0403f93f7e 100644
--- a/web/apps/photos/src/services/export/migration.ts
+++ b/web/apps/photos/src/services/export/migration.ts
@@ -21,11 +21,11 @@ import {
 } from "types/export";
 import { EnteFile } from "types/file";
 import { getNonEmptyPersonalCollections } from "utils/collection";
-import { splitFilenameAndExtension } from "utils/ffmpeg";
 import {
     getIDBasedSortedFiles,
     getPersonalFiles,
     mergeMetadata,
+    splitFilenameAndExtension,
 } from "utils/file";
 import {
     safeDirectoryName,
diff --git a/web/apps/photos/src/utils/ffmpeg/index.ts b/web/apps/photos/src/utils/ffmpeg/index.ts
index 1b3445976a..8a4332a7fd 100644
--- a/web/apps/photos/src/utils/ffmpeg/index.ts
+++ b/web/apps/photos/src/utils/ffmpeg/index.ts
@@ -65,13 +65,3 @@ function parseCreationTime(creationTime: string) {
     }
     return dateTime;
 }
-
-export function splitFilenameAndExtension(filename: string): [string, string] {
-    const lastDotPosition = filename.lastIndexOf(".");
-    if (lastDotPosition === -1) return [filename, null];
-    else
-        return [
-            filename.slice(0, lastDotPosition),
-            filename.slice(lastDotPosition + 1),
-        ];
-}