diff --git a/service/trino-verifier/pom.xml b/service/trino-verifier/pom.xml
index c0c1960bd157..9cadbf2fff17 100644
--- a/service/trino-verifier/pom.xml
+++ b/service/trino-verifier/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
-        <main-class>io.trino.verifier.PrestoVerifier</main-class>
+        <main-class>io.trino.verifier.TrinoVerifier</main-class>
     </properties>
 
     <dependencies>
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/PrestoVerifier.java b/service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifier.java
similarity index 91%
rename from service/trino-verifier/src/main/java/io/trino/verifier/PrestoVerifier.java
rename to service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifier.java
index c2bae41c9dbe..a2513dc01ff9 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/PrestoVerifier.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifier.java
@@ -15,9 +15,9 @@
 
 import picocli.CommandLine;
 
-public final class PrestoVerifier
+public final class TrinoVerifier
 {
-    private PrestoVerifier() {}
+    private TrinoVerifier() {}
 
     public static void main(String[] args)
     {
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/PrestoVerifierModule.java b/service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifierModule.java
similarity index 98%
rename from service/trino-verifier/src/main/java/io/trino/verifier/PrestoVerifierModule.java
rename to service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifierModule.java
index 1104d8074dc2..99ff8f945b5f 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/PrestoVerifierModule.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/TrinoVerifierModule.java
@@ -30,7 +30,7 @@
 import static io.airlift.event.client.EventBinder.eventBinder;
 import static io.airlift.json.JsonCodecBinder.jsonCodecBinder;
 
-public class PrestoVerifierModule
+public class TrinoVerifierModule
         extends AbstractConfigurationAwareModule
 {
     @Override
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java b/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
index c3880b2e7364..b29397561105 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
@@ -549,7 +549,7 @@ private QueryResult executeQuery(String url, String username, String password, Q
                     (e.getCause() instanceof Exception)) {
                 exception = (Exception) e.getCause();
             }
-            State state = isPrestoQueryInvalid(e) ? State.INVALID : State.FAILED;
+            State state = isTrinoQueryInvalid(e) ? State.INVALID : State.FAILED;
             return new QueryResult(state, exception, nanosSince(start), queryCpuTime, queryId, ImmutableList.of(), ImmutableList.of());
         }
         catch (VerifierException e) {
@@ -578,7 +578,7 @@ private void trySetConnectionProperties(Query query, Connection connection)
         }
     }
 
-    private static boolean isPrestoQueryInvalid(SQLException e)
+    private static boolean isTrinoQueryInvalid(SQLException e)
     {
         for (Throwable t = e.getCause(); t != null; t = t.getCause()) {
             if (t.toString().contains(".SemanticException:")) {
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/VerifyCommand.java b/service/trino-verifier/src/main/java/io/trino/verifier/VerifyCommand.java
index 498b9cf08d39..a4c55fd9fdab 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/VerifyCommand.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/VerifyCommand.java
@@ -135,7 +135,7 @@ public void run()
 
         ImmutableList.Builder<Module> builder = ImmutableList.<Module>builder()
                 .add(new JsonModule())
-                .add(new PrestoVerifierModule())
+                .add(new TrinoVerifierModule())
                 .add(new DataSourceModule(this))
                 .addAll(getAdditionalModules());