diff --git a/java/example/pom.xml b/java/example/pom.xml
index fabab27dd77..114dc9af5ff 100644
--- a/java/example/pom.xml
+++ b/java/example/pom.xml
@@ -31,8 +31,8 @@
 
     <dependency>
       <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>8.0.33</version>
+      <artifactId>mysql-connector-j</artifactId>
+      <version>8.4.0</version>
       <optional>false</optional>
     </dependency>
 
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java
index e6a1b0187dd..3835ba543f8 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessJDBCUrl.java
@@ -218,7 +218,7 @@ private static Properties getURLParamProperties(String paramString, Properties i
           }
         }
 
-        // Per the mysql-connector-java docs, passed in Properties values should take precedence
+        // Per the mysql-connector-j docs, passed in Properties values should take precedence
         // over
         // those in the URL. See javadoc for NonRegisteringDriver#connect
         if ((null != value && value.length() > 0) && (parameter.length() > 0) && null == info
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessParameterMetaData.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessParameterMetaData.java
index 8bb880e3749..e556ba7ac37 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessParameterMetaData.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessParameterMetaData.java
@@ -25,7 +25,7 @@ public class VitessParameterMetaData implements ParameterMetaData {
   private final int parameterCount;
 
   /**
-   * This implementation (and defaults below) is equivalent to mysql-connector-java's "simple"
+   * This implementation (and defaults below) is equivalent to mysql-connector-j's "simple"
    * (non-server) statement metadata
    */
   VitessParameterMetaData(int count) {
diff --git a/java/jdbc/src/main/java/io/vitess/jdbc/VitessPreparedStatement.java b/java/jdbc/src/main/java/io/vitess/jdbc/VitessPreparedStatement.java
index 550b5180e11..e97b2d151bb 100644
--- a/java/jdbc/src/main/java/io/vitess/jdbc/VitessPreparedStatement.java
+++ b/java/jdbc/src/main/java/io/vitess/jdbc/VitessPreparedStatement.java
@@ -426,7 +426,7 @@ public ParameterMetaData getParameterMetaData() throws SQLException {
   }
 
   /**
-   * This function was ported from mysql-connector-java ParseInfo object and greatly simplified to
+   * This function was ported from mysql-connector-j ParseInfo object and greatly simplified to
    * just the parts for counting parameters
    */
   private int calculateParameterCount() throws SQLException {
diff --git a/java/jdbc/src/main/java/io/vitess/util/charset/CharsetMapping.java b/java/jdbc/src/main/java/io/vitess/util/charset/CharsetMapping.java
index 343ae0e90eb..8b32e2aab67 100644
--- a/java/jdbc/src/main/java/io/vitess/util/charset/CharsetMapping.java
+++ b/java/jdbc/src/main/java/io/vitess/util/charset/CharsetMapping.java
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 /**
- * These classes were pulled from mysql-connector-java and simplified to just the parts supporting
+ * These classes were pulled from mysql-connector-j and simplified to just the parts supporting
  * the statically available charsets
  */
 public class CharsetMapping {
diff --git a/java/jdbc/src/main/java/io/vitess/util/charset/Collation.java b/java/jdbc/src/main/java/io/vitess/util/charset/Collation.java
index 31548686655..7bd24d10f2a 100644
--- a/java/jdbc/src/main/java/io/vitess/util/charset/Collation.java
+++ b/java/jdbc/src/main/java/io/vitess/util/charset/Collation.java
@@ -17,7 +17,7 @@
 package io.vitess.util.charset;
 
 /**
- * These classes were pulled from mysql-connector-java and simplified to just the parts supporting
+ * These classes were pulled from mysql-connector-j and simplified to just the parts supporting
  * the statically available charsets
  */
 class Collation {
diff --git a/java/jdbc/src/main/java/io/vitess/util/charset/MysqlCharset.java b/java/jdbc/src/main/java/io/vitess/util/charset/MysqlCharset.java
index fad94cb8dcb..6691e1cb4b4 100644
--- a/java/jdbc/src/main/java/io/vitess/util/charset/MysqlCharset.java
+++ b/java/jdbc/src/main/java/io/vitess/util/charset/MysqlCharset.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 
 /**
- * These classes were pulled from mysql-connector-java and simplified to just the parts supporting
+ * These classes were pulled from mysql-connector-j and simplified to just the parts supporting
  * the statically available charsets
  */
 class MysqlCharset {
diff --git a/java/pom.xml b/java/pom.xml
index e68bbd5574e..7a80212f0a9 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -252,7 +252,7 @@
               <failOnWarning>true</failOnWarning>
               <outputXML>true</outputXML>
               <ignoredUnusedDeclaredDependencies>
-                <dependency>mysql:mysql-connector-java</dependency>
+                <dependency>mysql:mysql-connector-j</dependency>
                 <dependency>io.grpc:grpc-context</dependency>
               </ignoredUnusedDeclaredDependencies>
             </configuration>