diff --git a/common/utils/src/main/scala/org/apache/spark/SparkThrowableHelper.scala b/common/utils/src/main/scala/org/apache/spark/SparkThrowableHelper.scala
index b6c2b176de62b..47486fb570152 100644
--- a/common/utils/src/main/scala/org/apache/spark/SparkThrowableHelper.scala
+++ b/common/utils/src/main/scala/org/apache/spark/SparkThrowableHelper.scala
@@ -85,20 +85,20 @@ private[spark] object SparkThrowableHelper {
         toJsonString { generator =>
           val g = generator.useDefaultPrettyPrinter()
           g.writeStartObject()
-          g.writeStringField("errorClass", "LEGACY")
+          g.writeStringField("condition", "LEGACY")
           g.writeObjectFieldStart("messageParameters")
           g.writeStringField("message", e.getMessage)
           g.writeEndObject()
           g.writeEndObject()
         }
       case MINIMAL | STANDARD =>
-        val errorClass = e.getCondition
+        val condition = e.getCondition
         toJsonString { generator =>
           val g = generator.useDefaultPrettyPrinter()
           g.writeStartObject()
-          g.writeStringField("errorClass", errorClass)
+          g.writeStringField("condition", condition)
           if (format == STANDARD) {
-            g.writeStringField("messageTemplate", errorReader.getMessageTemplate(errorClass))
+            g.writeStringField("messageTemplate", errorReader.getMessageTemplate(condition))
           }
           val sqlState = e.getSqlState
           if (sqlState != null) g.writeStringField("sqlState", sqlState)
diff --git a/core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala b/core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala
index 9f005e5757193..0e7039c3c53ee 100644
--- a/core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala
+++ b/core/src/test/scala/org/apache/spark/SparkThrowableSuite.scala
@@ -314,7 +314,7 @@ class SparkThrowableSuite extends SparkFunSuite {
     // scalastyle:off line.size.limit
     assert(SparkThrowableHelper.getMessage(e, MINIMAL) ===
       """{
-        |  "errorClass" : "DIVIDE_BY_ZERO",
+        |  "condition" : "DIVIDE_BY_ZERO",
         |  "sqlState" : "22012",
         |  "messageParameters" : {
         |    "config" : "CONFIG"
@@ -328,7 +328,7 @@ class SparkThrowableSuite extends SparkFunSuite {
         |}""".stripMargin)
     assert(SparkThrowableHelper.getMessage(e, STANDARD) ===
       """{
-        |  "errorClass" : "DIVIDE_BY_ZERO",
+        |  "condition" : "DIVIDE_BY_ZERO",
         |  "messageTemplate" : "Division by zero. Use `try_divide` to tolerate divisor being 0 and return NULL instead. If necessary set <config> to \"false\" to bypass this error.",
         |  "sqlState" : "22012",
         |  "messageParameters" : {
@@ -348,7 +348,7 @@ class SparkThrowableSuite extends SparkFunSuite {
       messageParameters = Map("saveMode" -> "UNSUPPORTED_MODE"))
     assert(SparkThrowableHelper.getMessage(e2, STANDARD) ===
       """{
-        |  "errorClass" : "UNSUPPORTED_SAVE_MODE.EXISTENT_PATH",
+        |  "condition" : "UNSUPPORTED_SAVE_MODE.EXISTENT_PATH",
         |  "messageTemplate" : "The save mode <saveMode> is not supported for: an existent path.",
         |  "sqlState" : "0A000",
         |  "messageParameters" : {
@@ -363,7 +363,7 @@ class SparkThrowableSuite extends SparkFunSuite {
     val e3 = new LegacyException
     assert(SparkThrowableHelper.getMessage(e3, MINIMAL) ===
       """{
-        |  "errorClass" : "LEGACY",
+        |  "condition" : "LEGACY",
         |  "messageParameters" : {
         |    "message" : "Test message"
         |  }
@@ -392,7 +392,7 @@ class SparkThrowableSuite extends SparkFunSuite {
     // scalastyle:off line.size.limit
     assert(SparkThrowableHelper.getMessage(e4, MINIMAL) ===
         """{
-          |  "errorClass" : "DIVIDE_BY_ZERO",
+          |  "condition" : "DIVIDE_BY_ZERO",
           |  "sqlState" : "22012",
           |  "messageParameters" : {
           |    "config" : "CONFIG"
@@ -404,7 +404,7 @@ class SparkThrowableSuite extends SparkFunSuite {
           |}""".stripMargin)
     assert(SparkThrowableHelper.getMessage(e4, STANDARD) ===
         """{
-          |  "errorClass" : "DIVIDE_BY_ZERO",
+          |  "condition" : "DIVIDE_BY_ZERO",
           |  "messageTemplate" : "Division by zero. Use `try_divide` to tolerate divisor being 0 and return NULL instead. If necessary set <config> to \"false\" to bypass this error.",
           |  "sqlState" : "22012",
           |  "messageParameters" : {
diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
index a117e7af7f637..e6d04f18586f3 100644
--- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
+++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala
@@ -735,7 +735,7 @@ class CliSuite extends SparkFunSuite {
         format = ErrorMessageFormat.MINIMAL,
         errorMessage =
           """{
-            |  "errorClass" : "DIVIDE_BY_ZERO",
+            |  "condition" : "DIVIDE_BY_ZERO",
             |  "sqlState" : "22012",
             |  "messageParameters" : {
             |    "config" : "\"spark.sql.ansi.enabled\""
@@ -753,7 +753,7 @@ class CliSuite extends SparkFunSuite {
         format = ErrorMessageFormat.STANDARD,
         errorMessage =
           """{
-            |  "errorClass" : "DIVIDE_BY_ZERO",
+            |  "condition" : "DIVIDE_BY_ZERO",
             |  "messageTemplate" : "Division by zero. Use `try_divide` to tolerate divisor being 0 and return NULL instead. If necessary set <config> to \"false\" to bypass this error.",
             |  "sqlState" : "22012",
             |  "messageParameters" : {
diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerWithSparkContextSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerWithSparkContextSuite.scala
index 60c49619552e7..d628b927990b1 100644
--- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerWithSparkContextSuite.scala
+++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/ThriftServerWithSparkContextSuite.scala
@@ -173,7 +173,7 @@ trait ThriftServerWithSparkContextSuite extends SharedThriftServer {
       val e2 = intercept[HiveSQLException](exec(sql))
       assert(e2.getMessage ===
         """{
-          |  "errorClass" : "DIVIDE_BY_ZERO",
+          |  "condition" : "DIVIDE_BY_ZERO",
           |  "sqlState" : "22012",
           |  "messageParameters" : {
           |    "config" : "\"spark.sql.ansi.enabled\""
@@ -191,7 +191,7 @@ trait ThriftServerWithSparkContextSuite extends SharedThriftServer {
       val e3 = intercept[HiveSQLException](exec(sql))
       assert(e3.getMessage ===
         """{
-          |  "errorClass" : "DIVIDE_BY_ZERO",
+          |  "condition" : "DIVIDE_BY_ZERO",
           |  "messageTemplate" : "Division by zero. Use `try_divide` to tolerate divisor being 0 and return NULL instead. If necessary set <config> to \"false\" to bypass this error.",
           |  "sqlState" : "22012",
           |  "messageParameters" : {