diff --git a/controller/controller.go b/controller/controller.go
index 35523043805c32a61f14bca152bfb7c7e4c29f05..ffa89ce6ee06c6473aa5245a981b6122e3200e01 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -42,7 +42,7 @@ func CreateEntry(c *gin.Context) {
 	var entry db.YdlEntry
 	c.ShouldBind(&entry)
 	db.DB.Create(&entry)
-	spawnWorker(entry.Link, entry.Output_folder)
+	spawnWorker(entry.Link, entry.OutputFolder)
 	c.Redirect(http.StatusFound, "/")
 }
 
diff --git a/db/model.go b/db/model.go
index 309447221a083e086d32c36af7634043d5a3dc67..6f35cd0ac9fd2b4f496ba5ab26b167342ee23951 100644
--- a/db/model.go
+++ b/db/model.go
@@ -4,8 +4,8 @@ import "gorm.io/gorm"
 
 type YdlEntry struct {
 	gorm.Model
-	Title         string
-	Link          string
-	Format        string
-	Output_folder string
+	Title        string
+	Link         string
+	Format       string
+	OutputFolder string
 }
diff --git a/templates/entry.tmpl b/templates/entry.tmpl
index dc5f2b6982b5687dbc2041e48b52fef59fdf9d7e..642b501f4d8617806408596d851b0434e4fd2035 100644
--- a/templates/entry.tmpl
+++ b/templates/entry.tmpl
@@ -16,7 +16,7 @@     <input type="text" id="Link" name="Link" value="{{ .Link }}" placeholder="Paste a valid youtube-dl link" required>
   </label>
   <label for="output">
     Output folder
-    <input type="text" id="Output_folder" name="Output_folder" value="{{ .Output_folder }}" placeholder="Select a ralative folder" required>
+    <input type="text" id="OutputFolder" name="OutputFolder" value="{{ .OutputFolder }}" placeholder="Select a ralative folder" required>
   </label>
   <button type="submit">Submit</button>
 </form>
diff --git a/templates/index.tmpl b/templates/index.tmpl
index 1880b5f70be19992a54660748e3b8d886a711285..0b965f5cc095c9edcc98bf0ea70447aa2c092d0b 100644
--- a/templates/index.tmpl
+++ b/templates/index.tmpl
@@ -14,7 +14,7 @@     {{ range . }}
     <tr>
       <td>{{ .ID }}</td>
       <td>{{ .Link }}</td>
-      <td>{{ .Output_folder }}</td>
+      <td>{{ .OutputFolder }}</td>
       <td>
         <a href="entries/{{ .ID }}" >Edit</a>
         </span>