diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala
index 03514424c..9caf54976 100644
--- a/src/main/scala/app/IssuesController.scala
+++ b/src/main/scala/app/IssuesController.scala
@@ -54,7 +54,7 @@ trait IssuesControllerBase extends ControllerBase {
   // TODO requires users only and readable repository checking
   get("/:owner/:repository/issues/new")( usersOnly {
     getRepository(params("owner"), params("repository"), baseUrl)
-      .map (issues.html.issueedit(_))
+      .map (issues.html.create(_))
       .getOrElse (NotFound)
   })
 
@@ -148,7 +148,7 @@ trait IssuesControllerBase extends ControllerBase {
     session.put(sessionKey, condition)
 
     getRepository(owner, repository, baseUrl).map { repositoryInfo =>
-      issues.html.issues(
+      issues.html.list(
         searchIssue(owner, repository, condition, filter, userName, (page - 1) * IssueLimit, IssueLimit),
         page,
         getLabels(owner, repository),
diff --git a/src/main/twirl/issues/issueedit.scala.html b/src/main/twirl/issues/create.scala.html
similarity index 95%
rename from src/main/twirl/issues/issueedit.scala.html
rename to src/main/twirl/issues/create.scala.html
index d426817e3..4d1e4f274 100644
--- a/src/main/twirl/issues/issueedit.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main("New Issue - " + repository.owner + "/" + repository.name){
   @html.header("issues", repository)
-  @issuestab("", repository)
+  @tab("", repository)
 
   <div class="row-fluid">
     <div class="span9">
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index f070958d2..088336b31 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main("%s - Issue #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){
   @html.header("issues", repository)
-  @issuestab("issues", repository)
+  @tab("issues", repository)
   <ul class="nav nav-tabs">
     <li class="pull-left"><a href="@url(repository)/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>
     <li class="pull-right">Issue #@issue.issueId</li>
diff --git a/src/main/twirl/issues/issues.scala.html b/src/main/twirl/issues/list.scala.html
similarity index 99%
rename from src/main/twirl/issues/issues.scala.html
rename to src/main/twirl/issues/list.scala.html
index bafbce8ba..eb148ad7a 100644
--- a/src/main/twirl/issues/issues.scala.html
+++ b/src/main/twirl/issues/list.scala.html
@@ -6,7 +6,7 @@
 @import view.helpers._
 @html.main("Issues - " + repository.owner + "/" + repository.name){
   @html.header("issues", repository)
-  @issuestab("issues", repository)
+  @tab("issues", repository)
   <div class="row-fluid">
     <div class="span3">
       <ul class="nav nav-pills nav-stacked">
diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html
index 6c32f69a4..1e2513f64 100644
--- a/src/main/twirl/issues/milestones/edit.scala.html
+++ b/src/main/twirl/issues/milestones/edit.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main("Milestones - " + repository.owner + "/" + repository.name){
   @html.header("milestones", repository)
-  @issues.html.issuestab("milestones", repository)
+  @issues.html.tab("milestones", repository)
   <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true">
     <fieldset>
       <label for="title"><string>Title</string></label>
diff --git a/src/main/twirl/issues/milestones/list.scala.html b/src/main/twirl/issues/milestones/list.scala.html
index cce1f6017..3ba4a26c4 100644
--- a/src/main/twirl/issues/milestones/list.scala.html
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -3,7 +3,7 @@
 @import view.helpers._
 @html.main("Milestones - " + repository.owner + "/" + repository.name){
   @html.header("milestones", repository)
-  @issues.html.issuestab("milestones", repository)
+  @issues.html.tab("milestones", repository)
   <div class="row-fluid">
     <div class="span3">
       <ul class="nav nav-pills nav-stacked">
diff --git a/src/main/twirl/issues/issuestab.scala.html b/src/main/twirl/issues/tab.scala.html
similarity index 100%
rename from src/main/twirl/issues/issuestab.scala.html
rename to src/main/twirl/issues/tab.scala.html