diff --git a/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java b/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
index bee0b830d..3bb106bfe 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlArithmetic.java
@@ -1827,7 +1827,7 @@ public Object shiftRightUnsigned(final Object left, final Object right) {
      * Calculate the <code>size</code> of various types: Collection, Array, Map, String.
      *
      * @param object the object to get the size of
-     * @return the <i>size</i> of object, 0 if null, 1 if there is no <i>better</i> solution
+     * @return the <em>size</em> of object, 0 if null, 1 if there is no <em>better</em> solution
      */
     public Integer size(final Object object) {
         return size(object, object == null ? 0 : 1);
diff --git a/src/main/java/org/apache/commons/jexl3/package-info.java b/src/main/java/org/apache/commons/jexl3/package-info.java
index 5a994a70e..d0d7c411b 100644
--- a/src/main/java/org/apache/commons/jexl3/package-info.java
+++ b/src/main/java/org/apache/commons/jexl3/package-info.java
@@ -278,8 +278,8 @@
  * assertEquals(Double.valueOf(-1),o);
  * </code></pre>
  * <p>
- * If the <i>namespace</i> is a Class and that class declares a constructor that takes a JexlContext (or
- * a class extending JexlContext), one <i>namespace</i> instance is created on first usage in an
+ * If the <em>namespace</em> is a Class and that class declares a constructor that takes a JexlContext (or
+ * a class extending JexlContext), one <em>namespace</em> instance is created on first usage in an
  * expression; this instance lifetime is limited to the expression evaluation.
  * </p>
  * <p>
diff --git a/src/main/java/org/apache/commons/jexl3/parser/TokenMgrException.java b/src/main/java/org/apache/commons/jexl3/parser/TokenMgrException.java
index d48a75089..07c271d32 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/TokenMgrException.java
+++ b/src/main/java/org/apache/commons/jexl3/parser/TokenMgrException.java
@@ -22,7 +22,7 @@
 public class TokenMgrException extends RuntimeException implements JavaccError {
     /**
      * The version identifier for this Serializable class.
-     * Increment only if the <i>serialized</i> form of the
+     * Increment only if the <em>serialized</em> form of the
      * class changes.
      */
     private static final long serialVersionUID = 1L;