diff --git a/NBattleshipCodingContest.Logic.Tests/RandomBoardFillterTests.cs b/NBattleshipCodingContest.Logic.Tests/RandomBoardFillerTests.cs
similarity index 97%
rename from NBattleshipCodingContest.Logic.Tests/RandomBoardFillterTests.cs
rename to NBattleshipCodingContest.Logic.Tests/RandomBoardFillerTests.cs
index 2b57614..44e22cb 100644
--- a/NBattleshipCodingContest.Logic.Tests/RandomBoardFillterTests.cs
+++ b/NBattleshipCodingContest.Logic.Tests/RandomBoardFillerTests.cs
@@ -3,7 +3,7 @@
     using Moq;
     using Xunit;
 
-    public class RandomBoardFillterTests
+    public class RandomBoardFillerTests
     {
         [Fact]
         public void Fill()
diff --git a/NBattleshipCodingContest.Logic/BattleshipBoard.cs b/NBattleshipCodingContest.Logic/BattleshipBoard.cs
index 6a1a50c..729c68f 100644
--- a/NBattleshipCodingContest.Logic/BattleshipBoard.cs
+++ b/NBattleshipCodingContest.Logic/BattleshipBoard.cs
@@ -65,7 +65,7 @@ public bool TryPlaceShip(BoardIndex ix, int shipLength, Direction direction)
         /// <param name="ix">Coordinates where the ship should be placed</param>
         /// <param name="shipLength">Length of the ship (max. 10)</param>
         /// <param name="direction">Direction of the ship</param>
-        /// <param name="isWater">Callback to find out if a given suqare is water before placing the ship</param>
+        /// <param name="isWater">Callback to find out if a given square is water before placing the ship</param>
         /// <returns>
         /// <c>true</c> if the ship can be placed here, otherwise <c>false</c>.
         /// </returns>
diff --git a/NBattleshipCodingContest.Logic/BoardIndex.cs b/NBattleshipCodingContest.Logic/BoardIndex.cs
index 0631b96..8489e45 100644
--- a/NBattleshipCodingContest.Logic/BoardIndex.cs
+++ b/NBattleshipCodingContest.Logic/BoardIndex.cs
@@ -27,7 +27,7 @@ private static int GetIndex(int col, int row)
             // This is a private method, so we can assume that col and row
             // contain valid values. We check them only in debug builds.
 
-            // Read more about assertation in C#
+            // Read more about assertion in C#
             // https://docs.microsoft.com/en-us/visualstudio/debugger/assertions-in-managed-code
             Debug.Assert(col is >= 0 and <= 9 && row is >= 0 and <= 9);
 
diff --git a/NBattleshipCodingContest.Logic/Game.cs b/NBattleshipCodingContest.Logic/Game.cs
index af8d466..e16cb55 100644
--- a/NBattleshipCodingContest.Logic/Game.cs
+++ b/NBattleshipCodingContest.Logic/Game.cs
@@ -79,7 +79,7 @@ public SquareContent Shoot(int shootingPlayer, BoardIndex ix)
                 if (shipResult == ShipFindingResult.CompleteShip
                     && shipRange.All(ix => shootingBoard[ix] == SquareContent.HitShip))
                 {
-                    // The hit sank the ship -> change all ship quares to SunkenShip
+                    // The hit sank the ship -> change all ship squares to SunkenShip
                     content = SquareContent.SunkenShip;
                     foreach(var shipIx in shipRange)
                     {
diff --git a/NBattleshipCodingContest.Logic/ISinglePlayerGame.cs b/NBattleshipCodingContest.Logic/ISinglePlayerGame.cs
index 47df1f2..e440d41 100644
--- a/NBattleshipCodingContest.Logic/ISinglePlayerGame.cs
+++ b/NBattleshipCodingContest.Logic/ISinglePlayerGame.cs
@@ -6,7 +6,7 @@
     // NOTE that this interface is for future use. Currently not part of the project.
 
     /// <summary>
-    /// Represens a log entry in a single-player game' log
+    /// Represents a log entry in a single-player game' log
     /// </summary>
     public record SinglePlayerGameLogRecord(BoardIndex Location, SquareContent ShotResult);
 
@@ -36,7 +36,7 @@ public interface ISinglePlayerGame
         /// Gets the board with ships on it
         /// </summary>
         /// <remarks>
-        /// The computer player has to shink those ships. Does not contain <see cref="SquareContent.Unknown"/>
+        /// The computer player has to sink those ships. Does not contain <see cref="SquareContent.Unknown"/>
         /// squares.
         /// </remarks>
         IReadOnlyBoard Board { get; }
diff --git a/NBattleshipCodingContest.Logic/ReadOnlyBoardExtensions.cs b/NBattleshipCodingContest.Logic/ReadOnlyBoardExtensions.cs
index 211f572..8ed30ca 100644
--- a/NBattleshipCodingContest.Logic/ReadOnlyBoardExtensions.cs
+++ b/NBattleshipCodingContest.Logic/ReadOnlyBoardExtensions.cs
@@ -18,7 +18,7 @@ public static class ReadOnlyBoardExtensions
         /// </summary>
         /// <param name="board">Board to convert</param>
         /// <returns>
-        /// String in which each letter represents one board sqare.
+        /// String in which each letter represents one board square.
         /// </returns>
         public static string ToShortString(this IReadOnlyBoard board) =>
             string.Create(100, board, (buf, content) =>
diff --git a/NBattleshipCodingContest.Players/PlayerBase.cs b/NBattleshipCodingContest.Players/PlayerBase.cs
index 9a7f9f6..cb2dc5a 100644
--- a/NBattleshipCodingContest.Players/PlayerBase.cs
+++ b/NBattleshipCodingContest.Players/PlayerBase.cs
@@ -30,7 +30,7 @@ public abstract class PlayerBase
         /// Gets the next shot from the player.
         /// </summary>
         /// <param name="gameId">Unique identifier of the current game</param>
-        /// <param name="opponent">identifier of the opponent</param>
+        /// <param name="opponentId">identifier of the opponent</param>
         /// <param name="board">Current board content</param>
         /// <param name="shoot">Callback with which the method has to do the shooting</param>
         /// <remarks>
diff --git a/NBattleshipCodingContest.Players/Sequential.cs b/NBattleshipCodingContest.Players/Sequential.cs
index 1815797..cc239a2 100644
--- a/NBattleshipCodingContest.Players/Sequential.cs
+++ b/NBattleshipCodingContest.Players/Sequential.cs
@@ -17,7 +17,7 @@ public override async Task GetShot(Guid _, string __, IReadOnlyBoard board, Shoo
             // Find next unknown square
             while (board[ix] != SquareContent.Unknown) ix = ix.Next();
 
-            // Shoot at first unknonwn square
+            // Shoot at first unknown square
             await shoot(ix);
         }
     }
diff --git a/NBattleshipCodingContest.PlayersGenerator.Tests/PlayersGeneratorTest.cs b/NBattleshipCodingContest.PlayersGenerator.Tests/PlayersGeneratorTest.cs
index 211b82a..8138b68 100644
--- a/NBattleshipCodingContest.PlayersGenerator.Tests/PlayersGeneratorTest.cs
+++ b/NBattleshipCodingContest.PlayersGenerator.Tests/PlayersGeneratorTest.cs
@@ -90,7 +90,7 @@ public void SyntaxReceiver()
             var (tree, _) = Compile(Code);
             var receiver = FillReceiver(tree);
 
-            // Check that syntax receiver recogniced candidate classes (i.e. classes
+            // Check that syntax receiver recognized candidate classes (i.e. classes
             // with at least one base class).
             Assert.Equal(4, receiver.CandidateClasses.Count);
         }
diff --git a/NBattleshipCodingContest.PlayersGenerator/PlayersGenerator.cs b/NBattleshipCodingContest.PlayersGenerator/PlayersGenerator.cs
index 9ac382b..911b61a 100644
--- a/NBattleshipCodingContest.PlayersGenerator/PlayersGenerator.cs
+++ b/NBattleshipCodingContest.PlayersGenerator/PlayersGenerator.cs
@@ -40,7 +40,7 @@ public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
         /// <inheritdoc/>
         public void Initialize(GeneratorInitializationContext context) =>
             // We do the work in a helper functions because we want to be able to verify that
-            // a syntax receiver is registeres. However, our mocking framework Moq does not support
+            // a syntax receiver is registered. However, our mocking framework Moq does not support
             // creating mock objects for structs like this (at least I don't know how to do it).
             InitializeImpl(context.RegisterForSyntaxNotifications);
 
@@ -73,7 +73,7 @@ public static class PlayerList
         {
 ");
 
-            // Mandator base class for players
+            // Mandatory base class for players
             var playerBaseSymbol = compilation.GetTypeByMetadataName("NBattleshipCodingContest.Players.PlayerBase");
             if (playerBaseSymbol == null)
             {
diff --git a/NBattleshipCodingContest.Protocol/ProtocolTranslator.cs b/NBattleshipCodingContest.Protocol/ProtocolTranslator.cs
index a18ad88..6697717 100644
--- a/NBattleshipCodingContest.Protocol/ProtocolTranslator.cs
+++ b/NBattleshipCodingContest.Protocol/ProtocolTranslator.cs
@@ -27,7 +27,7 @@ public static SquareContent EncodeSquareContent(Logic.SquareContent content)
         {
             var result = (SquareContent)content;
 
-            // Check enum value in debug build. Read more about assertation in C#
+            // Check enum value in debug build. Read more about assertion in C#
             // https://docs.microsoft.com/en-us/visualstudio/debugger/assertions-in-managed-code
             Debug.Assert(Enum.IsDefined(typeof(Logic.SquareContent), content));
             Debug.Assert(Enum.IsDefined(typeof(SquareContent), result));