diff --git a/services/collaboration/pkg/config/defaults/defaultconfig.go b/services/collaboration/pkg/config/defaults/defaultconfig.go
index ef4edc91ee..5ec1d68973 100644
--- a/services/collaboration/pkg/config/defaults/defaultconfig.go
+++ b/services/collaboration/pkg/config/defaults/defaultconfig.go
@@ -21,8 +21,8 @@ func DefaultConfig() *config.Config {
 			Name: "collaboration",
 		},
 		App: config.App{
-			Name:        "WOPI app",
-			Description: "Open office documents with a WOPI app",
+			Name:        "Collabora Online",
+			Description: "Open office documents with Collabora Online",
 			Icon:        "image-edit",
 			LockName:    "com.github.owncloud.collaboration",
 		},
diff --git a/services/frontend/pkg/config/config.go b/services/frontend/pkg/config/config.go
index 2d8b8a6da9..a3e1670e7a 100644
--- a/services/frontend/pkg/config/config.go
+++ b/services/frontend/pkg/config/config.go
@@ -109,7 +109,7 @@ type Auth struct {
 type AppHandler struct {
 	Prefix        string `yaml:"-"`
 	Insecure      bool   `yaml:"insecure" env:"OCIS_INSECURE;FRONTEND_APP_HANDLER_INSECURE" desc:"Allow insecure connections to the frontend." introductionVersion:"pre5.0"`
-	SecureViewApp string `yaml:"secure_view_app" env:"FRONTEND_APP_HANDLER_SECURE_VIEW_APP" desc:"Name of the app to use for secure view. Should match the name configured for the CS3 app provider." introductionVersion:"pre5.1"`
+	SecureViewApp string `yaml:"secure_view_app" env:"FRONTEND_APP_HANDLER_SECURE_VIEW_APP" desc:"Name of the app to use for secure view. Should match COLLABORATION_APP_NAME, the name configured for the CS3 app provider." introductionVersion:"5.1"`
 }
 
 type Archiver struct {
diff --git a/services/frontend/pkg/config/defaults/defaultconfig.go b/services/frontend/pkg/config/defaults/defaultconfig.go
index 4f214f457b..a66fb2ecb0 100644
--- a/services/frontend/pkg/config/defaults/defaultconfig.go
+++ b/services/frontend/pkg/config/defaults/defaultconfig.go
@@ -93,7 +93,8 @@ func DefaultConfig() *config.Config {
 			PreferredUploadType: "sha1",
 		},
 		AppHandler: config.AppHandler{
-			Prefix: "app",
+			Prefix:        "app",
+			SecureViewApp: "Collabora Online",
 		},
 		Archiver: config.Archiver{
 			Insecure:    false,