diff --git a/config/archiveMessagesEventRule.json b/config/archiveMessagesEventRule.json
index d058afc..6280672 100644
--- a/config/archiveMessagesEventRule.json
+++ b/config/archiveMessagesEventRule.json
@@ -1,6 +1,6 @@
 {
   "Description": "Event rule to schedule the cap xml archiveMessages lambda function",
-  "Name": "cap-xml-{stage}-archiveMessages-rule",
+  "Name": "cpx-{stage}-archiveMessages-rule",
   "RoleArn": "{roleArn}",
   "ScheduleExpression": "cron(0 2 * * ? *)",
   "State": "ENABLED"
diff --git a/config/archiveMessagesLambdaPermission.json b/config/archiveMessagesLambdaPermission.json
index 79c1534..e584108 100644
--- a/config/archiveMessagesLambdaPermission.json
+++ b/config/archiveMessagesLambdaPermission.json
@@ -1,6 +1,6 @@
 {
-  "FunctionName": "cap-xml-{stage}-archiveMessages",
-  "StatementId": "events-invoke-cap-xml-{stage}-archiveMessages",
+  "FunctionName": "cpx-{stage}-archiveMessages",
+  "StatementId": "events-invoke-cpx-{stage}-archiveMessages",
   "Action": "lambda:InvokeFunction",
   "Principal": "events.amazonaws.com",
   "SourceArn": "{ruleArn}"
diff --git a/config/archiveMessagesTarget.json b/config/archiveMessagesTarget.json
index f79c92d..1ee593a 100644
--- a/config/archiveMessagesTarget.json
+++ b/config/archiveMessagesTarget.json
@@ -1,7 +1,7 @@
 {
-  "Rule": "cap-xml-{stage}-archiveMessages-rule",
+  "Rule": "cpx-{stage}-archiveMessages-rule",
   "Targets": [{
-    "Id": "cap-xml-{stage}-archiveMessages",
+    "Id": "cpx-{stage}-archiveMessages",
     "Arn": "{lambdaArn}"
   }]
 }
\ No newline at end of file
diff --git a/config/schema.js b/config/schema.js
index f3d2852..a9f5f20 100644
--- a/config/schema.js
+++ b/config/schema.js
@@ -9,7 +9,7 @@ module.exports = Joi.object({
     accountId: Joi.string().required().allow('', null),
     sessionToken: Joi.string().required().allow('', null),
     region: Joi.string().required(),
-    stage: Joi.string().required().allow('dv', 'qa', 'pp', 'ea'),
+    stage: Joi.string().required().allow('dev', 'tst', 'pre', 'prd'),
     rdsConnectionString: Joi.string().required()
   }),
   url: Joi.string().uri().required()
diff --git a/serverless.yml b/serverless.yml
index 7878629..b697fe5 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -1,4 +1,4 @@
-service: cap-xml
+service: cpx
 frameworkVersion: '3'
 useDotenv: true
 provider: