3 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/database/DataManager.java b/src/main/java/org/traccar/database/DataManager.java
index 4fae5687c..a3b31350f 100644
--- a/src/main/java/org/traccar/database/DataManager.java
+++ b/src/main/java/org/traccar/database/DataManager.java
@@ -80,7 +80,7 @@ public class DataManager {
     public DataManager(Config config) throws Exception {
         this.config = config;
 
-        forceLdap = config.getBoolean("ldap.force");
+        forceLdap = config.getBoolean(Keys.LDAP_FORCE);
 
         initDatabase();
         initDatabaseSchema();
diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java
index d238e9229..8db694d73 100644
--- a/src/main/java/org/traccar/database/DeviceManager.java
+++ b/src/main/java/org/traccar/database/DeviceManager.java
@@ -113,7 +113,7 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity
         boolean forceUpdate;
         try {
             readLock();
-            forceUpdate = !devicesByUniqueId.containsKey(uniqueId) && !config.getBoolean("database.ignoreUnknown");
+            forceUpdate = !devicesByUniqueId.containsKey(uniqueId) && !config.getBoolean(Keys.DATABASE_IGNORE_UNKNOWN);
         } finally {
             readUnlock();
         }
diff --git a/src/main/java/org/traccar/database/NotificationManager.java b/src/main/java/org/traccar/database/NotificationManager.java
index 17797e21d..ccad192f6 100644
--- a/src/main/java/org/traccar/database/NotificationManager.java
+++ b/src/main/java/org/traccar/database/NotificationManager.java
@@ -30,6 +30,7 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.Context;
+import org.traccar.config.Keys;
 import org.traccar.model.Calendar;
 import org.traccar.model.Event;
 import org.traccar.model.Notification;
@@ -44,7 +45,7 @@ public class NotificationManager extends ExtendedObjectManager<Notification> {
 
     public NotificationManager(DataManager dataManager) {
         super(dataManager, Notification.class);
-        geocodeOnRequest = Context.getConfig().getBoolean("geocoder.onRequest");
+        geocodeOnRequest = Context.getConfig().getBoolean(Keys.GEOCODER_ON_REQUEST);
     }
 
     private Set<Long> getEffectiveNotifications(long userId, long deviceId, Date time) {