diff --git a/components/imports.js b/components/imports.js
index e0feb59f2..ae2398101 100644
--- a/components/imports.js
+++ b/components/imports.js
@@ -28,7 +28,7 @@ import { mapIdState, userIdState } from "../store/atoms/urlParameterState.js";
 import { poiLayerVisibleState } from "../store/atoms/poiLayerVisibleState.js";
 import plusRoundIcon from "./PlusRoundIcon.js";
 import { parsePoint, findClosestPoints } from "../utils/geometryUtils.js";
-import { insertNewMarker, removeMarker, handleEditPoi } from "../utils/markerUtils.js";
+import { insertNewPOI, removePOI, handleEditPoi } from "../utils/poiUtils.js";
 import { createAndSetDevices } from "../utils/createAndSetDevices.js";
 import { redrawPolyline, restoreMapSettings, checkOverlappingMarkers } from "../utils/mapUtils.js";
 import circleIcon from "./gisPolylines/icons/CircleIcon.js";
@@ -105,8 +105,8 @@ export {
   plusRoundIcon,
   parsePoint,
   findClosestPoints,
-  insertNewMarker,
-  removeMarker,
+  insertNewPOI,
+  removePOI,
   createAndSetDevices,
   handleEditPoi,
   redrawPolyline,
diff --git a/hooks/layers/useOtdrMarkersLayer.js b/hooks/layers/useOtdrMarkersLayer.js
index 7926f7598..5111abb58 100644
--- a/hooks/layers/useOtdrMarkersLayer.js
+++ b/hooks/layers/useOtdrMarkersLayer.js
@@ -2,7 +2,7 @@
 import { useEffect, useState } from "react";
 import L from "leaflet";
 import { addContextMenuToMarker } from "../../utils/contextMenuUtils";
-import { createAndSetDevices } from "../../utils/createAndSetDevices"; // Assuming this function is in markerUtils
+import { createAndSetDevices } from "../../utils/createAndSetDevices"; // Assuming this function is in poiUtils
 
 const useOtdrMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
   const [otdrMarkers, setOtdrMarkers] = useState([]);
diff --git a/utils/markerUtils.js b/utils/poiUtils.js
similarity index 93%
rename from utils/markerUtils.js
rename to utils/poiUtils.js
index 8d4051928..b3e23fd78 100644
--- a/utils/markerUtils.js
+++ b/utils/poiUtils.js
@@ -1,12 +1,12 @@
-// /utils/markerUtils.js
-import circleIcon from "../components/gisPolylines/icons/CircleIcon";
-import { saveLineData, redrawPolyline } from "./mapUtils";
+// /utils/poiUtils.js
+import circleIcon from "../components/gisPolylines/icons/CircleIcon.js";
+import { saveLineData, redrawPolyline } from "./mapUtils.js";
 import L from "leaflet";
 import "leaflet.smooth_marker_bouncing";
 import { toast } from "react-toastify";
 import * as config from "../config/config.js";
 
-export const insertNewMarker = (closestPoints, newPoint, lineData, map) => {
+export const insertNewPOI = (closestPoints, newPoint, lineData, map) => {
   const newMarker = L.marker(newPoint, {
     icon: circleIcon,
     draggable: true,
@@ -32,7 +32,7 @@ export const insertNewMarker = (closestPoints, newPoint, lineData, map) => {
   });
 };
 
-export const removeMarker = (marker, lineData, currentZoom, currentCenter) => {
+export const removePOI = (marker, lineData, currentZoom, currentCenter) => {
   // Save zoom and center to localStorage
   //localStorage.setItem("mapZoom", currentZoom);
   //localStorage.setItem("mapCenter", JSON.stringify(currentCenter));
diff --git a/utils/setupPOIs.js b/utils/setupPOIs.js
index 4aecd4cfb..2cbc8a737 100644
--- a/utils/setupPOIs.js
+++ b/utils/setupPOIs.js
@@ -2,7 +2,7 @@
 import { findClosestPoints } from "./geometryUtils";
 import handlePoiSelect from "./handlePoiSelect";
 import { updateLocationInDatabase } from "../services/apiService";
-import { handleEditPoi, insertNewMarker, removeMarker } from "./markerUtils";
+import { handleEditPoi, insertNewPOI, removePOI } from "./poiUtils";
 import { parsePoint } from "./geometryUtils";
 import circleIcon from "../components/gisPolylines/icons/CircleIcon";
 import startIcon from "../components/gisPolylines/icons/StartIcon";
diff --git a/utils/setupPolylines.js b/utils/setupPolylines.js
index bd15ed15c..1ac42ecdb 100644
--- a/utils/setupPolylines.js
+++ b/utils/setupPolylines.js
@@ -2,7 +2,7 @@
 import { findClosestPoints } from "./geometryUtils";
 import handlePoiSelect from "./handlePoiSelect";
 import { updateLocationInDatabase } from "../services/apiService";
-import { handleEditPoi, insertNewMarker, removeMarker } from "./markerUtils";
+import { handleEditPoi, insertNewPOI, removePOI } from "./poiUtils";
 import { parsePoint } from "./geometryUtils";
 import circleIcon from "../components/gisPolylines/icons/CircleIcon";
 import startIcon from "../components/gisPolylines/icons/StartIcon";
@@ -127,7 +127,7 @@ export const setupPolylines = (map, linePositions, lineColors, tooltipContents,
                 const newCoordinates = [...lineData.coordinates];
                 newCoordinates[index] = [newCoords.lat, newCoords.lng];
 
-                removeMarker(marker, lineData, currentZoom, currentCenter);
+                removePOI(marker, lineData, currentZoom, currentCenter);
                 polylines[lineIndex].remove();
                 lineData.coordinates = newCoordinates;
               },
@@ -157,7 +157,7 @@ export const setupPolylines = (map, linePositions, lineColors, tooltipContents,
             }
             const newPoint = e.latlng;
             const closestPoints = findClosestPoints(lineData.coordinates, newPoint, map);
-            insertNewMarker(closestPoints, newPoint, lineData, map);
+            insertNewPOI(closestPoints, newPoint, lineData, map);
             redrawPolyline(lineData, lineColors, tooltipContents, map);
             window.location.reload();
           },