diff --git a/modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2Service.php b/modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2Service.php
index 24427b3d..fde71ea2 100644
--- a/modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2Service.php
+++ b/modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2Service.php
@@ -320,7 +320,7 @@ class Ec2Service implements Ec2ServiceInterface {
    *   Array of execution result or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   private function execute($operation, array $params = []) {
     $results = NULL;
diff --git a/modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2ServiceInterface.php b/modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2ServiceInterface.php
index 3947664e..dc07bdf3 100644
--- a/modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2ServiceInterface.php
+++ b/modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2ServiceInterface.php
@@ -60,7 +60,7 @@ interface Ec2ServiceInterface {
    *   Array of ElasticIps or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function allocateAddress(array $params = []);
 
@@ -74,7 +74,7 @@ interface Ec2ServiceInterface {
    *   An IamInstanceProfileAssociation or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function associateIamInstanceProfile(array $params = []);
 
@@ -88,7 +88,7 @@ interface Ec2ServiceInterface {
    *   An IamInstanceProfileAssociation or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function disassociateIamInstanceProfile(array $params = []);
 
@@ -102,7 +102,7 @@ interface Ec2ServiceInterface {
    *   An IamInstanceProfileAssociation or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function replaceIamInstanceProfileAssociation(array $params = []);
 
@@ -116,7 +116,7 @@ interface Ec2ServiceInterface {
    *   Array of IamInstanceProfileAssociation or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeIamInstanceProfileAssociations(array $params = []);
 
@@ -130,7 +130,7 @@ interface Ec2ServiceInterface {
    *   Array of Image or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createImage(array $params = []);
 
@@ -152,7 +152,7 @@ interface Ec2ServiceInterface {
    *   Array of KeyPair or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createKeyPair(array $params = []);
 
@@ -166,7 +166,7 @@ interface Ec2ServiceInterface {
    *   Array of NetworkInterface or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createNetworkInterface(array $params = []);
 
@@ -188,7 +188,7 @@ interface Ec2ServiceInterface {
    *   Array of Volume or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createVolume(array $params = []);
 
@@ -202,7 +202,7 @@ interface Ec2ServiceInterface {
    *   Array of Volume or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function modifyVolume(array $params = []);
 
@@ -216,7 +216,7 @@ interface Ec2ServiceInterface {
    *   Array of Snapshot or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createSnapshot(array $params = []);
 
@@ -230,7 +230,7 @@ interface Ec2ServiceInterface {
    *   Array of VPC or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createVpc(array $params = []);
 
@@ -244,7 +244,7 @@ interface Ec2ServiceInterface {
    *   Array of FlowLog or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createFlowLogs(array $params = []);
 
@@ -258,7 +258,7 @@ interface Ec2ServiceInterface {
    *   Array of VPC or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createVpcPeeringConnection(array $params = []);
 
@@ -272,7 +272,7 @@ interface Ec2ServiceInterface {
    *   Array of VPC or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function acceptVpcPeeringConnection(array $params = []);
 
@@ -286,7 +286,7 @@ interface Ec2ServiceInterface {
    *   Array of VPC or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeVpcPeeringConnections(array $params = []);
 
@@ -300,7 +300,7 @@ interface Ec2ServiceInterface {
    *   Array of FlowLog or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeFlowLogs(array $params = []);
 
@@ -314,7 +314,7 @@ interface Ec2ServiceInterface {
    *   Array of SecurityGroup or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createSecurityGroup(array $params = []);
 
@@ -325,7 +325,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createTags(array $params = []);
 
@@ -336,7 +336,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deleteTags(array $params = []);
 
@@ -347,7 +347,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deregisterImage(array $params = []);
 
@@ -361,7 +361,7 @@ interface Ec2ServiceInterface {
    *   Array of Instances or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeInstances(array $params = []);
 
@@ -375,7 +375,7 @@ interface Ec2ServiceInterface {
    *   Array of Instances or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeInstanceAttribute(array $params = []);
 
@@ -389,7 +389,7 @@ interface Ec2ServiceInterface {
    *   Array of Images or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeImages(array $params = []);
 
@@ -403,7 +403,7 @@ interface Ec2ServiceInterface {
    *   Array of SecurityGroups or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeSecurityGroups(array $params = []);
 
@@ -417,7 +417,7 @@ interface Ec2ServiceInterface {
    *   Array of NetworkInterfaceList or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeNetworkInterfaces(array $params = []);
 
@@ -431,7 +431,7 @@ interface Ec2ServiceInterface {
    *   Array of Addresses or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeAccountAttributes(array $params = []);
 
@@ -445,7 +445,7 @@ interface Ec2ServiceInterface {
    *   Array of Addresses or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeAddresses(array $params = []);
 
@@ -461,7 +461,7 @@ interface Ec2ServiceInterface {
    *   Array of Snapshots or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeSnapshots(array $params = []);
 
@@ -475,7 +475,7 @@ interface Ec2ServiceInterface {
    *   Array of KeyPairs or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeKeyPairs(array $params = []);
 
@@ -489,7 +489,7 @@ interface Ec2ServiceInterface {
    *   Array of Volumes or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeVolumes(array $params = []);
 
@@ -503,7 +503,7 @@ interface Ec2ServiceInterface {
    *   Array of AvailabilityZones or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeAvailabilityZones(array $params = []);
 
@@ -517,7 +517,7 @@ interface Ec2ServiceInterface {
    *   Array of VPCs or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeVpcs(array $params = []);
 
@@ -531,7 +531,7 @@ interface Ec2ServiceInterface {
    *   Array of VPCs or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function associateVpcCidrBlock(array $params = []);
 
@@ -545,7 +545,7 @@ interface Ec2ServiceInterface {
    *   Array of VPCs or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function disassociateVpcCidrBlock(array $params = []);
 
@@ -559,7 +559,7 @@ interface Ec2ServiceInterface {
    *   Array of Subnets or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function describeSubnets(array $params = []);
 
@@ -573,7 +573,7 @@ interface Ec2ServiceInterface {
    *   Array of Subnets or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function createSubnet(array $params = []);
 
@@ -603,7 +603,7 @@ interface Ec2ServiceInterface {
    *   Array of KeyPair or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function importKeyPair(array $params = []);
 
@@ -628,7 +628,7 @@ interface Ec2ServiceInterface {
    *   Array of Instance or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function terminateInstance(array $params = []);
 
@@ -639,7 +639,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deleteSecurityGroup(array $params = []);
 
@@ -650,7 +650,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deleteNetworkInterface(array $params = []);
 
@@ -661,7 +661,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2 Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function releaseAddress(array $params = []);
 
@@ -672,7 +672,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deleteKeyPair(array $params = []);
 
@@ -683,7 +683,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deleteVolume(array $params = []);
 
@@ -694,7 +694,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deleteSnapshot(array $params = []);
 
@@ -705,7 +705,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deleteVpc(array $params = []);
 
@@ -719,7 +719,7 @@ interface Ec2ServiceInterface {
    *   Array of FlowLog or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deleteFlowLogs(array $params = []);
 
@@ -730,7 +730,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function deleteSubnet(array $params = []);
 
@@ -741,7 +741,7 @@ interface Ec2ServiceInterface {
    *   Parameters array to send to API.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function disassociateAddress(array $params = []);
 
@@ -757,7 +757,7 @@ interface Ec2ServiceInterface {
    *   Array of Instances or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ec2\Ec2ServiceException
-   *   If the $params is empty or EC2Client is null.
+   *   If the $params is empty or $ec2_client (Ec2Client) is NULL.
    */
   public function runInstances(array $params = [], array $tags = []);
 
diff --git a/modules/cloud_service_providers/aws_cloud/src/Service/Ecr/EcrService.php b/modules/cloud_service_providers/aws_cloud/src/Service/Ecr/EcrService.php
index 3be13d91..66e10bdc 100644
--- a/modules/cloud_service_providers/aws_cloud/src/Service/Ecr/EcrService.php
+++ b/modules/cloud_service_providers/aws_cloud/src/Service/Ecr/EcrService.php
@@ -214,7 +214,7 @@ class EcrService implements EcrServiceInterface {
   }
 
   /**
-   * Execute the API of AWS Cloud Ecr Service.
+   * Execute the API of AWS Cloud ECR Service.
    *
    * @param string $operation
    *   The operation to perform.
@@ -225,14 +225,14 @@ class EcrService implements EcrServiceInterface {
    *   Array of execution result or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Ecr\EcrServiceException
-   *   If the S3 Client is null.
+   *   If the $ecr_client (EcrClient) is NULL.
    */
   private function execute($operation, array $params = []) {
     $results = NULL;
 
     $ecr_client = $this->getEcrClient();
     if ($ecr_client === NULL) {
-      throw new EcrServiceException('No Ecr Client found. Cannot perform API operations');
+      throw new EcrServiceException('No ECR Client found. Cannot perform API operations');
     }
 
     try {
diff --git a/modules/cloud_service_providers/aws_cloud/src/Service/Iam/IamService.php b/modules/cloud_service_providers/aws_cloud/src/Service/Iam/IamService.php
index 57a4fad1..117d9ac5 100644
--- a/modules/cloud_service_providers/aws_cloud/src/Service/Iam/IamService.php
+++ b/modules/cloud_service_providers/aws_cloud/src/Service/Iam/IamService.php
@@ -137,7 +137,7 @@ class IamService implements IamServiceInterface {
    *   Array of execution result or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\Iam\IamServiceException
-   *   If the IAM Client is null.
+   *   If the $iam_client (IamClient) is NULL.
    */
   private function execute($operation, array $params = []) {
     $results = NULL;
diff --git a/modules/cloud_service_providers/aws_cloud/src/Service/S3/S3Service.php b/modules/cloud_service_providers/aws_cloud/src/Service/S3/S3Service.php
index 15200c6a..ee72ed33 100644
--- a/modules/cloud_service_providers/aws_cloud/src/Service/S3/S3Service.php
+++ b/modules/cloud_service_providers/aws_cloud/src/Service/S3/S3Service.php
@@ -161,7 +161,7 @@ class S3Service implements S3ServiceInterface {
    *   Array of execution result or NULL if there is an error.
    *
    * @throws \Drupal\aws_cloud\Service\S3\S3ServiceException
-   *   If the S3 Client is null.
+   *   If the $s3_client (S3Client) is NULL.
    */
   private function execute($operation, array $params = []) {
     $results = NULL;
diff --git a/modules/cloud_service_providers/k8s/k8s.install b/modules/cloud_service_providers/k8s/k8s.install
index c853e73d..a4617bf1 100644
--- a/modules/cloud_service_providers/k8s/k8s.install
+++ b/modules/cloud_service_providers/k8s/k8s.install
@@ -25,7 +25,7 @@ function k8s_uninstall() {
   $entity_type_manager = \Drupal::entityTypeManager();
 
   try {
-    // Delete all k8s cloud_config entities.
+    // Delete all K8s cloud_config entities.
     $entities = $entity_type_manager
       ->getStorage('cloud_config')
       ->loadByProperties([
@@ -36,7 +36,7 @@ function k8s_uninstall() {
       $entity_type_manager->getStorage('cloud_config')->delete($entities);
     }
 
-    // Delete the k8s entity type.
+    // Delete the K8s entity type.
     $entity_type = $entity_type_manager
       ->getStorage('cloud_config_type')
       ->load('k8s');
@@ -345,7 +345,7 @@ function k8s_update_8214() {
 
   drupal_flush_all_caches();
 
-  // Update k8s nodes.
+  // Update K8s nodes.
   $config_entities = \Drupal::service('plugin.manager.cloud_config_plugin')
     ->loadConfigEntities('k8s');
   $k8s_service = \Drupal::service('k8s');
@@ -433,7 +433,7 @@ function k8s_update_8215() {
 
   drupal_flush_all_caches();
 
-  // Update k8s pods.
+  // Update K8s pods.
   $config_entities = \Drupal::service('plugin.manager.cloud_config_plugin')
     ->loadConfigEntities('k8s');
   $k8s_service = \Drupal::service('k8s');
@@ -485,7 +485,7 @@ function k8s_update_8216() {
 
   drupal_flush_all_caches();
 
-  // Update k8s namespace.
+  // Update K8s namespace.
   $config_entities = \Drupal::service('plugin.manager.cloud_config_plugin')
     ->loadConfigEntities('k8s');
   $k8s_service = \Drupal::service('k8s');
@@ -538,7 +538,7 @@ function k8s_update_8217() {
 
   drupal_flush_all_caches();
 
-  // Update k8s pods.
+  // Update K8s pods.
   $config_entities = \Drupal::service('plugin.manager.cloud_config_plugin')
     ->loadConfigEntities('k8s');
   $k8s_service = \Drupal::service('k8s');
@@ -549,7 +549,7 @@ function k8s_update_8217() {
 }
 
 /**
- * Install k8s cloud server template.
+ * Install K8s cloud server template.
  */
 function k8s_update_8218() {
   $files = [
@@ -623,7 +623,7 @@ function k8s_update_8221() {
 }
 
 /**
- * Add block for node in k8s pod view.
+ * Add block for node in K8s pod view.
  */
 function k8s_update_8222() {
   cloud_update_yml_definitions(['views.view.k8s_pod.yml'], 'k8s');
@@ -784,7 +784,7 @@ function k8s_update_8231() {
 }
 
 /**
- * Update k8s pod view.
+ * Update K8s pod view.
  */
 function k8s_update_8232() {
   cloud_update_yml_definitions(['views.view.k8s_pod.yml'], 'k8s');
@@ -963,7 +963,7 @@ function k8s_update_8241() {
 /**
  * Update a column name of K8s profile list view.
  *
- * Add default icon for k8s cloud_config.
+ * Add default icon for K8s cloud_config.
  */
 function k8s_update_8242() {
   cloud_update_yml_definitions(['views.view.k8s_profile.yml'], 'k8s');
@@ -1009,7 +1009,7 @@ function k8s_update_8244() {
 }
 
 /**
- * Add YAML URL field to k8s cloud server template.
+ * Add YAML URL field to K8s cloud server template.
  */
 function k8s_update_8245() {
   $files = [
@@ -1244,7 +1244,7 @@ function k8s_update_8257() {
 
   drupal_flush_all_caches();
 
-  // Update k8s persistent volume.
+  // Update K8s persistent volume.
   $config_entities = \Drupal::service('plugin.manager.cloud_config_plugin')
     ->loadConfigEntities('k8s');
   $k8s_service = \Drupal::service('k8s');
diff --git a/modules/cloud_service_providers/k8s/k8s.module b/modules/cloud_service_providers/k8s/k8s.module
index eb9cec2e..160d4304 100644
--- a/modules/cloud_service_providers/k8s/k8s.module
+++ b/modules/cloud_service_providers/k8s/k8s.module
@@ -281,7 +281,7 @@ function k8s_create_metrics_server_templates($cloud_context) {
  *   Edit form_id.
  */
 function k8s_form_cloud_config_k8s_form_common_alter(array &$form, FormStateInterface $form_state, $form_id) {
-  // Set the default k8s icon.
+  // Set the default K8s icon.
   $config = \Drupal::config('k8s.settings');
   $default_image = $config->get('k8s_cloud_config_icon');
   if ($default_image) {
@@ -304,7 +304,7 @@ function k8s_form_cloud_config_k8s_form_common_alter(array &$form, FormStateInte
  * Implements hook_default_cloud_config_icon().
  */
 function k8s_default_cloud_config_icon($entity) {
-  // Provides the calling hook with the default k8s icon.
+  // Provides the calling hook with the default K8s icon.
   if ($entity->bundle() === 'k8s') {
     $config = \Drupal::config('k8s.settings');
     return $config->get('k8s_cloud_config_icon');
@@ -569,7 +569,7 @@ function k8s_clear_cache() {
 }
 
 /**
- * Set allowed values for the k8s cluster.
+ * Set allowed values for the K8s cluster.
  *
  * @return array
  *   An array of possible key and value options.
@@ -775,7 +775,7 @@ function k8s_form_cloud_server_template_k8s_add_form_alter(array &$form, FormSta
 }
 
 /**
- * Submit function for k8s server template form.
+ * Submit function for K8s server template form.
  *
  * @param array $form
  *   An associative array containing the structure of the form.
@@ -910,7 +910,7 @@ function k8s_form_cloud_server_template_k8s_copy_form_alter(array &$form, FormSt
 }
 
 /**
- * Submit function for k8s server template copy.
+ * Submit function for K8s server template copy.
  *
  * @param array $form
  *   An associative array containing the structure of the form.
@@ -980,7 +980,7 @@ function k8s_form_cloud_server_template_k8s_form_common_alter(array &$form, Form
 }
 
 /**
- * Return orders of k8s cloud server template fields.
+ * Return orders of K8s cloud server template fields.
  *
  * @param bool $include_name
  *   Whether to include name field or not.
diff --git a/modules/cloud_service_providers/k8s/k8s.permissions.yml b/modules/cloud_service_providers/k8s/k8s.permissions.yml
index 72b21dc2..3b2f0940 100644
--- a/modules/cloud_service_providers/k8s/k8s.permissions.yml
+++ b/modules/cloud_service_providers/k8s/k8s.permissions.yml
@@ -14,10 +14,10 @@ create k8s project:
 ############################
 list k8s node:
   title: 'List k8s node'
-  description: 'Allow users to list k8s node'
+  description: 'Allow users to list K8s node'
 view k8s node:
   title: 'View k8s node'
-  description: 'Allow users to view k8s node'
+  description: 'Allow users to view K8s node'
 
 ############################
 # K8s Namespace
@@ -28,117 +28,117 @@ permission_callbacks:
   - Drupal\k8s\K8sNamespacePermissions::configPermissions
 
 add k8s namespace:
-  title: 'Add k8s namespace'
-  description: 'Allow users to add k8s namespace'
+  title: 'Add K8s namespace'
+  description: 'Allow users to add K8s namespace'
 list k8s namespace:
-  title: 'List k8s namespace'
-  description: 'Allow users to list k8s namespace'
+  title: 'List K8s namespace'
+  description: 'Allow users to list K8s namespace'
 view k8s namespace:
-  title: 'View k8s namespace'
-  description: 'Allow users to view k8s namespace'
+  title: 'View K8s namespace'
+  description: 'Allow users to view K8s namespace'
 edit k8s namespace:
-  title: 'Edit k8s namespace'
-  description: 'Allow users to edit k8s namespace'
+  title: 'Edit K8s namespace'
+  description: 'Allow users to edit K8s namespace'
 delete k8s namespace:
-  title: 'Delete k8s namespace'
-  description: 'Allow users to delete k8s namespace'
+  title: 'Delete K8s namespace'
+  description: 'Allow users to delete K8s namespace'
 
 
 ############################
 # K8s Pod
 ############################
 add k8s pod:
-  title: 'Add k8s pod'
-  description: 'Allow users to add k8s pod'
+  title: 'Add K8s pod'
+  description: 'Allow users to add K8s pod'
 list k8s pod:
-  title: 'List k8s pod'
-  description: 'Allow users to list k8s pod'
+  title: 'List K8s pod'
+  description: 'Allow users to list K8s pod'
 view any k8s pod:
-  title: 'View any k8s pod'
-  description: 'Allow users to view any k8s pod'
+  title: 'View any K8s pod'
+  description: 'Allow users to view any K8s pod'
 edit any k8s pod:
-  title: 'Edit any k8s pod'
-  description: 'Allow users to edit any k8s pod'
+  title: 'Edit any K8s pod'
+  description: 'Allow users to edit any K8s pod'
 delete any k8s pod:
-  title: 'Delete any k8s pod'
-  description: 'Allow users to delete any k8s pod'
+  title: 'Delete any K8s pod'
+  description: 'Allow users to delete any K8s pod'
 view own k8s pod:
-  title: 'View own k8s pod'
-  description: 'Allow users to view own k8s pod'
+  title: 'View own K8s pod'
+  description: 'Allow users to view own K8s pod'
 edit own k8s pod:
-  title: 'Edit own k8s pod'
-  description: 'Allow users to edit own k8s pod'
+  title: 'Edit own K8s pod'
+  description: 'Allow users to edit own K8s pod'
 delete own k8s pod:
-  title: 'Delete own k8s pod'
-  description: 'Allow users to delete own k8s pod'
+  title: 'Delete own K8s pod'
+  description: 'Allow users to delete own K8s pod'
 
 
 ############################
 # K8s Deployment
 ############################
 add k8s deployment:
-  title: 'Add k8s deployment'
-  description: 'Allow users to add k8s deployment'
+  title: 'Add K8s deployment'
+  description: 'Allow users to add K8s deployment'
 list k8s deployment:
-  title: 'List k8s deployment'
-  description: 'Allow users to list k8s deployment'
+  title: 'List K8s deployment'
+  description: 'Allow users to list K8s deployment'
 view any k8s deployment:
-  title: 'View any k8s deployment'
-  description: 'Allow users to view any k8s deployment'
+  title: 'View any K8s deployment'
+  description: 'Allow users to view any K8s deployment'
 edit any k8s deployment:
-  title: 'Edit any k8s deployment'
-  description: 'Allow users to edit any k8s deployment'
+  title: 'Edit any K8s deployment'
+  description: 'Allow users to edit any K8s deployment'
 delete any k8s deployment:
-  title: 'Delete any k8s deployment'
-  description: 'Allow users to delete any k8s deployment'
+  title: 'Delete any K8s deployment'
+  description: 'Allow users to delete any K8s deployment'
 view own k8s deployment:
-  title: 'View own k8s deployment'
-  description: 'Allow users to view own k8s deployment'
+  title: 'View own K8s deployment'
+  description: 'Allow users to view own K8s deployment'
 edit own k8s deployment:
-  title: 'Edit own k8s deployment'
-  description: 'Allow users to edit own k8s deployment'
+  title: 'Edit own K8s deployment'
+  description: 'Allow users to edit own K8s deployment'
 delete own k8s deployment:
-  title: 'Delete own k8s deployment'
-  description: 'Allow users to delete own k8s deployment'
+  title: 'Delete own K8s deployment'
+  description: 'Allow users to delete own K8s deployment'
 
 ############################
 # K8s Replica Set
 ############################
 add k8s replica set:
-  title: 'Add k8s replica set'
-  description: 'Allow users to add k8s replica set'
+  title: 'Add K8s replica set'
+  description: 'Allow users to add K8s replica set'
 list k8s replica set:
-  title: 'List k8s replica set'
-  description: 'Allow users to list k8s replica set'
+  title: 'List K8s replica set'
+  description: 'Allow users to list K8s replica set'
 view k8s replica set:
-  title: 'View k8s replica set'
-  description: 'Allow users to view k8s replica set'
+  title: 'View K8s replica set'
+  description: 'Allow users to view K8s replica set'
 edit k8s replica set:
-  title: 'Edit k8s replica set'
-  description: 'Allow users to edit k8s replica set'
+  title: 'Edit K8s replica set'
+  description: 'Allow users to edit K8s replica set'
 delete k8s replica set:
-  title: 'Delete k8s replica set'
-  description: 'Allow users to delete k8s replica set'
+  title: 'Delete K8s replica set'
+  description: 'Allow users to delete K8s replica set'
 
 
 ############################
 # K8s Service
 ############################
 add k8s service:
-  title: 'Add k8s service'
-  description: 'Allow users to add k8s service'
+  title: 'Add K8s service'
+  description: 'Allow users to add K8s service'
 list k8s service:
-  title: 'List k8s service'
-  description: 'Allow users to list k8s service'
+  title: 'List K8s service'
+  description: 'Allow users to list K8s service'
 view k8s service:
-  title: 'View k8s service'
-  description: 'Allow users to view k8s service'
+  title: 'View K8s service'
+  description: 'Allow users to view K8s service'
 edit k8s service:
-  title: 'Edit k8s service'
-  description: 'Allow users to edit k8s service'
+  title: 'Edit K8s service'
+  description: 'Allow users to edit K8s service'
 delete k8s service:
-  title: 'Delete k8s service'
-  description: 'Allow users to delete k8s service'
+  title: 'Delete K8s service'
+  description: 'Allow users to delete K8s service'
 
 
 ############################
diff --git a/modules/cloud_service_providers/k8s/src/Plugin/Validation/Constraint/YamlUrlConstraintValidator.php b/modules/cloud_service_providers/k8s/src/Plugin/Validation/Constraint/YamlUrlConstraintValidator.php
index d8fd9755..928e72c6 100644
--- a/modules/cloud_service_providers/k8s/src/Plugin/Validation/Constraint/YamlUrlConstraintValidator.php
+++ b/modules/cloud_service_providers/k8s/src/Plugin/Validation/Constraint/YamlUrlConstraintValidator.php
@@ -16,7 +16,7 @@ class YamlUrlConstraintValidator extends ConstraintValidator {
    */
   public function validate($entity, Constraint $constraint) {
 
-    // Only perform validations for k8s bundles.
+    // Only perform validations for K8s bundles.
     if ($entity->bundle() === 'k8s') {
       $yaml_url = $entity->get('field_yaml_url')->getValue();
       $detail = $entity->get('field_detail')->getValue();
diff --git a/modules/cloud_service_providers/k8s/src/Plugin/views/argument/K8sNodeId.php b/modules/cloud_service_providers/k8s/src/Plugin/views/argument/K8sNodeId.php
index 2151c9d8..66140ac5 100644
--- a/modules/cloud_service_providers/k8s/src/Plugin/views/argument/K8sNodeId.php
+++ b/modules/cloud_service_providers/k8s/src/Plugin/views/argument/K8sNodeId.php
@@ -7,7 +7,7 @@ use Drupal\views\Plugin\ViewsHandlerManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Argument handler to accept a k8s node id.
+ * Argument handler to accept a K8s node ID.
  *
  * @ViewsArgument("k8s_node_id")
  */
diff --git a/modules/tools/k8s_to_s3/k8s_to_s3.module b/modules/tools/k8s_to_s3/k8s_to_s3.module
index 62d7a095..e73360bd 100644
--- a/modules/tools/k8s_to_s3/k8s_to_s3.module
+++ b/modules/tools/k8s_to_s3/k8s_to_s3.module
@@ -303,7 +303,7 @@ function k8s_to_s3_export_entity_batch(
  * Batch function for transferring image to S3.
  *
  * @param Drupal\aws_cloud\Service\Ecr\EcrServiceInterface $ecr
- *   Ecr service object.
+ *   ECR service object.
  * @param Drupal\docker\Service\DockerServiceInterface $docker
  *   Docker server object.
  * @param string $image
@@ -329,7 +329,7 @@ function k8s_to_s3_transfer_image_batch(
   if ($target !== FALSE) {
     $context['results'][] = $image;
     $context['message'] = t(
-      'Copied @image to Ecr as @target',
+      'Copied @image to ECR as @target',
       [
         '@image' => $image,
         '@target' => $target,
@@ -343,7 +343,7 @@ function k8s_to_s3_transfer_image_batch(
  * @param \Drupal\aws_cloud\Service\Ecr\EcrServiceInterface $ecr
  *   EcrServiceInterface to use.
  * @param string $cloud_context
- *   The cloud context to use with Ecr.
+ *   The cloud context to use with ECR.
  *
  * @return array
  *   Auth array.
@@ -368,7 +368,7 @@ function k8s_to_s3_get_auth_token(EcrServiceInterface $ecr, $cloud_context) {
  * Transfer image to S3.
  *
  * @param Drupal\aws_cloud\Service\Ecr\EcrServiceInterface $ecr
- *   Ecr service object.
+ *   ECR service object.
  * @param Drupal\docker\Service\DockerServiceInterface $docker
  *   Docker server object.
  * @param string $image
@@ -405,7 +405,7 @@ function k8s_to_s3_transfer_image(
       if ($ecr->doesImageExist($info['full_repository'], $info['tag']) === FALSE) {
         \Drupal::logger('k8s_to_s3')->error(
           t(
-            'Image @image not pushed to Ecr @endpoint',
+            'Image @image not pushed to ECR @endpoint',
             [
               '@image' => $info['name'],
               '@endpoint' => $endpoint,
@@ -433,11 +433,11 @@ function k8s_to_s3_transfer_image(
  * @param \Drupal\docker\Service\DockerServiceInterface $docker
  *   Docker service.
  * @param \Drupal\aws_cloud\Service\Ecr\EcrServiceInterface $ecr
- *   The Ecr service.
+ *   The ECR service.
  * @param string $image
  *   Image to derive.
  * @param string $cloud_context
- *   The cloud context for the Ecr service.
+ *   The cloud context for the ECR service.
  *
  * @return string
  *   The derived target.
@@ -595,15 +595,15 @@ function k8s_to_s3_put_object(S3ServiceInterface $s3_service, $s3_bucket, $key,
  * @param array &$operations
  *   The operations.
  * @param array &$yaml
- *   The k8s content yaml.
+ *   The K8s content yaml.
  * @param string $entity_type
  *   The entity type.
  * @param \Drupal\aws_cloud\Service\Ecr\EcrServiceInterface $ecr
- *   The Ecr service.
+ *   The ECR service.
  * @param \Drupal\docker\Service\DockerServiceInterface $docker
  *   Docker service.
  * @param string $aws_cloud_context
- *   The cloud context for the Ecr service.
+ *   The cloud context for the ECR service.
  */
 function k8s_to_s3_add_transfer_image_operations(
   array &$operations,
diff --git a/modules/tools/s3_to_k8s/s3_to_k8s.module b/modules/tools/s3_to_k8s/s3_to_k8s.module
index 9945b182..8110e023 100644
--- a/modules/tools/s3_to_k8s/s3_to_k8s.module
+++ b/modules/tools/s3_to_k8s/s3_to_k8s.module
@@ -95,7 +95,7 @@ function s3_to_k8s_cron() {
  * @param string $s3_path
  *   The path of S3 bucket.
  * @param string $k8s_cloud_context
- *   The cloud context of k8s cluster.
+ *   The cloud context of K8s cluster.
  * @param array $objects
  *   The S3 objects.
  */
@@ -186,7 +186,7 @@ function s3_to_k8s_import_entities($entity_type, $aws_cloud_context, $s3_bucket,
  * @param string $s3_path
  *   The path of S3 bucket.
  * @param string $k8s_cloud_context
- *   The cloud context of k8s cluster.
+ *   The cloud context of K8s cluster.
  * @param array $objects
  *   The S3 objects.
  */