diff --git a/modules/apigee_edge_teams/apigee_edge_teams.config_translation.yml b/modules/apigee_edge_teams/apigee_edge_teams.config_translation.yml
index ffa8c59a5..d4ae11b41 100644
--- a/modules/apigee_edge_teams/apigee_edge_teams.config_translation.yml
+++ b/modules/apigee_edge_teams/apigee_edge_teams.config_translation.yml
@@ -1,11 +1,11 @@
 apigee_edge_teams.team_settings:
-  title: 'Apigee Edge Teams: Team settings'
+  title: 'Apigee Teams: Team settings'
   base_route_name: apigee_edge_teams.settings.team
   names:
     - apigee_edge_teams.team_settings
 
 apigee_edge_teams.team_app_settings:
-  title: 'Apigee Edge Teams: Team App settings'
+  title: 'Apigee Teams: Team App settings'
   base_route_name: apigee_edge_teams.settings.team_app
   names:
     - apigee_edge_teams.team_app_settings
diff --git a/modules/apigee_edge_teams/apigee_edge_teams.info.yml b/modules/apigee_edge_teams/apigee_edge_teams.info.yml
index b9c9cc6b3..4898cb7c3 100644
--- a/modules/apigee_edge_teams/apigee_edge_teams.info.yml
+++ b/modules/apigee_edge_teams/apigee_edge_teams.info.yml
@@ -1,4 +1,4 @@
-name: Apigee Edge Teams
+name: Apigee Teams
 description: Provides shared app functionality by allowing developers to be organised into teams.
 package: Apigee
 
diff --git a/modules/apigee_edge_teams/apigee_edge_teams.install b/modules/apigee_edge_teams/apigee_edge_teams.install
index 9fa5a30c6..023f2b483 100644
--- a/modules/apigee_edge_teams/apigee_edge_teams.install
+++ b/modules/apigee_edge_teams/apigee_edge_teams.install
@@ -51,7 +51,7 @@ function apigee_edge_teams_requirements($phase) {
             t("The Teams module functionality is not available for monetization enabled org on Apigee X / Hybrid and should be uninstalled, because <a href=':url' target='_blank'>AppGroup APIs are not supported in Apigee X / Hybrid orgs with monetization enabled</a>.", $url) :
             t("The Teams module functionality is not available for monetization enabled org on Apigee X / Hybrid because <a href=':url' target='_blank'>AppGroup APIs are not supported in Apigee X / Hybrid orgs with monetization enabled</a>.", $url);
           $requirements['apigee_edge_teams_not_supported'] = [
-            'title' => t('Apigee Edge Teams'),
+            'title' => t('Apigee Teams'),
             'description' => $message,
             'severity' => REQUIREMENT_ERROR,
           ];
diff --git a/modules/apigee_edge_teams/src/Form/TeamMemberSyncForm.php b/modules/apigee_edge_teams/src/Form/TeamMemberSyncForm.php
index d6883e92c..1fdded0a6 100644
--- a/modules/apigee_edge_teams/src/Form/TeamMemberSyncForm.php
+++ b/modules/apigee_edge_teams/src/Form/TeamMemberSyncForm.php
@@ -83,7 +83,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       $this->sdkConnector->testConnection();
     }
     catch (\Exception $exception) {
-      $this->messenger()->addError($this->t('Cannot connect to Apigee Edge server. Please ensure that <a href=":link">Apigee Edge connection settings</a> are correct.', [
+      $this->messenger()->addError($this->t('Cannot connect to Apigee server. Please ensure that <a href=":link">Apigee connection settings</a> are correct.', [
         ':link' => Url::fromRoute('apigee_edge.settings')->toString(),
       ]));
       return $form;
diff --git a/modules/apigee_edge_teams/src/Plugin/EntityReferenceSelection/TeamMembersSelection.php b/modules/apigee_edge_teams/src/Plugin/EntityReferenceSelection/TeamMembersSelection.php
index 02e8d128a..93b8c6780 100644
--- a/modules/apigee_edge_teams/src/Plugin/EntityReferenceSelection/TeamMembersSelection.php
+++ b/modules/apigee_edge_teams/src/Plugin/EntityReferenceSelection/TeamMembersSelection.php
@@ -193,7 +193,7 @@ protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS')
       // retrieved then return an empty list.
       $query->condition('mail', 0);
       $context = Error::decodeException($exception);
-      $this->logger->error("Unable to retrieve list of developer email addresses from Apigee Edge. @message %function (line %line of %file). <pre>@backtrace_string</pre>", $context);
+      $this->logger->error("Unable to retrieve list of developer email addresses from Apigee. @message %function (line %line of %file). <pre>@backtrace_string</pre>", $context);
       return $query;
     }
 
@@ -221,7 +221,7 @@ protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS')
           '%team' => $team_name,
         ];
         $context += Error::decodeException($exception);
-        $this->logger->error("Unable to retrieve list of %team team from Apigee Edge. @message %function (line %line of %file). <pre>@backtrace_string</pre>", $context);
+        $this->logger->error("Unable to retrieve list of %team team from Apigee. @message %function (line %line of %file). <pre>@backtrace_string</pre>", $context);
       }
 
     }
