diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index 43fd1adbd4..1f6b58e4be 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -162,6 +162,21 @@ then
   fi
 fi
 
+# Check integration tests.
+if [ $NUM_JAVA_FILES_CHANGED -gt 0 ] \
+  || [ $NUM_INTEGRATION_GOLDEN_FILES_CHANGED -gt 0 ] \
+  || [ $NUM_INTEGRATION_BAZEL_FILES_CHANGED -gt 0 ]
+then
+  echo_status "Checking integration tests..."
+  bazel --batch test --disk_cache="$BAZEL_CACHE_DIR" //test/integration/...
+  TEST_STATUS=$?
+  if [ $TEST_STATUS != 0 ]
+  then
+    echo_error "Tests failed." "Please fix them and try again."
+    exit 1
+  fi
+fi
+
 # Check and fix Bazel format.
 if [ $NUM_BAZEL_FILES_CHANGED -gt 0 ]
 then
diff --git a/src/main/java/com/google/api/generator/engine/ast/JavaDocComment.java b/src/main/java/com/google/api/generator/engine/ast/JavaDocComment.java
index 5ab53ca646..7b3dc48729 100644
--- a/src/main/java/com/google/api/generator/engine/ast/JavaDocComment.java
+++ b/src/main/java/com/google/api/generator/engine/ast/JavaDocComment.java
@@ -77,7 +77,7 @@ public Builder addUnescapedComment(String comment) {
     }
 
     public Builder addComment(String comment) {
-      componentsList.add(HtmlEscaper.escaper(comment));
+      componentsList.add(HtmlEscaper.process(comment));
       return this;
     }
 
@@ -86,7 +86,7 @@ public Builder addSampleCode(String sampleCode) {
       Arrays.stream(sampleCode.split("\\r?\\n"))
           .forEach(
               line -> {
-                componentsList.add(HtmlEscaper.escaper(line));
+                componentsList.add(HtmlEscaper.process(line));
               });
       componentsList.add("</code></pre>");
       return this;
@@ -131,7 +131,7 @@ public JavaDocComment build() {
       // Escape component in list one by one, because we will join the components by `\n`
       // `\n` will be taken as escape character by the comment escaper.
       componentsList =
-          componentsList.stream().map(c -> MetacharEscaper.escaper(c)).collect(Collectors.toList());
+          componentsList.stream().map(c -> MetacharEscaper.process(c)).collect(Collectors.toList());
       setComment(String.join("\n", componentsList));
       return autoBuild();
     }
diff --git a/src/main/java/com/google/api/generator/engine/ast/LineComment.java b/src/main/java/com/google/api/generator/engine/ast/LineComment.java
index cdc2b13e9d..b725ac6487 100644
--- a/src/main/java/com/google/api/generator/engine/ast/LineComment.java
+++ b/src/main/java/com/google/api/generator/engine/ast/LineComment.java
@@ -44,7 +44,7 @@ public abstract static class Builder {
     public abstract LineComment autoBuild();
 
     public LineComment build() {
-      setComment(MetacharEscaper.escaper(comment()));
+      setComment(MetacharEscaper.process(comment()));
       return autoBuild();
     }
   }
diff --git a/src/main/java/com/google/api/generator/engine/escaper/HtmlEscaper.java b/src/main/java/com/google/api/generator/engine/escaper/HtmlEscaper.java
index c06ddf3224..6b5ab79968 100644
--- a/src/main/java/com/google/api/generator/engine/escaper/HtmlEscaper.java
+++ b/src/main/java/com/google/api/generator/engine/escaper/HtmlEscaper.java
@@ -39,7 +39,7 @@ public String escape(String sourceString) {
     return charEscaper.escape(sourceString);
   }
 
-  public static String escaper(String source) {
+  public static String process(String source) {
     return SINGLETON.escape(source);
   }
 }
diff --git a/src/main/java/com/google/api/generator/engine/escaper/MetacharEscaper.java b/src/main/java/com/google/api/generator/engine/escaper/MetacharEscaper.java
index b74ad68f5b..948c257ae4 100644
--- a/src/main/java/com/google/api/generator/engine/escaper/MetacharEscaper.java
+++ b/src/main/java/com/google/api/generator/engine/escaper/MetacharEscaper.java
@@ -40,7 +40,7 @@ public String escape(String sourceString) {
     return charEscaper.escape(sourceString);
   }
 
-  public static String escaper(String source) {
+  public static String process(String source) {
     return SINGLETON.escape(source);
   }
 }