diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12cf42dc55..df3b85dfab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -165,7 +165,7 @@ All releases can be found on https://code.vikunja.io/api/releases.
 
 * *(background)* Add Last-Modified header (#1376)
 * *(caldav)* Add support for repeating tasks
-* *(caldav)* Export Labels to Caldav (#1409)
+* *(caldav)* Export Labels to CalDAV (#1409)
 * *(caldav)* Import caldav categories as Labels (#1413)
 * *(migrators)* Remove wunderlist (#1346)
 * *(release)* Use compressed binaries for package releases
@@ -1761,7 +1761,7 @@ All releases can be found on https://code.vikunja.io/api/releases.
 
 ### Added
 
-* Better Caldav support (#73)
+* Better CalDAV support (#73)
 * Added settings for max open/idle connections and max connection lifetime (#74)
 * /info endpoint (#85)
 * Added http endpoint to list all users on a list (#87)
diff --git a/docs/content/doc/usage/caldav.md b/docs/content/doc/usage/caldav.md
index 60d2612997..6c02bf53b7 100644
--- a/docs/content/doc/usage/caldav.md
+++ b/docs/content/doc/usage/caldav.md
@@ -1,6 +1,6 @@
 ---
 date: "2019-05-12:00:00+01:00"
-title: "Caldav"
+title: "CalDAV"
 draft: false
 type: "doc"
 menu:
@@ -8,7 +8,7 @@ menu:
     parent: "usage"
 ---
 
-# Caldav
+# CalDAV
 
 > **Warning:** The caldav integration is in an early alpha stage and has bugs.
 > It works well with some clients while having issues with others.
diff --git a/pkg/caldav/parsing_test.go b/pkg/caldav/parsing_test.go
index c2b7b274a5..c0f842e4f1 100644
--- a/pkg/caldav/parsing_test.go
+++ b/pkg/caldav/parsing_test.go
@@ -315,7 +315,7 @@ func TestGetCaldavTodosForTasks(t *testing.T) {
 		wantCaldav string
 	}{
 		{
-			name: "Format single Task as Caldav",
+			name: "Format single Task as CalDAV",
 			args: args{
 				list: &models.ProjectWithTasksAndBuckets{
 					Project: models.Project{