diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
index b8e26eefb2..f172b39d42 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
@@ -493,7 +493,7 @@ public final class StompConnection implements RemotingConnection
             ActiveMQStompException error = BUNDLE.versionNotSupported(acceptVersion);
             error.addHeader(Stomp.Headers.Error.VERSION, acceptVersion);
             error.addHeader(Stomp.Headers.CONTENT_TYPE, "text/plain");
-            error.setBody("Supported protocol version are " + manager.getSupportedVersionsAsString());
+            error.setBody("Supported protocol versions are " + manager.getSupportedVersionsAsString());
             error.setDisconnect(true);
             throw error;
          }
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
index 31f119f551..19e7ddae91 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
@@ -711,7 +711,7 @@ public class StompDecoder
       return str.toString();
    }
 
-   //this should be overriden by subclasses.
+   /** This should be overridden by subclasses. */
    public void init(StompDecoder decoder)
    {
    }
diff --git a/examples/jms/common/config/logging.properties b/examples/jms/common/config/logging.properties
index 3c6f629b81..4f4a9de5f8 100644
--- a/examples/jms/common/config/logging.properties
+++ b/examples/jms/common/config/logging.properties
@@ -41,7 +41,7 @@ java.util.logging.FileHandler.pattern=logs/activemq.log
 # Default global logging level.
 # This specifies which kinds of events are logged across
 # all loggers.  For any given facility this global level
-# can be overriden by a facility specific level
+# can be overridden by a facility specific level
 # Note that the ConsoleHandler also has a separate level
 # setting to limit messages printed to the console.
 .level= INFO
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
index 18d683ff21..ce48671c61 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
@@ -92,7 +92,7 @@ public class MessageExpirationTest extends ActiveMQTestBase
 
       producer.send(message);
 
-      // second message, this message shouldn't be overriden
+      // second message, this message shouldn't be overridden
       message = session.createMessage(false);
       message.setExpiration(System.currentTimeMillis() + EXPIRATION * 3);
       producer.send(message);
diff --git a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
index 1835bfe877..03cba12dd1 100644
--- a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
+++ b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
@@ -67,7 +67,7 @@ public abstract class JMSTestCase extends Assert
    }
 
    /**
-    * Should be overriden
+    * Should be overridden
     * @return
     */
    protected Properties getProviderProperties() throws IOException