diff --git a/infrastructure/terraform/per_workspace/main.tf b/infrastructure/terraform/per_workspace/main.tf
index 5b94404fb..216f5551f 100644
--- a/infrastructure/terraform/per_workspace/main.tf
+++ b/infrastructure/terraform/per_workspace/main.tf
@@ -80,7 +80,8 @@ module "lambdas" {
   source         = "./modules/api_worker/api_lambda"
   python_version = var.python_version
   name           = each.key
-  lambda_name    = "${local.project}--${replace(terraform.workspace, "_", "-")}--${replace(replace(replace(each.key, "_", "-"), "DeviceReferenceData", "DeviceRefData"), "MessageHandlingSystem", "MHS")}"
+  lambda_name    = "${local.project}--${replace(terraform.workspace, "_", "-")}--${replace(replace(replace(replace(each.key, "_", "-"), "DeviceReferenceData", "DeviceRefData"), "MessageHandlingSystem", "MHS"), "MessageSet", "MsgSet")}"
+
   //Compact will remove all nulls from the list and create a new one - this is because TF throws an error if there is a null item in the list.
   layers = concat(
     compact([for instance in module.layers : contains(var.api_lambda_layers, instance.name) ? instance.layer_arn : null]),
diff --git a/infrastructure/terraform/per_workspace/modules/api_entrypoint/api_gateway/locals.tf b/infrastructure/terraform/per_workspace/modules/api_entrypoint/api_gateway/locals.tf
index 03f82eb6a..5d50c10fb 100644
--- a/infrastructure/terraform/per_workspace/modules/api_entrypoint/api_gateway/locals.tf
+++ b/infrastructure/terraform/per_workspace/modules/api_entrypoint/api_gateway/locals.tf
@@ -5,7 +5,7 @@ locals {
   }
   methods = [
     for lambda_alias in setsubtract(var.lambdas, ["authoriser"]) :
-    { "method_${lambda_alias}" = "${local.apigateway_lambda_arn_prefix}:${var.assume_account}:function:${var.project}--${replace(terraform.workspace, "_", "-")}--${replace(replace(replace(lambda_alias, "_", "-"), "DeviceReferenceData", "DeviceRefData"), "MessageHandlingSystem", "MHS")}/invocations" }
+    { "method_${lambda_alias}" = "${local.apigateway_lambda_arn_prefix}:${var.assume_account}:function:${var.project}--${replace(terraform.workspace, "_", "-")}--${replace(replace(replace(replace(lambda_alias, "_", "-"), "DeviceReferenceData", "DeviceRefData"), "MessageHandlingSystem", "MHS"), "MessageSet", "MsgSet")}/invocations" }
   ]
   swagger_file = templatefile("${path.root}/../../swagger/dist/aws/swagger.yaml", merge({
     lambda_invoke_arn   = var.authoriser_metadata.lambda_invoke_arn,