diff --git a/inc/elasticsearch_packages/namespace.php b/inc/elasticsearch_packages/namespace.php
index 1b199620..8e974883 100644
--- a/inc/elasticsearch_packages/namespace.php
+++ b/inc/elasticsearch_packages/namespace.php
@@ -129,7 +129,7 @@ function create_package_id( ?string $package_id, string $slug, string $file, boo
 
 	// Check domain.
 	if ( ! defined( 'ELASTICSEARCH_HOST' ) || ! ELASTICSEARCH_HOST ) {
-		return new WP_Error( 'elasticsearch_host_not_found', 'Could not find an AWS ElasticSearch Service Domain to associate the package with.' );
+		return new WP_Error( 'elasticsearch_host_not_found', 'Could not find an AWS Elasticsearch Service Domain to associate the package with.' );
 	}
 
 	// Get AES client.
diff --git a/inc/healthcheck/namespace.php b/inc/healthcheck/namespace.php
index 686c1a08..cc836a84 100644
--- a/inc/healthcheck/namespace.php
+++ b/inc/healthcheck/namespace.php
@@ -287,12 +287,12 @@ function run_cron_healthcheck() {
 }
 
 /**
- * Run ElasticSearch health check.
+ * Run Elasticsearch health check.
  */
 function run_elasticsearch_healthcheck() {
 	$host = Cloud\get_elasticsearch_url();
 
-	// If no host is set then ElasticSearch not in use.
+	// If no host is set then Elasticsearch not in use.
 	if ( empty( $host ) ) {
 		return true;
 	}
diff --git a/inc/namespace.php b/inc/namespace.php
index 2c240dbc..9c9d85ce 100644
--- a/inc/namespace.php
+++ b/inc/namespace.php
@@ -137,7 +137,7 @@ function bootstrap() {
 	// Display environment details in admin sidebar.
 	Environment_Indicator\bootstrap();
 
-	// Sign ElasticSearch HTTP requests and log errors.
+	// Sign Elasticsearch HTTP requests and log errors.
 	add_action( 'http_api_debug', __NAMESPACE__ . '\\log_elasticsearch_request_errors', 10, 5 );
 	add_filter( 'http_request_args', __NAMESPACE__ . '\\on_http_request_args', 11, 2 );
 
@@ -363,7 +363,7 @@ function sign_psr7_request( RequestInterface $request ) : RequestInterface {
 }
 
 /**
- * Log ElasticSearch request errors.
+ * Log Elasticsearch request errors.
  *
  * @param array|WP_Error $response Response data.
  * @param string $context The http_api_debug action context.
@@ -388,10 +388,10 @@ function log_elasticsearch_request_errors( $response, string $context, string $c
 
 	if ( is_wp_error( $response ) ) {
 		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		trigger_error( sprintf( 'Error in ElasticSearch request: %s (%s)', $response->get_error_message(), $response->get_error_code() ), E_USER_WARNING );
+		trigger_error( sprintf( 'Error in Elasticsearch request: %s (%s)', $response->get_error_message(), $response->get_error_code() ), E_USER_WARNING );
 	} elseif ( ! $is_valid_res ) {
 		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-		trigger_error( sprintf( 'Error in ElasticSearch request: %s (%s)', wp_remote_retrieve_body( $response ), $request_response_code ), E_USER_WARNING );
+		trigger_error( sprintf( 'Error in Elasticsearch request: %s (%s)', wp_remote_retrieve_body( $response ), $request_response_code ), E_USER_WARNING );
 	}
 }