diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
index a077af0b..6fc17508 100644
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@@ -36,7 +36,7 @@
           <img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/>&nbsp;&nbsp;{{.Author.Name}}
           {{end}}
         </td>
-        <td class="sha"><a rel="nofollow" class="ui green sha label" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.Id}} ">{{SubStr .Id.String 0 10}} </a></td>
+        <td class="sha"><a rel="nofollow" class="ui green sha label" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}} ">{{SubStr .ID.String 0 10}} </a></td>
         <td class="message"><span class="text truncate">{{RenderCommitMessage .Summary $.RepoLink}}</span></td>
         <td class="date">{{TimeSince .Author.When $.Lang}}</td>
       </tr>
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index d3303193..50d0074b 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -12,8 +12,8 @@
                 {{end}}
                 &nbsp;
             </span>
-            <span class="last-commit"><a href="{{.RepoLink}}/commit/{{.LastCommit.Id}}" rel="nofollow">
-                <strong>{{ShortSha .LastCommit.Id.String}}</strong></a>
+            <span class="last-commit"><a href="{{.RepoLink}}/commit/{{.LastCommit.ID}}" rel="nofollow">
+                <strong>{{ShortSha .LastCommit.ID.String}}</strong></a>
                 <span class="text-truncate">{{RenderCommitMessage .LastCommit.Summary .RepoLink}}</span>
             </span>
             <span class="age right">{{TimeSince .LastCommit.Author.When $.Lang}}</span>
@@ -54,7 +54,7 @@
                 </td>
                 {{end}}
                 <td class="sha">
-                  <a rel="nofollow" class="label label-green" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.Id}} ">{{SubStr $commit.Id.String 0 10}} </a>
+                  <a rel="nofollow" class="label label-green" href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{$commit.ID}} ">{{SubStr $commit.ID.String 0 10}} </a>
                 </td>
                 <td class="message">
                   <span class="text-truncate">{{RenderCommitMessage $commit.Summary $.RepoLink}}</span>