diff --git a/modules/apigee_edge_teams/tests/modules/apigee_edge_teams_invitation_test/apigee_edge_teams_invitation_test.info.yml b/modules/apigee_edge_teams/tests/modules/apigee_edge_teams_invitation_test/apigee_edge_teams_invitation_test.info.yml
index a92eddeba..d98519a79 100644
--- a/modules/apigee_edge_teams/tests/modules/apigee_edge_teams_invitation_test/apigee_edge_teams_invitation_test.info.yml
+++ b/modules/apigee_edge_teams/tests/modules/apigee_edge_teams_invitation_test/apigee_edge_teams_invitation_test.info.yml
@@ -1,6 +1,6 @@
-name: 'Apigee Edge Teams: Invitation tests'
+name: 'Apigee Teams: Invitation tests'
 type: module
-description: 'Support module for the Apigee Edge Teams invitation tests.'
+description: 'Support module for the Apigee Teams invitation tests.'
 core_version_requirement: ^10
 package: Testing
 
diff --git a/modules/apigee_edge_teams/tests/modules/apigee_edge_teams_test/apigee_edge_teams_test.info.yml b/modules/apigee_edge_teams/tests/modules/apigee_edge_teams_test/apigee_edge_teams_test.info.yml
index 1f4b30a3b..5aaee83c4 100644
--- a/modules/apigee_edge_teams/tests/modules/apigee_edge_teams_test/apigee_edge_teams_test.info.yml
+++ b/modules/apigee_edge_teams/tests/modules/apigee_edge_teams_test/apigee_edge_teams_test.info.yml
@@ -1,6 +1,6 @@
-name: 'Apigee Edge Teams: Testing'
+name: 'Apigee Teams: Testing'
 type: module
-description: 'Support module for the Apigee Edge Teams tests.'
+description: 'Support module for the Apigee Teams tests.'
 core_version_requirement: ^10
 package: Testing
 
diff --git a/modules/apigee_edge_teams/tests/src/Functional/AccessTest.php b/modules/apigee_edge_teams/tests/src/Functional/AccessTest.php
index 6d93be3b4..31a78c454 100644
--- a/modules/apigee_edge_teams/tests/src/Functional/AccessTest.php
+++ b/modules/apigee_edge_teams/tests/src/Functional/AccessTest.php
@@ -443,7 +443,7 @@ protected function teamExpansionTest() {
     $this->drupalGet(Url::fromRoute('apigee_edge_teams.settings.team.permissions'));
     // Check whether the permission group labels and the permission labels and
     // descriptions are visible.
-    $this->assertSession()->pageTextContains('Apigee Edge Teams: Testing');
+    $this->assertSession()->pageTextContains('Apigee Teams: Testing');
     $this->assertSession()->pageTextContains('Team permission test');
     $this->assertSession()->pageTextContains('Team permission test 1');
     $this->assertSession()->pageTextContains('This is the 1st team test permission.');