diff --git a/debian/aptly.conf b/debian/aptly.conf
index ff05d361..ead467ec 100644
--- a/debian/aptly.conf
+++ b/debian/aptly.conf
@@ -51,13 +51,13 @@ dep_follow_suggests: false
 dep_follow_recommends: false
 
 # When dependency looks like `package-a | package-b`, follow both variants always
-dep_follow_allvariants: false
+dep_follow_all_variants: false
 
 # Follow dependency from binary package to source package
 dep_follow_source: false
 
 # Log additional details while resolving dependencies (useful for debugging)
-dep_verbose_resolve: false
+dep_verboseresolve: false
 
 
 # PPA
diff --git a/system/t02_config/CreateConfigTest_gold b/system/t02_config/CreateConfigTest_gold
index ff05d361..ead467ec 100644
--- a/system/t02_config/CreateConfigTest_gold
+++ b/system/t02_config/CreateConfigTest_gold
@@ -51,13 +51,13 @@ dep_follow_suggests: false
 dep_follow_recommends: false
 
 # When dependency looks like `package-a | package-b`, follow both variants always
-dep_follow_allvariants: false
+dep_follow_all_variants: false
 
 # Follow dependency from binary package to source package
 dep_follow_source: false
 
 # Log additional details while resolving dependencies (useful for debugging)
-dep_verbose_resolve: false
+dep_verboseresolve: false
 
 
 # PPA