diff --git a/mercurial/configitems.py b/mercurial/configitems.py
index ec765a71bd653af0220bf67c450bb7470dc0903c_bWVyY3VyaWFsL2NvbmZpZ2l0ZW1zLnB5..cc977ec0b8b9302bd6ad8e3eeacabb2776161492_bWVyY3VyaWFsL2NvbmZpZ2l0ZW1zLnB5 100644
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -369,6 +369,10 @@
 coreconfigitem('experimental', 'evolution.createmarkers',
     default=None,
 )
+coreconfigitem('experimental', 'evolution.effect-flags',
+    default=False,
+    alias=[('experimental', 'effect-flags')]
+)
 coreconfigitem('experimental', 'evolution.exchange',
     default=None,
 )
@@ -387,9 +391,6 @@
 coreconfigitem('experimental', 'nonnormalparanoidcheck',
     default=False,
 )
-coreconfigitem('experimental', 'effect-flags',
-    default=False,
-)
 coreconfigitem('experimental', 'exportableenviron',
     default=list,
 )
diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
index ec765a71bd653af0220bf67c450bb7470dc0903c_bWVyY3VyaWFsL29ic29sZXRlLnB5..cc977ec0b8b9302bd6ad8e3eeacabb2776161492_bWVyY3VyaWFsL29ic29sZXRlLnB5 100644
--- a/mercurial/obsolete.py
+++ b/mercurial/obsolete.py
@@ -1077,7 +1077,7 @@
 
     # Effect flag metadata handling
     saveeffectflag = repo.ui.configbool('experimental',
-                                        'effect-flags')
+                                        'evolution.effect-flags')
 
     tr = repo.transaction('add-obsolescence-marker')
     try:
diff --git a/tests/test-obsmarkers-effectflag.t b/tests/test-obsmarkers-effectflag.t
index ec765a71bd653af0220bf67c450bb7470dc0903c_dGVzdHMvdGVzdC1vYnNtYXJrZXJzLWVmZmVjdGZsYWcudA==..cc977ec0b8b9302bd6ad8e3eeacabb2776161492_dGVzdHMvdGVzdC1vYnNtYXJrZXJzLWVmZmVjdGZsYWcudA== 100644
--- a/tests/test-obsmarkers-effectflag.t
+++ b/tests/test-obsmarkers-effectflag.t
@@ -13,7 +13,7 @@
   > rebase =
   > [experimental]
   > evolution = all
-  > effect-flags = 1
+  > evolution.effect-flags = 1
   > EOF
 
   $ hg init $TESTTMP/effect-flags