diff --git a/src/Ruleset.php b/src/Ruleset.php
index 8f04c8d7f8..d1ef2a4d75 100644
--- a/src/Ruleset.php
+++ b/src/Ruleset.php
@@ -332,7 +332,7 @@ public function explain()
         }//end foreach
 
         if (count($this->deprecatedSniffs) > 0) {
-            echo PHP_EOL.'* Sniffs marked with an asterix are deprecated.'.PHP_EOL;
+            echo PHP_EOL.'* Sniffs marked with an asterisk are deprecated.'.PHP_EOL;
         }
 
     }//end explain()
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
index 666b1916e7..17e81850cb 100644
--- a/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
+++ b/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php
@@ -92,7 +92,7 @@ public function process(File $phpcsFile, $stackPtr)
                     return;
                 }
 
-                // If it is not an array check what is inside.
+                // If it is not an array, check what is inside.
                 $found = $phpcsFile->findPrevious(
                     T_VARIABLE,
                     ($previousIndex - 1),
diff --git a/tests/Core/Files/File/FindStartOfStatementTest.php b/tests/Core/Files/File/FindStartOfStatementTest.php
index 3506cc137a..4e0916dd00 100644
--- a/tests/Core/Files/File/FindStartOfStatementTest.php
+++ b/tests/Core/Files/File/FindStartOfStatementTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Files\File:findStartOfStatement method.
+ * Tests for the \PHP_CodeSniffer\Files\File::findStartOfStatement method.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
@@ -15,7 +15,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 
 /**
- * Tests for the \PHP_CodeSniffer\Files\File:findStartOfStatement method.
+ * Tests for the \PHP_CodeSniffer\Files\File::findStartOfStatement method.
  *
  * @covers \PHP_CodeSniffer\Files\File::findStartOfStatement
  */
diff --git a/tests/Core/Ruleset/ExplainTest.php b/tests/Core/Ruleset/ExplainTest.php
index 3e52cef685..38c74be31f 100644
--- a/tests/Core/Ruleset/ExplainTest.php
+++ b/tests/Core/Ruleset/ExplainTest.php
@@ -200,7 +200,7 @@ public function testExplainWithDeprecatedSniffs()
         $expected .= '  TestStandard.SetProperty.PropertyTypeHandling'.PHP_EOL;
         $expected .= '  TestStandard.ValidSniffs.RegisterEmptyArray'.PHP_EOL.PHP_EOL;
 
-        $expected .= '* Sniffs marked with an asterix are deprecated.'.PHP_EOL;
+        $expected .= '* Sniffs marked with an asterisk are deprecated.'.PHP_EOL;
 
         $this->expectOutputString($expected);
 
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.inc b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.inc
index 8df21a6c35..5a0debcd02 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.inc
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.inc
@@ -58,7 +58,7 @@ switch (true) {
     case CONSTANT:
     /* testCaseWithConstantAndIdenticalIsNotEnumCase */
     case CONSTANT === 1:
-    /* testCaseWithAssigmentToConstantIsNotEnumCase */
+    /* testCaseWithAssignmentToConstantIsNotEnumCase */
     case CONSTANT = 1:
     /* testIsNotEnumCaseIsCaseInsensitive */
     cAsE CONSTANT:
diff --git a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
index 51382d3c5d..ca70a34c13 100644
--- a/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
@@ -163,7 +163,7 @@ public static function dataNotEnumCases()
                 'testCloserMarker' => '/* testCaseConstantCloserMarker */',
             ],
             'switch case with constant, assignment'                             => [
-                'testMarker'       => '/* testCaseWithAssigmentToConstantIsNotEnumCase */',
+                'testMarker'       => '/* testCaseWithAssignmentToConstantIsNotEnumCase */',
                 'expectedTokens'   => [
                     'scope_opener' => T_COLON,
                     'scope_closer' => T_CLOSE_CURLY_BRACKET,