diff --git a/internal/commands/start.go b/internal/commands/start.go
index a43271b64..933de5629 100644
--- a/internal/commands/start.go
+++ b/internal/commands/start.go
@@ -45,7 +45,7 @@ var startFlags = []cli.Flag{
 	},
 }
 
-// startAction starts the web server and initializes the daemon.
+// startAction starts the Web server and initializes the daemon.
 func startAction(ctx *cli.Context) error {
 	conf, err := InitConfig(ctx)
 
@@ -118,7 +118,7 @@ func startAction(ctx *cli.Context) error {
 		log.Infof("config: enabled read-only mode")
 	}
 
-	// Start web server.
+	// Start Web server.
 	go server.Start(cctx, conf)
 
 	if count, err := photoprism.RestoreAlbums(conf.AlbumsPath(), false); err != nil {
diff --git a/internal/commands/status.go b/internal/commands/status.go
index 06ead9cf4..a851a0ef9 100644
--- a/internal/commands/status.go
+++ b/internal/commands/status.go
@@ -20,7 +20,7 @@ var StatusCommand = cli.Command{
 	Action: statusAction,
 }
 
-// statusAction checks if the web server is running.
+// statusAction checks if the Web server is running.
 func statusAction(ctx *cli.Context) error {
 	conf := config.NewConfig(ctx)
 
diff --git a/internal/config/flags.go b/internal/config/flags.go
index 9342b9a5b..596a9817a 100644
--- a/internal/config/flags.go
+++ b/internal/config/flags.go
@@ -511,13 +511,13 @@ var Flags = CliFlags{
 		Flag: cli.StringFlag{
 			Name:   "http-host, ip",
 			Value:  "0.0.0.0",
-			Usage:  "web server `IP` address or Unix domain socket, e.g. unix:/var/run/photoprism.sock",
+			Usage:  "Web server `IP` address or Unix domain socket, e.g. unix:/var/run/photoprism.sock",
 			EnvVar: EnvVar("HTTP_HOST"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "http-port, port",
 			Value:  2342,
-			Usage:  "web server port `NUMBER`, ignored for Unix domain sockets",
+			Usage:  "Web server port `NUMBER`, ignored for Unix domain sockets",
 			EnvVar: EnvVar("HTTP_PORT"),
 		}}, {
 		Flag: cli.StringFlag{
diff --git a/internal/server/routes.go b/internal/server/routes.go
index 4f8a0132c..b9bea6378 100644
--- a/internal/server/routes.go
+++ b/internal/server/routes.go
@@ -9,7 +9,7 @@ import (
 
 var APIv1 *gin.RouterGroup
 
-// registerRoutes configures the available web server routes.
+// registerRoutes configures the available Web server routes.
 func registerRoutes(router *gin.Engine, conf *config.Config) {
 	// Enables automatic redirection if the current route cannot be matched but a
 	// handler for the path with (without) the trailing slash exists.
diff --git a/internal/server/server.go b/internal/server/server.go
index 962a73aa9..19ad7898b 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -1,5 +1,5 @@
 /*
-Package server provides REST and web server routing, request handling and logging.
+Package server provides REST and Web server routing, request handling and logging.
 
 Copyright (c) 2018 - 2023 PhotoPrism UG. All rights reserved.
 
diff --git a/internal/server/start.go b/internal/server/start.go
index 0e2e6b483..a461c91fc 100644
--- a/internal/server/start.go
+++ b/internal/server/start.go
@@ -143,7 +143,7 @@ func Start(ctx context.Context, conf *config.Config) {
 	}
 }
 
-// StartHttp starts the web server in http mode.
+// StartHttp starts the Web server in http mode.
 func StartHttp(s *http.Server, l net.Listener) {
 	if err := s.Serve(l); err != nil {
 		if err == http.ErrServerClosed {
@@ -154,7 +154,7 @@ func StartHttp(s *http.Server, l net.Listener) {
 	}
 }
 
-// StartTLS starts the web server in https mode.
+// StartTLS starts the Web server in https mode.
 func StartTLS(s *http.Server, httpsCert, privateKey string) {
 	if err := s.ListenAndServeTLS(httpsCert, privateKey); err != nil {
 		if err == http.ErrServerClosed {
@@ -165,7 +165,7 @@ func StartTLS(s *http.Server, httpsCert, privateKey string) {
 	}
 }
 
-// StartAutoTLS starts the web server with auto tls enabled.
+// StartAutoTLS starts the Web server with auto tls enabled.
 func StartAutoTLS(s *http.Server, m *autocert.Manager, conf *config.Config) {
 	var g errgroup.Group