diff --git a/components/menu/index.css b/components/menu/index.css
index 1e61f9c464..355ace7285 100644
--- a/components/menu/index.css
+++ b/components/menu/index.css
@@ -150,7 +150,7 @@ governing permissions and limitations under the License.
     inline-size: calc(
       100% - var(--spectrum-icon-checkmark-medium-width) -
         var(--spectrum-listitem-texticon-icon-gap) -
-        var(--spectrum-listitem-thumbnail-padding-left) -
+        var(--spectrum-listitem-textthumbnail-padding-left) -
         var(--spectrum-alias-workflow-icon-size-m)
     );
   }
diff --git a/components/progresscircle/index.css b/components/progresscircle/index.css
index 215ba12a0e..9e2fdd6845 100644
--- a/components/progresscircle/index.css
+++ b/components/progresscircle/index.css
@@ -14,18 +14,18 @@ governing permissions and limitations under the License.
 
 .spectrum-ProgressCircle {
   display: inline-block;
-  inline-size: var(--spectrum-progresscircle-medium-width);
-  block-size: var(--spectrum-progresscircle-medium-height);
+  inline-size: var(--spectrum-progresscircle-m-width);
+  block-size: var(--spectrum-progresscircle-m-height);
   position: relative;
   direction: ltr;
 }
 .spectrum-ProgressCircle-track {
   box-sizing: border-box;
-  inline-size: calc(var(--spectrum-progresscircle-medium-width));
-  block-size: calc(var(--spectrum-progresscircle-medium-height));
+  inline-size: calc(var(--spectrum-progresscircle-m-width));
+  block-size: calc(var(--spectrum-progresscircle-m-height));
   border-style: solid;
-  border-width: var(--spectrum-progresscircle-medium-border-size);
-  border-radius: var(--spectrum-progresscircle-medium-width);
+  border-width: var(--spectrum-progresscircle-m-border-size);
+  border-radius: var(--spectrum-progresscircle-m-width);
 }
 .spectrum-ProgressCircle-fills {
   position: absolute;
@@ -36,11 +36,11 @@ governing permissions and limitations under the License.
 }
 .spectrum-ProgressCircle-fill {
   box-sizing: border-box;
-  inline-size: calc(var(--spectrum-progresscircle-medium-width));
-  block-size: calc(var(--spectrum-progresscircle-medium-height));
+  inline-size: calc(var(--spectrum-progresscircle-m-width));
+  block-size: calc(var(--spectrum-progresscircle-m-height));
   border-style: solid;
-  border-width: var(--spectrum-progresscircle-medium-border-size);
-  border-radius: var(--spectrum-progresscircle-medium-width);
+  border-width: var(--spectrum-progresscircle-m-border-size);
+  border-radius: var(--spectrum-progresscircle-m-width);
 }
 .spectrum-ProgressCircle-fillMask1,
 .spectrum-ProgressCircle-fillMask2 {
@@ -64,43 +64,43 @@ governing permissions and limitations under the License.
 }
 
 .spectrum-ProgressCircle--small {
-  inline-size: var(--spectrum-progresscircle-small-width);
-  block-size: var(--spectrum-progresscircle-small-height);
+  inline-size: var(--spectrum-progresscircle-s-width);
+  block-size: var(--spectrum-progresscircle-s-height);
 
   .spectrum-ProgressCircle-track {
-    inline-size: calc(var(--spectrum-progresscircle-small-width));
-    block-size: calc(var(--spectrum-progresscircle-small-height));
+    inline-size: calc(var(--spectrum-progresscircle-s-width));
+    block-size: calc(var(--spectrum-progresscircle-s-height));
     border-style: solid;
-    border-width: var(--spectrum-progresscircle-small-border-size);
-    border-radius: var(--spectrum-progresscircle-small-width);
+    border-width: var(--spectrum-progresscircle-s-border-size);
+    border-radius: var(--spectrum-progresscircle-s-width);
   }
   .spectrum-ProgressCircle-fill {
-    inline-size: calc(var(--spectrum-progresscircle-small-width));
-    block-size: calc(var(--spectrum-progresscircle-small-height));
+    inline-size: calc(var(--spectrum-progresscircle-s-width));
+    block-size: calc(var(--spectrum-progresscircle-s-height));
     border-style: solid;
-    border-width: var(--spectrum-progresscircle-small-border-size);
-    border-radius: var(--spectrum-progresscircle-small-width);
+    border-width: var(--spectrum-progresscircle-s-border-size);
+    border-radius: var(--spectrum-progresscircle-s-width);
   }
 }
 
 .spectrum-ProgressCircle--large {
-  inline-size: var(--spectrum-progresscircle-large-width);
-  block-size: var(--spectrum-progresscircle-large-height);
+  inline-size: var(--spectrum-progresscircle-l-width);
+  block-size: var(--spectrum-progresscircle-l-height);
 
   .spectrum-ProgressCircle-track {
-    inline-size: calc(var(--spectrum-progresscircle-large-width));
-    block-size: calc(var(--spectrum-progresscircle-large-height));
+    inline-size: calc(var(--spectrum-progresscircle-l-width));
+    block-size: calc(var(--spectrum-progresscircle-l-height));
     border-style: solid;
-    border-width: var(--spectrum-progresscircle-large-border-size);
-    border-radius: var(--spectrum-progresscircle-large-width);
+    border-width: var(--spectrum-progresscircle-l-border-size);
+    border-radius: var(--spectrum-progresscircle-l-width);
   }
 
   .spectrum-ProgressCircle-fill {
-    inline-size: calc(var(--spectrum-progresscircle-large-width));
-    block-size: calc(var(--spectrum-progresscircle-large-height));
+    inline-size: calc(var(--spectrum-progresscircle-l-width));
+    block-size: calc(var(--spectrum-progresscircle-l-height));
     border-style: solid;
-    border-width: var(--spectrum-progresscircle-large-border-size);
-    border-radius: var(--spectrum-progresscircle-large-width);
+    border-width: var(--spectrum-progresscircle-l-border-size);
+    border-radius: var(--spectrum-progresscircle-l-width);
   }
 }
 
