diff --git a/.rubocop.yml b/.rubocop.yml
index 3069bb7e..1d17e911 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,7 +2,7 @@
 # vim: ft=yaml
 ---
 # General overrides used across formulas in the org
-Metrics/LineLength:
+Layout/LineLength:
   # Increase from default of `80`
   # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
   Max: 88
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
index 0451b2c8..bc437cb0 100644
--- a/ssf/defaults.yaml
+++ b/ssf/defaults.yaml
@@ -22,8 +22,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length rule:quoted-strings
-            title: "ci(kitchen+travis+inspec): fix '`'amazonlinux-2-py3'`' [skip ci]"
-            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/128'
+            title: "chore(rubocop): move '`'LineLength'`' cop from '`'Metrics'`' to '`'Layout'`' [skip ci]"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/129'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'
@@ -152,7 +152,7 @@ ssf_node_anchors:
         rubocop:
           AllCops: {}
           Cops:
-            Metrics/LineLength:
+            Layout/LineLength:
               Bugbear: *line_length_bugbear
               Default: *line_length_default
               Max: *line_length_bugbear
diff --git a/ssf/files/default/.rubocop.yml b/ssf/files/default/.rubocop.yml
index 5dcbd075..8bded6da 100644
--- a/ssf/files/default/.rubocop.yml
+++ b/ssf/files/default/.rubocop.yml
@@ -2,14 +2,14 @@
 # vim: ft=yaml
 ---
 # General overrides used across formulas in the org
-{%- set MLL = 'Metrics/LineLength' %}
-{{ MLL }}:
-  {%- set rbcp_MLL = rubocop.Cops.get(MLL) %}
-  {%- if rbcp_MLL.Max == rbcp_MLL.Bugbear %}
-  # Increase from default of `{{ rbcp_MLL.Default }}`
+{%- set LLL = 'Layout/LineLength' %}
+{{ LLL }}:
+  {%- set rbcp_LLL = rubocop.Cops.get(LLL) %}
+  {%- if rbcp_LLL.Max == rbcp_LLL.Bugbear %}
+  # Increase from default of `{{ rbcp_LLL.Default }}`
   # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
   {%- endif %}
-  Max: {{ rbcp_MLL.Max }}
+  Max: {{ rbcp_LLL.Max }}
 
 {%- if rubocop.AllCops %}
 
@@ -30,7 +30,7 @@ AllCops:
 {%- if semrel_formula == 'template' %}
 # <REMOVEME
 {%- endif %}
-{%- for cop, config in rubocop.Cops.items() if cop not in [MLL] %}
+{%- for cop, config in rubocop.Cops.items() if cop not in [LLL] %}
 {{ cop }}:
   {#- This is purposefully simplistic for the time being,
       until (if ever) more advanced configuration is necessary #}