diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/action/AddVelocityComment.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/action/AddVelocityComment.java
index cec9d3d..2af34b8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/action/AddVelocityComment.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/workflow/action/AddVelocityComment.java
@@ -127,10 +127,10 @@
   // it up, if it is public.
   public class VelocityAdapterItsFacade {
 
-    private final ItsFacade its;
+    private final ItsFacade facade;
 
-    private VelocityAdapterItsFacade(ItsFacade its) {
-      this.its = its;
+    private VelocityAdapterItsFacade(ItsFacade facade) {
+      this.facade = facade;
     }
 
     /**
@@ -141,7 +141,7 @@
      * @return Link to the given URL in the used Its' syntax.
      */
     public String formatLink(String url, String caption) {
-      return its.createLinkForWebui(url, caption);
+      return facade.createLinkForWebui(url, caption);
     }
 
     /**
@@ -153,7 +153,7 @@
      * @return Link to the given URL in the used Its' syntax.
      */
     public String formatLink(String url) {
-      return its.createLinkForWebui(url, url);
+      return facade.createLinkForWebui(url, url);
     }
   }
 }
