diff --git a/cmd/twhelp/cmd_serve.go b/cmd/twhelp/cmd_serve.go
index aff4ed9..ad991fd 100644
--- a/cmd/twhelp/cmd_serve.go
+++ b/cmd/twhelp/cmd_serve.go
@@ -23,66 +23,66 @@ import (
 )
 
 var (
-	apiServerPortFlag = &cli.UintFlag{
+	apiServerFlagPort = &cli.UintFlag{
 		Name:    "api.port",
 		EnvVars: []string{"API_PORT"},
 		Value:   9234, //nolint:gomnd
 	}
-	apiServerHandlerTimeoutFlag = &cli.DurationFlag{
+	apiServerFlagHandlerTimeout = &cli.DurationFlag{
 		Name:    "api.handlerTimeout",
 		EnvVars: []string{"API_HANDLER_TIMEOUT"},
 		Value:   5 * time.Second, //nolint:gomnd
 		Usage:   "https://pkg.go.dev/net/http#TimeoutHandler",
 	}
-	apiServerReadTimeoutFlag = &cli.DurationFlag{
+	apiServerFlagReadTimeout = &cli.DurationFlag{
 		Name:    "api.readTimeout",
 		EnvVars: []string{"API_READ_TIMEOUT"},
 		Value:   5 * time.Second, //nolint:gomnd
 	}
-	apiServerReadHeaderTimeoutFlag = &cli.DurationFlag{
+	apiServerFlagReadHeaderTimeout = &cli.DurationFlag{
 		Name:    "api.readHeaderTimeout",
 		EnvVars: []string{"API_READ_HEADER_TIMEOUT"},
 		Value:   time.Second,
 	}
-	apiServerWriteTimeoutFlag = &cli.DurationFlag{
+	apiServerFlagWriteTimeout = &cli.DurationFlag{
 		Name:    "api.writeTimeout",
 		EnvVars: []string{"API_WRITE_TIMEOUT"},
 		Value:   10 * time.Second, //nolint:gomnd
 	}
-	apiServerIdleTimeoutFlag = &cli.DurationFlag{
+	apiServerFlagIdleTimeout = &cli.DurationFlag{
 		Name:    "api.idleTimeout",
 		EnvVars: []string{"API_IDLE_TIMEOUT"},
 		Value:   180 * time.Second, //nolint:gomnd
 	}
-	apiServerShutdownTimeoutFlag = &cli.DurationFlag{
+	apiServerFlagShutdownTimeout = &cli.DurationFlag{
 		Name:    "api.shutdownTimeout",
 		EnvVars: []string{"API_SHUTDOWN_TIMEOUT"},
 		Value:   10 * time.Second, //nolint:gomnd
 	}
-	apiServerOpenAPIEnabledFlag = &cli.BoolFlag{
+	apiServerFlagOpenAPIEnabled = &cli.BoolFlag{
 		Name:    "api.openApi.enabled",
 		EnvVars: []string{"API_OPENAPI_ENABLED"},
 		Value:   true,
 	}
-	apiServerOpenAPISwaggerEnabledFlag = &cli.BoolFlag{
+	apiServerFlagOpenAPISwaggerEnabled = &cli.BoolFlag{
 		Name:    "api.openApi.swaggerEnabled",
 		EnvVars: []string{"API_OPENAPI_SWAGGER_ENABLED"},
 		Value:   true,
 	}
-	apiServerOpenAPIServersFlag = &cli.StringSliceFlag{
+	apiServerFlagOpenAPIServers = &cli.StringSliceFlag{
 		Name:    "api.openApi.servers",
 		EnvVars: []string{"API_OPENAPI_SERVERS"},
 	}
 	apiServerFlags = []cli.Flag{
-		apiServerPortFlag,
-		apiServerHandlerTimeoutFlag,
-		apiServerReadTimeoutFlag,
-		apiServerReadHeaderTimeoutFlag,
-		apiServerWriteTimeoutFlag,
-		apiServerIdleTimeoutFlag,
-		apiServerOpenAPIEnabledFlag,
-		apiServerOpenAPISwaggerEnabledFlag,
-		apiServerOpenAPIServersFlag,
+		apiServerFlagPort,
+		apiServerFlagHandlerTimeout,
+		apiServerFlagReadTimeout,
+		apiServerFlagReadHeaderTimeout,
+		apiServerFlagWriteTimeout,
+		apiServerFlagIdleTimeout,
+		apiServerFlagOpenAPIEnabled,
+		apiServerFlagOpenAPISwaggerEnabled,
+		apiServerFlagOpenAPIServers,
 	}
 )
 
@@ -132,11 +132,11 @@ var cmdServe = &cli.Command{
 
 		server, err := newHTTPServer(
 			httpServerConfig{
-				port:              c.Uint(apiServerPortFlag.Name),
-				readTimeout:       c.Duration(apiServerReadTimeoutFlag.Name),
-				readHeaderTimeout: c.Duration(apiServerReadHeaderTimeoutFlag.Name),
-				writeTimeout:      c.Duration(apiServerWriteTimeoutFlag.Name),
-				idleTimeout:       c.Duration(apiServerIdleTimeoutFlag.Name),
+				port:              c.Uint(apiServerFlagPort.Name),
+				readTimeout:       c.Duration(apiServerFlagReadTimeout.Name),
+				readHeaderTimeout: c.Duration(apiServerFlagReadHeaderTimeout.Name),
+				writeTimeout:      c.Duration(apiServerFlagWriteTimeout.Name),
+				idleTimeout:       c.Duration(apiServerFlagIdleTimeout.Name),
 			},
 			func(r chi.Router) error {
 				oapiCfg, oapiCfgErr := newOpenAPIConfigFromFlags(c)
@@ -177,7 +177,7 @@ var cmdServe = &cli.Command{
 		go func() {
 			waitForShutdownSignal(c.Context, logger)
 
-			ctx, cancel := context.WithTimeout(c.Context, c.Duration(apiServerShutdownTimeoutFlag.Name))
+			ctx, cancel := context.WithTimeout(c.Context, c.Duration(apiServerFlagShutdownTimeout.Name))
 			defer cancel()
 
 			if err := server.Shutdown(ctx); err != nil {
@@ -200,7 +200,7 @@ var cmdServe = &cli.Command{
 }
 
 func newOpenAPIConfigFromFlags(c *cli.Context) (port.OpenAPIConfig, error) {
-	rawURLs := c.StringSlice(apiServerOpenAPIServersFlag.Name)
+	rawURLs := c.StringSlice(apiServerFlagOpenAPIServers.Name)
 
 	servers := make([]port.OpenAPIConfigServer, 0, len(rawURLs))
 
@@ -216,8 +216,8 @@ func newOpenAPIConfigFromFlags(c *cli.Context) (port.OpenAPIConfig, error) {
 	}
 
 	return port.OpenAPIConfig{
-		Enabled:        c.Bool(apiServerOpenAPIEnabledFlag.Name),
-		SwaggerEnabled: c.Bool(apiServerOpenAPISwaggerEnabledFlag.Name),
+		Enabled:        c.Bool(apiServerFlagOpenAPIEnabled.Name),
+		SwaggerEnabled: c.Bool(apiServerFlagOpenAPISwaggerEnabled.Name),
 		BasePath:       apiBasePath,
 		Servers:        servers,
 	}, nil
@@ -237,7 +237,7 @@ func newAPIMiddlewares(c *cli.Context, logger *slog.Logger) chi.Middlewares {
 		})),
 		middleware.Recoverer,
 		func(next http.Handler) http.Handler {
-			return http.TimeoutHandler(next, c.Duration(apiServerHandlerTimeoutFlag.Name), "Timeout")
+			return http.TimeoutHandler(next, c.Duration(apiServerFlagHandlerTimeout.Name), "Timeout")
 		},
 	}
 }