diff --git a/src/config.rs b/src/config.rs
index 1119f92bd62..329c67d2b0d 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -89,7 +89,7 @@ create_config! {
     fn_brace_style: BraceStyle,
     fn_return_indent: ReturnIndent,
     fn_args_paren_newline: bool,
-    fn_args_layout: Density,
+    fn_args_density: Density,
     fn_arg_indent: BlockIndentStyle,
     where_density: Density, // Should we at least try to put the where clause on the same line as
                             // the rest of the function decl?
@@ -122,7 +122,7 @@ impl Default for Config {
             fn_brace_style: BraceStyle::SameLineWhere,
             fn_return_indent: ReturnIndent::WithArgs,
             fn_args_paren_newline: true,
-            fn_args_layout: Density::Tall,
+            fn_args_density: Density::Tall,
             fn_arg_indent: BlockIndentStyle::Visual,
             where_density: Density::Tall,
             where_indent: BlockIndentStyle::Tabbed,
diff --git a/src/items.rs b/src/items.rs
index cc431792c10..fd163cec680 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -363,7 +363,7 @@ impl<'a> FmtVisitor<'a> {
         };
 
         let fmt = ListFormatting {
-            tactic: self.config.fn_args_layout.to_list_tactic(),
+            tactic: self.config.fn_args_density.to_list_tactic(),
             separator: ",",
             trailing_separator: SeparatorTactic::Never,
             indent: indent,
diff --git a/tests/config/small_tabs.toml b/tests/config/small_tabs.toml
index 4c220dbc5d2..08a0c22cc10 100644
--- a/tests/config/small_tabs.toml
+++ b/tests/config/small_tabs.toml
@@ -6,7 +6,7 @@ newline_style = "Unix"
 fn_brace_style = "SameLineWhere"
 fn_return_indent = "WithArgs"
 fn_args_paren_newline = true
-fn_args_layout = "Tall"
+fn_args_density = "Tall"
 fn_arg_indent = "Visual"
 where_density = "Tall"
 where_indent = "Tabbed"
diff --git a/tests/source/fn-custom.rs b/tests/source/fn-custom.rs
index 77ced4c5e0e..b8d734bfbaf 100644
--- a/tests/source/fn-custom.rs
+++ b/tests/source/fn-custom.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_layout: Compressed
+// rustfmt-fn_args_density: Compressed
 // Test some of the ways function signatures can be customised.
 
 // Test compressed layout of args.
diff --git a/tests/target/fn-custom.rs b/tests/target/fn-custom.rs
index 01abeaebb9e..ad36de7a997 100644
--- a/tests/target/fn-custom.rs
+++ b/tests/target/fn-custom.rs
@@ -1,4 +1,4 @@
-// rustfmt-fn_args_layout: Compressed
+// rustfmt-fn_args_density: Compressed
 // Test some of the ways function signatures can be customised.
 
 // Test compressed layout of args.