diff --git a/components/progresscircle/skin.css b/components/progresscircle/skin.css
index 9345cbef95..db1f67f389 100644
--- a/components/progresscircle/skin.css
+++ b/components/progresscircle/skin.css
@@ -11,22 +11,22 @@ governing permissions and limitations under the License.
 */
 
 .spectrum-ProgressCircle-track {
-  border-color: var(--spectrum-progresscircle-medium-track-color);
+  border-color: var(--spectrum-progresscircle-m-track-color);
 }
 
 .spectrum-ProgressCircle-fill {
-  border-color: var(--spectrum-progresscircle-medium-track-fill-color);
+  border-color: var(--spectrum-progresscircle-m-track-fill-color);
 }
 
 .spectrum-ProgressCircle--overBackground {
   .spectrum-ProgressCircle-track {
     border-color: var(
-      --spectrum-progresscircle-medium-over-background-track-color
+      --spectrum-progresscircle-m-over-background-track-color
     );
   }
   .spectrum-ProgressCircle-fill {
     border-color: var(
-      --spectrum-progresscircle-medium-over-background-track-fill-color
+      --spectrum-progresscircle-m-over-background-track-fill-color
     );
   }
 }
@@ -34,12 +34,12 @@ governing permissions and limitations under the License.
 .spectrum-ProgressCircle--indeterminate.spectrum-ProgressCircle--overBackground {
   .spectrum-ProgressCircle-track {
     border-color: var(
-      --spectrum-progresscircle-medium-over-background-track-color
+      --spectrum-progresscircle-m-over-background-track-color
     );
   }
   .spectrum-ProgressCircle-fill {
     border-color: var(
-      --spectrum-progresscircle-medium-over-background-track-fill-color
+      --spectrum-progresscircle-m-over-background-track-fill-color
     );
   }
 }