diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.js b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.js
deleted file mode 100644
index 29b004412f64..000000000000
--- a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Don't import this file with '* as Device'. It's known to make VSCode IntelliSense crash.
-import {getOSAndName} from 'expensify-common/lib/Device';
-
-export default getOSAndName;
diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.js b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts
similarity index 51%
rename from src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.js
rename to src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts
index 11d59abea1f1..bb9eb572570e 100644
--- a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.js
+++ b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts
@@ -1,11 +1,18 @@
 import Str from 'expensify-common/lib/str';
 import RNDeviceInfo from 'react-native-device-info';
+import GetOSAndName from './types';
 
-export default function getOSAndName() {
+const getOSAndName: GetOSAndName = () => {
     const deviceName = RNDeviceInfo.getDeviceNameSync();
     const prettyName = `${Str.UCFirst(RNDeviceInfo.getManufacturerSync() || '')} ${deviceName}`;
     return {
+        // Parameter names are predefined and we don't choose it here
+        // eslint-disable-next-line @typescript-eslint/naming-convention
         device_name: RNDeviceInfo.isEmulatorSync() ? `Emulator - ${prettyName}` : prettyName,
+        // Parameter names are predefined and we don't choose it here
+        // eslint-disable-next-line @typescript-eslint/naming-convention
         os_version: RNDeviceInfo.getSystemVersion(),
     };
-}
+};
+
+export default getOSAndName;
diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts
new file mode 100644
index 000000000000..d63c2fedc51d
--- /dev/null
+++ b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts
@@ -0,0 +1,12 @@
+import {getOSAndName as libGetOSAndName} from 'expensify-common/lib/Device';
+import GetOSAndName from './types';
+
+const getOSAndName: GetOSAndName = () => {
+    // Parameter names are predefined and we don't choose it here
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const {device_name, os_version} = libGetOSAndName();
+    // Parameter names are predefined and we don't choose it here
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    return {device_name, os_version};
+};
+export default getOSAndName;
diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/types.ts b/src/libs/actions/Device/getDeviceInfo/getOSAndName/types.ts
new file mode 100644
index 000000000000..2ca67c3c59c3
--- /dev/null
+++ b/src/libs/actions/Device/getDeviceInfo/getOSAndName/types.ts
@@ -0,0 +1,4 @@
+// Parameter names are predefined and we don't choose it here
+// eslint-disable-next-line @typescript-eslint/naming-convention
+type GetOSAndName = () => {device_name: string | undefined; os_version: string | undefined};
+export default GetOSAndName;