diff --git a/src/main/scala/gitbucket/core/servlet/GitLfsTransferServlet.scala b/src/main/scala/gitbucket/core/servlet/GitLfsTransferServlet.scala
index 497121d..acdb2f6 100644
--- a/src/main/scala/gitbucket/core/servlet/GitLfsTransferServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitLfsTransferServlet.scala
@@ -22,9 +22,9 @@
 
   override protected def doGet(req: HttpServletRequest, res: HttpServletResponse): Unit = {
     for {
-      (owner, name, oid) <- getPathInfo(req, res) if checkToken(req, oid)
+      (owner, repository, oid) <- getPathInfo(req, res) if checkToken(req, oid)
     } yield {
-      val file = new File(FileUtil.getLfsFilePath(owner, name, oid))
+      val file = new File(FileUtil.getLfsFilePath(owner, repository, oid))
       if(file.exists()){
         res.setStatus(HttpStatus.SC_OK)
         res.setContentType("application/octet-stream")
@@ -42,9 +42,9 @@
 
   override protected def doPut(req: HttpServletRequest, res: HttpServletResponse): Unit = {
     for {
-      (owner, name, oid) <- getPathInfo(req, res) if checkToken(req, oid)
+      (owner, repository, oid) <- getPathInfo(req, res) if checkToken(req, oid)
     } yield {
-      val file = new File(FileUtil.getLfsFilePath(owner, name, oid))
+      val file = new File(FileUtil.getLfsFilePath(owner, repository, oid))
       FileUtils.forceMkdir(file.getParentFile)
       using(req.getInputStream, new FileOutputStream(file)){ (in, out) =>
         IOUtils.copy(in, out)
@@ -65,7 +65,7 @@
 
   private def getPathInfo(req: HttpServletRequest, res: HttpServletResponse): Option[(String, String, String)] = {
     req.getRequestURI.substring(1).split("/") match {
-      case Array(_, owner, name, oid) => Some((owner, name, oid))
+      case Array(_, owner, repository, oid) => Some((owner, repository, oid))
       case _ => None
     }
   }
diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
index 0e3ff4d..d7b359a 100644
--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -75,7 +75,7 @@
       }
       case Some(baseUrl) => {
         req.getRequestURI.substring(1).replace(".git/", "/").split("/") match {
-          case Array(_, owner, name, _*) => {
+          case Array(_, owner, repository, _*) => {
             val timeout = System.currentTimeMillis + (60000 * 10) // 10 min.
             val batchResponse = batchRequest.operation match {
                 case "upload" =>
@@ -83,7 +83,7 @@
                     GitLfs.BatchResponseObject(requestObject.oid, requestObject.size, true,
                       GitLfs.Actions(
                         upload = Some(GitLfs.Action(
-                          href = baseUrl + "/git-lfs/" + owner + "/" + name + "/" + requestObject.oid,
+                          href = baseUrl + "/git-lfs/" + owner + "/" + repository + "/" + requestObject.oid,
                           header = Map("Authorization" -> StringUtil.encodeBlowfish(timeout + " " + requestObject.oid)),
                           expires_at = new Date(timeout)
                         ))
@@ -95,7 +95,7 @@
                     GitLfs.BatchResponseObject(requestObject.oid, requestObject.size, true,
                       GitLfs.Actions(
                         download = Some(GitLfs.Action(
-                          href = baseUrl + "/git-lfs/" + owner + "/" + name + "/" + requestObject.oid,
+                          href = baseUrl + "/git-lfs/" + owner + "/" + repository + "/" + requestObject.oid,
                           header = Map("Authorization" -> StringUtil.encodeBlowfish(timeout + " " + requestObject.oid)),
                           expires_at = new Date(timeout)
                         ))
diff --git a/src/main/scala/gitbucket/core/util/FileUtil.scala b/src/main/scala/gitbucket/core/util/FileUtil.scala
index 9f7a322..4836c23 100644
--- a/src/main/scala/gitbucket/core/util/FileUtil.scala
+++ b/src/main/scala/gitbucket/core/util/FileUtil.scala
@@ -63,6 +63,7 @@
       "image/png",
       "text/plain")
 
-  def getLfsFilePath(owner: String, name: String, oid: String): String = Directory.getLfsDir(owner, name) + "/" + oid
+  def getLfsFilePath(owner: String, repository: String, oid: String): String =
+    Directory.getLfsDir(owner, repository) + "/" + oid
 
 }