diff --git a/RUNNING_TESTS.md b/RUNNING_TESTS.md
index a449a0d099..a6da665d52 100644
--- a/RUNNING_TESTS.md
+++ b/RUNNING_TESTS.md
@@ -21,7 +21,7 @@ can control the running node.
 
 `./mvnw verify` will start those nodes with the appropriate configuration.
 
-To easily fullfil all those requirements, you should use `make deps` to
+To easily fulfill all those requirements, you should use `make deps` to
 fetch the dependencies in the `deps` directory.
 
 You then run Maven with the `deps.dir` property set like this:
diff --git a/src/main/java/com/rabbitmq/client/ConnectionFactory.java b/src/main/java/com/rabbitmq/client/ConnectionFactory.java
index 9a9ea410ac..cbc055bf99 100644
--- a/src/main/java/com/rabbitmq/client/ConnectionFactory.java
+++ b/src/main/java/com/rabbitmq/client/ConnectionFactory.java
@@ -307,7 +307,7 @@ public void setVirtualHost(String virtualHost) {
     /**
      * Convenience method for setting the fields in an AMQP URI: host,
      * port, username, password and virtual host.  If any part of the
-     * URI is ommited, the ConnectionFactory's corresponding variable
+     * URI is omitted, the ConnectionFactory's corresponding variable
      * is left unchanged.
      * @param uri is the AMQP URI containing the data
      */
@@ -366,7 +366,7 @@ public void setUri(URI uri)
     /**
      * Convenience method for setting the fields in an AMQP URI: host,
      * port, username, password and virtual host.  If any part of the
-     * URI is ommited, the ConnectionFactory's corresponding variable
+     * URI is omitted, the ConnectionFactory's corresponding variable
      * is left unchanged.  Note that not all valid AMQP URIs are
      * accepted; in particular, the hostname must be given if the
      * port, username or password are given, and escapes in the
@@ -674,7 +674,7 @@ public boolean isSSL(){
     public void useSslProtocol()
         throws NoSuchAlgorithmException, KeyManagementException
     {
-        useSslProtocol(computeDefaultTlsProcotol(SSLContext.getDefault().getSupportedSSLParameters().getProtocols()));
+        useSslProtocol(computeDefaultTlsProtocol(SSLContext.getDefault().getSupportedSSLParameters().getProtocols()));
     }
 
     /**
@@ -777,7 +777,7 @@ protected void enableHostnameVerificationForBlockingIo() {
         }
     }
 
-    public static String computeDefaultTlsProcotol(String[] supportedProtocols) {
+    public static String computeDefaultTlsProtocol(String[] supportedProtocols) {
         if(supportedProtocols != null) {
             for (String supportedProtocol : supportedProtocols) {
                 if(PREFERRED_TLS_PROTOCOL.equalsIgnoreCase(supportedProtocol)) {
diff --git a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java
index d65008d96a..48949b4ca4 100644
--- a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java
+++ b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java
@@ -851,7 +851,7 @@ public void handleConnectionClose(Command closeCommand) {
         SocketCloseWait scw = new SocketCloseWait(sse);
 
         // if shutdown executor is configured, use it. Otherwise
-        // execut socket close monitor the old fashioned way.
+        // execute socket close monitor the old fashioned way.
         // see rabbitmq/rabbitmq-java-client#91
         if(shutdownExecutor != null) {
             shutdownExecutor.execute(scw);
diff --git a/src/main/java/com/rabbitmq/client/impl/ChannelN.java b/src/main/java/com/rabbitmq/client/impl/ChannelN.java
index 17bee9ffe7..aea0ee7a4b 100644
--- a/src/main/java/com/rabbitmq/client/impl/ChannelN.java
+++ b/src/main/java/com/rabbitmq/client/impl/ChannelN.java
@@ -602,7 +602,7 @@ public AMQCommand transformReply(AMQCommand command) {
         boolean notify = false;
         try {
             // Synchronize the block below to avoid race conditions in case
-            // connnection wants to send Connection-CloseOK
+            // connection wants to send Connection-CloseOK
             synchronized (_channelMutex) {
                 startProcessShutdownSignal(signal, !initiatedByApplication, true);
                 quiescingRpc(reason, k);
diff --git a/src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java b/src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java
index 139f9eb5ea..db2005d32f 100644
--- a/src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java
+++ b/src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java
@@ -38,7 +38,7 @@ public class MethodArgumentWriter
     private int bitMask;
 
     /**
-     * Constructs a MethodArgumentWriter targetting the given DataOutputStream.
+     * Constructs a MethodArgumentWriter targeting the given DataOutputStream.
      */
     public MethodArgumentWriter(ValueWriter out)
     {
diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
index bfd2336a5b..379961971c 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
@@ -681,7 +681,7 @@ private void recoverTopology(final ExecutorService executor) {
                 recoverEntitiesAsynchronously(executor, Utility.copy(recordedBindings));
                 recoverEntitiesAsynchronously(executor, Utility.copy(consumers).values());
             } catch (final Exception cause) {
-                final String message = "Caught an exception while recovering toplogy: " + cause.getMessage();
+                final String message = "Caught an exception while recovering topology: " + cause.getMessage();
                 final TopologyRecoveryException e = new TopologyRecoveryException(message, cause);
                 getExceptionHandler().handleTopologyRecoveryException(delegate, null, e);
             }
diff --git a/src/main/java/com/rabbitmq/utility/IntAllocator.java b/src/main/java/com/rabbitmq/utility/IntAllocator.java
index b0f25075b7..6032a4dcc8 100644
--- a/src/main/java/com/rabbitmq/utility/IntAllocator.java
+++ b/src/main/java/com/rabbitmq/utility/IntAllocator.java
@@ -23,7 +23,7 @@
  * {@link BitSet} representation of the free integers.
  * </p>
  *
- * <h2>Concurrecy Semantics:</h2>
+ * <h2>Concurrency Semantics:</h2>
  * This class is <b><i>not</i></b> thread safe.
  *
  * <h2>Implementation notes:</h2>
diff --git a/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java b/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java
index 68ed763cd0..ed930c111e 100644
--- a/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java
+++ b/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java
@@ -129,7 +129,7 @@ private SslContextFactory sslContextFactory() throws Exception {
     }
 
     private String tlsProtocol() throws NoSuchAlgorithmException {
-        return ConnectionFactory.computeDefaultTlsProcotol(SSLContext.getDefault().getSupportedSSLParameters().getProtocols());
+        return ConnectionFactory.computeDefaultTlsProtocol(SSLContext.getDefault().getSupportedSSLParameters().getProtocols());
     }
 
     private static class TrustNothingTrustManager implements X509TrustManager {
diff --git a/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java b/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java
index b408cffca0..242e95032b 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java
@@ -96,7 +96,7 @@ public void handleReturn(int replyCode,
      *
      * @param name the name of the exchange to be created, and queue
      *        to be bound
-     * @param ae the name of the alternate-exchage
+     * @param ae the name of the alternate-exchange
      */
     protected void setupRouting(String name, String ae) throws IOException {
         Map<String, Object> args = new HashMap<String, Object>();
diff --git a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java
index 0090d40a45..0223c4c878 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java
@@ -49,7 +49,7 @@ public class BindingLifecycle extends BindingLifecycleBase {
         Binding binding = setupExchangeBindings(false);
         channel.basicPublish(binding.x, binding.k, null, payload);
 
-        // Purge the queue, and test that we don't recieve a message
+        // Purge the queue, and test that we don't receive a message
         channel.queuePurge(binding.q);
 
         GetResponse response = channel.basicGet(binding.q, true);
@@ -153,7 +153,7 @@ public class BindingLifecycle extends BindingLifecycleBase {
      * The unsubscribe should cause the queue to auto_delete, which in
      * turn should cause the exchange to auto_delete.
      *
-     * Then re-declare the queue again and try to rebind it to the same exhange.
+     * Then re-declare the queue again and try to rebind it to the same exchange.
      *
      * Because the exchange has been auto-deleted, the bind operation
      * should fail.
diff --git a/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java b/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java
index 4c4b6fd910..644c21d11a 100644
--- a/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java
+++ b/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java
@@ -85,9 +85,9 @@ private void restartPrimary() throws IOException, TimeoutException {
 
     /**
      * This tests whether the bindings attached to a durable exchange
-     * are correctly blown away when the exhange is nuked.
+     * are correctly blown away when the exchange is nuked.
      *
-     * This complements a unit test for testing non-durable exhanges.
+     * This complements a unit test for testing non-durable exchanges.
      * In that case, an exchange is deleted and you expect any
      * bindings hanging to it to be deleted as well. To verify this,
      * the exchange is deleted and then recreated.
diff --git a/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java b/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java
index 095c2cbb49..9d6546572b 100644
--- a/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java
+++ b/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java
@@ -24,19 +24,19 @@ public class ConnectionFactoryDefaultTlsVersion {
 
     @Test public void defaultTlsVersionJdk16ShouldTakeFallback() {
         String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1"};
-        String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols);
+        String tlsProtocol = ConnectionFactory.computeDefaultTlsProtocol(supportedProtocols);
         Assert.assertEquals("TLSv1",tlsProtocol);
     }
 
     @Test public void defaultTlsVersionJdk17ShouldTakePrefered() {
         String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"};
-        String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols);
+        String tlsProtocol = ConnectionFactory.computeDefaultTlsProtocol(supportedProtocols);
         Assert.assertEquals("TLSv1.2",tlsProtocol);
     }
 
     @Test public void defaultTlsVersionJdk18ShouldTakePrefered() {
         String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"};
-        String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols);
+        String tlsProtocol = ConnectionFactory.computeDefaultTlsProtocol(supportedProtocols);
         Assert.assertEquals("TLSv1.2",tlsProtocol);
     }