diff --git a/core/src/main/java/hudson/triggers/SafeTimerTask.java b/core/src/main/java/hudson/triggers/SafeTimerTask.java
index dada64109e..5531e293f1 100644
--- a/core/src/main/java/hudson/triggers/SafeTimerTask.java
+++ b/core/src/main/java/hudson/triggers/SafeTimerTask.java
@@ -52,11 +52,11 @@ import org.acegisecurity.context.SecurityContextHolder;
 public abstract class SafeTimerTask extends TimerTask {
 
     /**
-     * System property to change the location where tasks logging should be sent.
+     * System property to change the location where (tasks) logging should be sent.
      * <p><strong>Beware: changing it while Jenkins is running gives no guarantee logs will be sent to the new location
      * until it is restarted.</strong></p>
      */
-    static final String TASKS_LOGS_ROOT_PATH_PROPERTY = SafeTimerTask.class.getName()+".TASKS_LOGS_ROOT_PATH";
+    static final String LOGS_ROOT_PATH_PROPERTY = SafeTimerTask.class.getName()+".logsTargetDir";
 
     public final void run() {
         // background activity gets system credential,
@@ -83,13 +83,13 @@ public abstract class SafeTimerTask extends TimerTask {
      * @since TODO
      */
     public static File getLogsRoot() {
-        String tagsLogsPath = SystemProperties.getString(TASKS_LOGS_ROOT_PATH_PROPERTY);
+        String tagsLogsPath = SystemProperties.getString(LOGS_ROOT_PATH_PROPERTY);
         if (tagsLogsPath == null) {
             return new File(Jenkins.get().getRootDir(), "logs");
         } else {
             LOGGER.log(Level.INFO,
                        "Using non default root path for tasks logging: {0}. (Beware: no automated migration if you change or remove it again)",
-                       TASKS_LOGS_ROOT_PATH_PROPERTY);
+                       LOGS_ROOT_PATH_PROPERTY);
             return new File(tagsLogsPath);
         }
     }
diff --git a/test/src/test/java/hudson/triggers/SafeTimerTaskTest.java b/test/src/test/java/hudson/triggers/SafeTimerTaskTest.java
index e111661a9d..8a2c0088db 100644
--- a/test/src/test/java/hudson/triggers/SafeTimerTaskTest.java
+++ b/test/src/test/java/hudson/triggers/SafeTimerTaskTest.java
@@ -31,13 +31,13 @@ public class SafeTimerTaskTest {
 
     @After
     public void tearDown() throws Exception {
-        System.clearProperty(SafeTimerTask.TASKS_LOGS_ROOT_PATH_PROPERTY);
+        System.clearProperty(SafeTimerTask.LOGS_ROOT_PATH_PROPERTY);
     }
 
     @Issue("JENKINS-50291")
     @Test
     public void changeLogsRoot() throws Exception {
-        assertNull(System.getProperty(SafeTimerTask.TASKS_LOGS_ROOT_PATH_PROPERTY));
+        assertNull(System.getProperty(SafeTimerTask.LOGS_ROOT_PATH_PROPERTY));
 
         File temporaryFolder = folder.newFolder();
 
@@ -50,7 +50,7 @@ public class SafeTimerTaskTest {
         assertTrue(logsRoot.exists());
         assertTrue(logsRoot.isDirectory());
 
-        System.setProperty(SafeTimerTask.TASKS_LOGS_ROOT_PATH_PROPERTY, temporaryFolder.toString());
+        System.setProperty(SafeTimerTask.LOGS_ROOT_PATH_PROPERTY, temporaryFolder.toString());
         assertEquals(temporaryFolder.toString(), SafeTimerTask.getLogsRoot().toString());
     }