diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
index 4d3e1715a2..fe07100828 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.server;
 
 import com.google.common.collect.Lists;
+import com.google.gerrit.extensions.common.WebLinkInfo;
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.extensions.webui.PatchSetWebLink;
 import com.google.gerrit.extensions.webui.ProjectWebLink;
@@ -32,31 +33,21 @@ public class WebLinks {
     this.projectLinks = projectLinks;
   }
 
-  public Iterable<Link> getPatchSetLinks(String project, String commit) {
-    List<Link> links = Lists.newArrayList();
+  public Iterable<WebLinkInfo> getPatchSetLinks(String project, String commit) {
+    List<WebLinkInfo> links = Lists.newArrayList();
     for (PatchSetWebLink webLink : patchSetLinks) {
-      links.add(new Link(webLink.getLinkName(),
+      links.add(new WebLinkInfo(webLink.getLinkName(),
           webLink.getPatchSetUrl(project, commit)));
     }
     return links;
   }
 
-  public Iterable<Link> getProjectLinks(String project) {
-    List<Link> links = Lists.newArrayList();
+  public Iterable<WebLinkInfo> getProjectLinks(String project) {
+    List<WebLinkInfo> links = Lists.newArrayList();
     for (ProjectWebLink webLink : projectLinks) {
-      links.add(new Link(webLink.getLinkName(),
+      links.add(new WebLinkInfo(webLink.getLinkName(),
           webLink.getProjectUrl(project)));
     }
     return links;
   }
-
-  public class Link {
-    public String name;
-    public String url;
-
-    public Link(String name, String url) {
-      this.name = name;
-      this.url = url;
-    }
-  }
 }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
index 638a162cae..586c294909 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
@@ -830,9 +830,9 @@ public class ChangeJson {
 
     if (has(WEB_LINKS)) {
       out.webLinks = Lists.newArrayList();
-      for (WebLinks.Link link : webLinks.get().getPatchSetLinks(
+      for (WebLinkInfo link : webLinks.get().getPatchSetLinks(
           project, in.getRevision().get())) {
-        out.webLinks.add(new WebLinkInfo(link.name, link.url));
+        out.webLinks.add(link);
       }
     }
     return out;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
index b5f711f251..a28ee4076e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
@@ -386,9 +386,9 @@ public class ListProjects implements RestReadView<TopLevelResource> {
           }
 
           info.webLinks = Lists.newArrayList();
-          for (WebLinks.Link link : webLinks.get().getProjectLinks(projectName.get())) {
+          for (WebLinkInfo link : webLinks.get().getProjectLinks(projectName.get())) {
             if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
-              info.webLinks.add(new WebLinkInfo(link.name, link.url));
+              info.webLinks.add(link);
             }
           }
         }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
index 8a62ae1215..4cafc0a556 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
@@ -54,9 +54,9 @@ public class ProjectJson {
     info.id = Url.encode(info.name);
 
     info.webLinks = Lists.newArrayList();
-    for (WebLinks.Link link : webLinks.get().getProjectLinks(p.getName())) {
+    for (WebLinkInfo link : webLinks.get().getProjectLinks(p.getName())) {
       if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
-        info.webLinks.add(new WebLinkInfo(link.name, link.url));
+        info.webLinks.add(link);
       }
     }