diff --git a/api/types/database.go b/api/types/database.go
index e4568c2080f4..70a1844cce87 100644
--- a/api/types/database.go
+++ b/api/types/database.go
@@ -830,7 +830,7 @@ func (d *DatabaseV3) CheckAndSetDefaults() error {
 		d.Spec.AWS.DocumentDB.EndpointType = endpointInfo.EndpointType
 
 	case azureutils.IsDatabaseEndpoint(d.Spec.URI):
-		// For Azure MySQL and PostgresSQL.
+		// For Azure MySQL and PostgreSQL.
 		name, err := azureutils.ParseDatabaseEndpoint(d.Spec.URI)
 		if err != nil {
 			return trace.Wrap(err)
diff --git a/api/types/database_test.go b/api/types/database_test.go
index 129d9cde4d5f..ff33210d1e6e 100644
--- a/api/types/database_test.go
+++ b/api/types/database_test.go
@@ -316,7 +316,7 @@ func TestDatabaseAzureEndpoints(t *testing.T) {
 			},
 		},
 		{
-			name: "valid PostgresSQL",
+			name: "valid PostgreSQL",
 			spec: DatabaseSpecV3{
 				Protocol: "postgres",
 				URI:      "example-postgres.postgres.database.azure.com:5432",
diff --git a/api/utils/azure/endpoints.go b/api/utils/azure/endpoints.go
index e2e2b7e7f7ff..eef9841feb3a 100644
--- a/api/utils/azure/endpoints.go
+++ b/api/utils/azure/endpoints.go
@@ -178,7 +178,7 @@ func ParseMSSQLEndpoint(endpoint string) (name string, err error) {
 
 const (
 	// DatabaseEndpointSuffix is the Azure database endpoint suffix. Used for
-	// MySQL, PostgresSQL, etc.
+	// MySQL, PostgreSQL, etc.
 	DatabaseEndpointSuffix = ".database.azure.com"
 
 	// RedisEndpointSuffix is the endpoint suffix for Redis.
diff --git a/docs/pages/includes/config-reference/proxy-service.yaml b/docs/pages/includes/config-reference/proxy-service.yaml
index 6439ed28df22..0a8b22c15540 100644
--- a/docs/pages/includes/config-reference/proxy-service.yaml
+++ b/docs/pages/includes/config-reference/proxy-service.yaml
@@ -119,7 +119,7 @@ proxy_service:
     # Address advertised to MySQL clients. If not set, public_addr is used.
     mysql_public_addr: "mysql.teleport.example.com:3306"
 
-    # Address advertised to PostgresSQL clients. If not set, public_addr is
+    # Address advertised to PostgreSQL clients. If not set, public_addr is
     # used.
     postgres_public_addr: "postgres.teleport.example.com:443"
 
diff --git a/lib/srv/discovery/fetchers/db/azure_dbserver.go b/lib/srv/discovery/fetchers/db/azure_dbserver.go
index 3671048dee42..eb752437676f 100644
--- a/lib/srv/discovery/fetchers/db/azure_dbserver.go
+++ b/lib/srv/discovery/fetchers/db/azure_dbserver.go
@@ -32,12 +32,12 @@ func newAzureMySQLFetcher(config azureFetcherConfig) (common.Fetcher, error) {
 	return newAzureFetcher[*azure.DBServer, azure.DBServersClient](config, &azureDBServerPlugin{})
 }
 
-// newAzureMySQLFetcher creates a fetcher for Azure PostgresSQL.
+// newAzureMySQLFetcher creates a fetcher for Azure PostgreSQL.
 func newAzurePostgresFetcher(config azureFetcherConfig) (common.Fetcher, error) {
 	return newAzureFetcher[*azure.DBServer, azure.DBServersClient](config, &azureDBServerPlugin{})
 }
 
-// azureDBServerPlugin implements azureFetcherPlugin for MySQL and PostgresSQL.
+// azureDBServerPlugin implements azureFetcherPlugin for MySQL and PostgreSQL.
 type azureDBServerPlugin struct{}
 
 func (p *azureDBServerPlugin) GetListClient(cfg *azureFetcherConfig, subID string) (azure.DBServersClient, error) {
diff --git a/lib/srv/discovery/fetchers/db/azure_dbserver_test.go b/lib/srv/discovery/fetchers/db/azure_dbserver_test.go
index a7c5061efc53..352e46d49b92 100644
--- a/lib/srv/discovery/fetchers/db/azure_dbserver_test.go
+++ b/lib/srv/discovery/fetchers/db/azure_dbserver_test.go
@@ -36,7 +36,7 @@ import (
 )
 
 // TestAzureDBServerFetchers tests common azureFetcher functionalities and the
-// azureDBServerPlugin which is used for Azure MySQL and Azure PostgresSQL.
+// azureDBServerPlugin which is used for Azure MySQL and Azure PostgreSQL.
 func TestAzureDBServerFetchers(t *testing.T) {
 	t.Parallel()