diff --git a/src/frontend/locator/src/App.jsx b/src/frontend/locator/src/App.jsx
index c6cc2b536..03a2b234d 100644
--- a/src/frontend/locator/src/App.jsx
+++ b/src/frontend/locator/src/App.jsx
@@ -15,7 +15,7 @@ function App() {
                     <AppNav/>
                     <Routes>
                         <Route path="/" element={<OracleLocator/>}/>
-                        <Route path="/oracleLocator" element={<OracleLocator/>}/>
+                        <Route path="/locator" element={<OracleLocator/>}/>
                         <Route path="/oracleCalibrator" element={<Calibrator/>}/>
                     </Routes>
                 </div>
diff --git a/src/frontend/locator/src/AppNav.jsx b/src/frontend/locator/src/AppNav.jsx
index 2c516721a..e370e1fb2 100644
--- a/src/frontend/locator/src/AppNav.jsx
+++ b/src/frontend/locator/src/AppNav.jsx
@@ -5,7 +5,7 @@ import MenuIcon from "@mui/icons-material/Menu";
 import PropTypes from "prop-types";
 
 const pages = {
-    "Oracle Locator": "oracleLocator",
+    "Oracle Locator": "locator",
     "Oracle Calibrator": "oracleCalibrator"
 };
 
diff --git a/src/frontend/locator/src/components/OracleLocator.jsx b/src/frontend/locator/src/components/OracleLocator.jsx
index bb50bdf49..35c2251ed 100644
--- a/src/frontend/locator/src/components/OracleLocator.jsx
+++ b/src/frontend/locator/src/components/OracleLocator.jsx
@@ -26,7 +26,7 @@ const isTeamSatisfiesSearch = (team, searchValue) => {
     if (searchValue === "" || team.id === null) {
         return true;
     }
-    return (team.contestSystemId + " : " + team.shortName + " : " + team.name).toLowerCase().includes(searchValue);
+    return (team.id + " : " + team.shortName + " : " + team.name).toLowerCase().includes(searchValue);
 };
 
 const useTeamsList = (rawTeams, status) => {
@@ -34,7 +34,7 @@ const useTeamsList = (rawTeams, status) => {
     const teamsWithStatus = useMemo(
         () => rawTeams.map(t => ({
             ...t,
-            shown: Object.values(status).some(s => s.shown && s.settings.teamId === t.id),
+            shown: Object.values(status).some(s => s.shown && s.settings.id === t.id),
             selected: t.id === selectedTeamId,
         })),
         [rawTeams, status, selectedTeamId]);
@@ -150,10 +150,11 @@ const OracleViewManager = ({ service }) => {
             return ["", null];
         }
         const team = teams.find(team => team.id === selectedTeamId);
-        return [team?.name ?? "", team?.contestSystemId];
+        return [team?.name ?? "", team?.id];
     }, [teams, selectedTeamId]);
 
     const onMove = useCallback(() => {
+        console.log("OnMove", selectedTeamCdsId)
         const settings = {
             oracleId: oracle,
             teamId: selectedTeamCdsId,
diff --git a/src/frontend/locator/src/components/TeamTable.jsx b/src/frontend/locator/src/components/TeamTable.jsx
index 311af6095..f26da8432 100644
--- a/src/frontend/locator/src/components/TeamTable.jsx
+++ b/src/frontend/locator/src/components/TeamTable.jsx
@@ -15,7 +15,7 @@ const gridButton = {
 
 export const TEAM_FIELD_STRUCTURE = PropTypes.shape({
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-    contestSystemId: PropTypes.string,
+    teamId: PropTypes.string,
     shown: PropTypes.bool.isRequired,
     selected: PropTypes.bool.isRequired,
     name: PropTypes.string.isRequired,
@@ -46,8 +46,8 @@ const TeamTableRow = ({ rowData, onClick, tStyle }) => {
                 color: (rowData.selected || rowData.shown ? grey[900] : grey[700]) }}
             onClick={() => onClick(rowData.id)}
         >
-            {rowData.contestSystemId && `${rowData.contestSystemId} :`}
-            {rowData.contestSystemId === null && <AutoModeIcon sx={{ mr: 1 }} />}
+            {rowData.teamId && `${rowData.teamId} :`}
+            {rowData.teamId === null && <AutoModeIcon sx={{ mr: 1 }} />}
             {" " + rowData.name}
         </Box>
     </Grid>);
diff --git a/src/oracle-tools/src/main/kotlin/org/icpclive/oracle/Api.kt b/src/oracle-tools/src/main/kotlin/org/icpclive/oracle/Api.kt
index d88c1c90e..9f106dff8 100644
--- a/src/oracle-tools/src/main/kotlin/org/icpclive/oracle/Api.kt
+++ b/src/oracle-tools/src/main/kotlin/org/icpclive/oracle/Api.kt
@@ -10,7 +10,7 @@ data class TeamLocatorCircleSettings(
     val x: Int,
     val y: Int,
     val radius: Int,
-    val cdsTeamId: String,
+    val teamId: String,
 )
 
 @Serializable
diff --git a/src/oracle-tools/src/main/kotlin/org/icpclive/oracle/LocatorController.kt b/src/oracle-tools/src/main/kotlin/org/icpclive/oracle/LocatorController.kt
index 52323a48e..560fbc57f 100644
--- a/src/oracle-tools/src/main/kotlin/org/icpclive/oracle/LocatorController.kt
+++ b/src/oracle-tools/src/main/kotlin/org/icpclive/oracle/LocatorController.kt
@@ -24,7 +24,7 @@ object LocatorController {
                     x = it.x.toInt(),
                     y = it.y.toInt(),
                     radius = it.r.toInt(),
-                    cdsTeamId = it.id,
+                    teamId = it.id,
                 )
             }
         )