diff --git a/src/core/client/stream/components/__snapshots__/Comment.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/Comment.spec.tsx.snap
index 48a1c0464..9aafeaf5c 100644
--- a/src/core/client/stream/components/__snapshots__/Comment.spec.tsx.snap
+++ b/src/core/client/stream/components/__snapshots__/Comment.spec.tsx.snap
@@ -3,10 +3,15 @@
 exports[`renders username and body 1`] = `
 <div
   className="Comment-root"
+  role="article"
 >
-  <Username>
-    Marvin
-  </Username>
+  <div
+    className="Comment-topBar"
+  >
+    <Username>
+      Marvin
+    </Username>
+  </div>
   <withPropsOnChange(Typography)>
     Woof
   </withPropsOnChange(Typography)>
@@ -16,10 +21,15 @@ exports[`renders username and body 1`] = `
 exports[`renders with gutterBottom 1`] = `
 <div
   className="Comment-root Comment-gutterBottom"
+  role="article"
 >
-  <Username>
-    Marvin
-  </Username>
+  <div
+    className="Comment-topBar"
+  >
+    <Username>
+      Marvin
+    </Username>
+  </div>
   <withPropsOnChange(Typography)>
     Woof
   </withPropsOnChange(Typography)>
diff --git a/src/core/client/stream/components/__snapshots__/Username.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/Username.spec.tsx.snap
index 6682f3f3f..27d624f2f 100644
--- a/src/core/client/stream/components/__snapshots__/Username.spec.tsx.snap
+++ b/src/core/client/stream/components/__snapshots__/Username.spec.tsx.snap
@@ -1,11 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders correctly 1`] = `
-<withPropsOnChange(Typography)
+<span
   className="Username-root"
-  gutterBottom={true}
-  variant="heading2"
 >
   Marvin
-</withPropsOnChange(Typography)>
+</span>
 `;