diff --git a/devops/oxbow-cd-pipeline.yml b/devops/oxbow-cd-pipeline.yml
index 0a1e3589..baf278dd 100644
--- a/devops/oxbow-cd-pipeline.yml
+++ b/devops/oxbow-cd-pipeline.yml
@@ -353,13 +353,13 @@ Resources:
                   - !Sub ${PipelineArtifactStore.Arn}/*
             Version: "2012-10-17"
           PolicyName: ArtifactStoreFullAccess
-        # To allow the pipeline to use a CodeStar Connection
+        # To allow the pipeline to use a CodeConnection
         - PolicyDocument:
             Statement:
-              - Action: codestar-connections:*
+              - Action: codeconnections:*
                 Condition:
                   ForAllValues:StringEquals:
-                    codestar-connections:PassedToService: codepipeline.amazonaws.com
+                    codeconnections:PassedToService: codepipeline.amazonaws.com
                 Effect: Allow
                 Resource: !Ref CodeStarConnectionArn
             Version: "2012-10-17"
diff --git a/devops/porter-cd-pipeline.yml b/devops/porter-cd-pipeline.yml
index 8d4d9d95..01b58b72 100644
--- a/devops/porter-cd-pipeline.yml
+++ b/devops/porter-cd-pipeline.yml
@@ -605,13 +605,13 @@ Resources:
                   - !Sub ${PipelineArtifactStore.Arn}/*
             Version: "2012-10-17"
           PolicyName: ArtifactStoreFullAccess
-        # To allow the pipeline to use a CodeStar Connection
+        # To allow the pipeline to use a CodeConnection
         - PolicyDocument:
             Statement:
-              - Action: codestar-connections:*
+              - Action: codeconnections:*
                 Condition:
                   ForAllValues:StringEquals:
-                    codestar-connections:PassedToService: codepipeline.amazonaws.com
+                    codeconnections:PassedToService: codepipeline.amazonaws.com
                 Effect: Allow
                 Resource: !Ref CodeStarConnectionArn
             Version: "2012-10-17"
diff --git a/spire/cd/template.yml b/spire/cd/template.yml
index 98acc39b..b305edad 100644
--- a/spire/cd/template.yml
+++ b/spire/cd/template.yml
@@ -35,7 +35,7 @@ Metadata:
       InfrastructureStorageStackName:
         default: Storage stack name
       CodeStarConnectionArn:
-        default: CodeStar Connection ARN
+        default: CodeConnection ARN
 
 Parameters:
   InfrastructureStorageStackName:
@@ -45,7 +45,7 @@ Parameters:
   CodeStarConnectionArn:
     Type: String
     Description: >-
-      The Arn of a previously-created and configured CodeStar Connection, which
+      The Arn of a previously-created and configured CodeConnection, which
       has access to the any Git repositories used as sources in the template
 
 Resources:
@@ -490,17 +490,17 @@ Resources:
                   - !Ref ProductionApprovalsSnsTopic
             Version: "2012-10-17"
           PolicyName: SnsApprovalsPolicy
-        # To allow the pipeline to use a CodeStar Connection
+        # To allow the pipeline to use a CodeConnection
         - PolicyDocument:
             Statement:
-              - Action: codestar-connections:*
+              - Action: codeconnections:*
                 Condition:
                   ForAllValues:StringEquals:
-                    codestar-connections:PassedToService: codepipeline.amazonaws.com
+                    codeconnections:PassedToService: codepipeline.amazonaws.com
                 Effect: Allow
                 Resource: !Ref CodeStarConnectionArn
             Version: "2012-10-17"
-          PolicyName: CodeStarConnectionPolicy
+          PolicyName: CodeConnectionPolicy
         # Allow CodePipeline to manipulate CloudFormation root stacks
         - PolicyDocument:
             Statement: