diff --git a/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap b/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
index c121c5cb0..e3d490a78 100644
--- a/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/binary-expressions/__snapshots__/jsfmt.spec.js.snap
@@ -7,13 +7,13 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 function f() {
-  const appEntitys = getAppEntitys(loadObject).filter(
+  const appEntities = getAppEntities(loadObject).filter(
     entity => entity && entity.isInstallAvailable() && !entity.isQueue() && entity.isDisabled()
   )
 }
 
 function f() {
-  const appEntitys = getAppEntitys(loadObject).map(
+  const appEntities = getAppEntities(loadObject).map(
     entity => entity && entity.isInstallAvailable() && !entity.isQueue() && entity.isDisabled() && {
       id: entity.id
     }
@@ -22,7 +22,7 @@ function f() {
 
 =====================================output=====================================
 function f() {
-  const appEntitys = getAppEntitys(loadObject).filter(
+  const appEntities = getAppEntities(loadObject).filter(
     entity =>
       entity &&
       entity.isInstallAvailable() &&
@@ -32,7 +32,7 @@ function f() {
 }
 
 function f() {
-  const appEntitys = getAppEntitys(loadObject).map(
+  const appEntities = getAppEntities(loadObject).map(
     entity =>
       entity &&
       entity.isInstallAvailable() &&
@@ -75,14 +75,14 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 a = (
-  // Commment 1
+  // Comment 1
   (Math.random() * (yRange * (1 - minVerticalFraction)))
   + (minVerticalFraction * yRange)
 ) - offset;
 
 =====================================output=====================================
 a =
-  // Commment 1
+  // Comment 1
   Math.random() * (yRange * (1 - minVerticalFraction)) +
   minVerticalFraction * yRange -
   offset;
diff --git a/tests/binary-expressions/arrow.js b/tests/binary-expressions/arrow.js
index a59339032..754368f6f 100644
--- a/tests/binary-expressions/arrow.js
+++ b/tests/binary-expressions/arrow.js
@@ -1,11 +1,11 @@
 function f() {
-  const appEntitys = getAppEntitys(loadObject).filter(
+  const appEntities = getAppEntities(loadObject).filter(
     entity => entity && entity.isInstallAvailable() && !entity.isQueue() && entity.isDisabled()
   )
 }
 
 function f() {
-  const appEntitys = getAppEntitys(loadObject).map(
+  const appEntities = getAppEntities(loadObject).map(
     entity => entity && entity.isInstallAvailable() && !entity.isQueue() && entity.isDisabled() && {
       id: entity.id
     }
diff --git a/tests/binary-expressions/comment.js b/tests/binary-expressions/comment.js
index 242ab169a..3a039c569 100644
--- a/tests/binary-expressions/comment.js
+++ b/tests/binary-expressions/comment.js
@@ -1,5 +1,5 @@
 a = (
-  // Commment 1
+  // Comment 1
   (Math.random() * (yRange * (1 - minVerticalFraction)))
   + (minVerticalFraction * yRange)
 ) - offset;
diff --git a/tests/mdx/__snapshots__/jsfmt.spec.js.snap b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
index 24d1df46a..ed8f85bd7 100644
--- a/tests/mdx/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/mdx/__snapshots__/jsfmt.spec.js.snap
@@ -429,7 +429,7 @@ export  const   foo    = {
 <Foo bg='red'>
       <Bar    >hi    </Bar>
        {  hello       }
-       {     /* another commment */}
+       {     /* another comment */}
 </Foo>
 
 \`\`\`
@@ -468,7 +468,7 @@ I'm an awesome paragraph.
 <Foo bg="red">
   <Bar>hi </Bar>
   {hello}
-  {/* another commment */}
+  {/* another comment */}
 </Foo>
 
 \`\`\`
@@ -520,7 +520,7 @@ export  const   foo    = {
 <Foo bg='red'>
       <Bar    >hi    </Bar>
        {  hello       }
-       {     /* another commment */}
+       {     /* another comment */}
 </Foo>
 
 \`\`\`
@@ -559,7 +559,7 @@ I'm an awesome paragraph.
 <Foo bg="red">
   <Bar>hi </Bar>
   {hello}
-  {/* another commment */}
+  {/* another comment */}
 </Foo>
 
 \`\`\`
diff --git a/tests/mdx/mixed.mdx b/tests/mdx/mixed.mdx
index efe333f35..ba32587b1 100644
--- a/tests/mdx/mixed.mdx
+++ b/tests/mdx/mixed.mdx
@@ -19,7 +19,7 @@ export  const   foo    = {
 <Foo bg='red'>
       <Bar    >hi    </Bar>
        {  hello       }
-       {     /* another commment */}
+       {     /* another comment */}
 </Foo>
 
 ```
diff --git a/website/blog/2017-04-13-1.0.0.md b/website/blog/2017-04-13-1.0.0.md
index a1644e7f3..e5579fb3c 100644
--- a/website/blog/2017-04-13-1.0.0.md
+++ b/website/blog/2017-04-13-1.0.0.md
@@ -950,13 +950,13 @@ let {
 ```js
 // Before
 a = Math.random() * (yRange * (1 - minVerticalFraction)) +
-  minVerticalFraction * yRange// Commment
+  minVerticalFraction * yRange// Comment
    -
   offset;
 
 // After
 a =
-  // Commment
+  // Comment
   Math.random() * (yRange * (1 - minVerticalFraction)) +
   minVerticalFraction * yRange -
   offset;
diff --git a/website/playground/codeSamples.js b/website/playground/codeSamples.js
index cb0a1682d..4e6250d36 100644
--- a/website/playground/codeSamples.js
+++ b/website/playground/codeSamples.js
@@ -194,7 +194,7 @@ export default function(parser) {
         "<Foo bg='red'>",
         "      <Bar    >hi    </Bar>",
         "       {  hello       }",
-        "       {     /* another commment */}",
+        "       {     /* another comment */}",
         "</Foo>",
         "",
         "```",