From d8d583584bddd86ef7bdf084791e70ec87ecaf22 Mon Sep 17 00:00:00 2001
From: "Dan O. Williams" <daniel.williams@gsa.gov>
Date: Sun, 7 Oct 2018 13:46:54 -0700
Subject: [PATCH 1/3] Remove `object` namespace

---
 src/stylesheets/settings/_settings-general.scss | 4 ----
 src/stylesheets/theme/_uswds-theme-general.scss | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/stylesheets/settings/_settings-general.scss b/src/stylesheets/settings/_settings-general.scss
index d800050f31..f9128f48bc 100644
--- a/src/stylesheets/settings/_settings-general.scss
+++ b/src/stylesheets/settings/_settings-general.scss
@@ -44,10 +44,6 @@ $theme-namespace: (
     namespace:  'grid-',
     output:     true,
   ),
-  'object': (
-    namespace:  'add-',
-    output:     true,
-  ),
   'utility': (
     namespace:  'u-',
     output:     false,
diff --git a/src/stylesheets/theme/_uswds-theme-general.scss b/src/stylesheets/theme/_uswds-theme-general.scss
index 3b93dda223..9ee1ed29f8 100644
--- a/src/stylesheets/theme/_uswds-theme-general.scss
+++ b/src/stylesheets/theme/_uswds-theme-general.scss
@@ -44,10 +44,6 @@ $theme-namespace: (
     namespace:  'grid-',
     output:     true,
   ),
-  'object': (
-    namespace:  'add-',
-    output:     true,
-  ),
   'utility': (
     namespace:  'u-',
     output:     false,

From 6b372e390dab55ee8afa1871163a26b1f3faa542 Mon Sep 17 00:00:00 2001
From: "Dan O. Williams" <daniel.williams@gsa.gov>
Date: Sun, 7 Oct 2018 13:47:12 -0700
Subject: [PATCH 2/3] Manually correct utility names

---
 src/stylesheets/utilities/rules/add-aspect.scss     | 2 +-
 src/stylesheets/utilities/rules/add-list-reset.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/stylesheets/utilities/rules/add-aspect.scss b/src/stylesheets/utilities/rules/add-aspect.scss
index 79663085b1..af7481d652 100644
--- a/src/stylesheets/utilities/rules/add-aspect.scss
+++ b/src/stylesheets/utilities/rules/add-aspect.scss
@@ -18,7 +18,7 @@ example:
 
 $add-aspect: (
   add-aspect: (
-    base: 'aspect',
+    base: 'add-aspect',
     modifiers: null,
     values: (
       9x16: (
diff --git a/src/stylesheets/utilities/rules/add-list-reset.scss b/src/stylesheets/utilities/rules/add-list-reset.scss
index 2900da7e55..22325de14f 100644
--- a/src/stylesheets/utilities/rules/add-list-reset.scss
+++ b/src/stylesheets/utilities/rules/add-list-reset.scss
@@ -18,7 +18,7 @@ example:
 
 $add-list-reset: (
   list-reset: (
-    base: 'list',
+    base: 'add-list',
     modifiers: null,
     values: (
       reset: (

From f027674f272f69c93132726ed5e3fab297561871 Mon Sep 17 00:00:00 2001
From: "Dan O. Williams" <daniel.williams@gsa.gov>
Date: Sun, 7 Oct 2018 13:47:28 -0700
Subject: [PATCH 3/3] Use `utility` ns for all utilities

---
 src/stylesheets/core/mixins/_utility-builder.scss | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/stylesheets/core/mixins/_utility-builder.scss b/src/stylesheets/core/mixins/_utility-builder.scss
index cccfc7f717..94bc814866 100644
--- a/src/stylesheets/core/mixins/_utility-builder.scss
+++ b/src/stylesheets/core/mixins/_utility-builder.scss
@@ -17,12 +17,11 @@ loop
     null
   );
   $this-mq: null;
-  $this-type: map-get($utility, type);
 
   @if $mq {
     $this-mq: '#{$mq}\\:';
   }
-  .#{$this-mq}#{$pseudoclass}\:#{ns($this-type)}#{$selector}:#{$pseudoclass} {
+  .#{$this-mq}#{$pseudoclass}\:#{ns('utility')}#{$selector}:#{$pseudoclass} {
     @each $this-property in $property {
       #{$this-property}: unquote('#{$value}#{$important}');
     }
@@ -54,7 +53,6 @@ loop
   );
   $our-breakpoints: map-deep-get($system-properties, breakpoints, standard);
   $mq: null;
-  $this-type: map-get($utility, type);
   $value-is-map: if(
     type-of($val-props) == 'map',
     true,
@@ -67,7 +65,7 @@ loop
 
     @if map-get($theme-utility-breakpoints, $media-key) {
       @include at-media($media-key) {
-        .#{$mq}\:#{ns($this-type)}#{$selector} {
+        .#{$mq}\:#{ns('utility')}#{$selector} {
           @if $value-is-map and map-has-key($val-props, extend) {
             @include add-utility-declaration($val-props, extend, $important);
           }
@@ -113,14 +111,13 @@ future version of Sass' warning.
     null
   );
   $mq: null;
-  $this-type: map-get($utility, type);
   $value-is-map: if(
     type-of($val-props) == 'map',
     true,
     false
   );
 
-  .#{ns($this-type)}#{$selector} {
+  .#{ns('utility')}#{$selector} {
     @if $value-is-map and map-has-key($val-props, extend) {
       @include add-utility-declaration($val-props, extend, $important);
     }