diff --git a/test/fixtures/apiGateway/serverless.yml b/test/fixtures/apiGateway/serverless.yml
index a732e4e25..fc7538793 100644
--- a/test/fixtures/apiGateway/serverless.yml
+++ b/test/fixtures/apiGateway/serverless.yml
@@ -5,6 +5,9 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
+  apiGateway:
+    shouldStartNameWithService: true
 
 functions:
   foo:
diff --git a/test/fixtures/apiGatewayExtended/serverless.yml b/test/fixtures/apiGatewayExtended/serverless.yml
index f7e18131f..644130f89 100644
--- a/test/fixtures/apiGatewayExtended/serverless.yml
+++ b/test/fixtures/apiGatewayExtended/serverless.yml
@@ -8,9 +8,10 @@ provider:
   runtime: nodejs12.x
   versionFunctions: false
   apiGateway:
+    shouldStartNameWithService: true
     apiKeys:
-      - name: ${self:service.name}-api-key-1
-        value: ${self:service.name}-api-key-1
+      - name: ${self:service}-api-key-1
+        value: ${self:service}-api-key-1
 
 functions:
   # core functions
diff --git a/test/fixtures/checkForChanges/serverless.yml b/test/fixtures/checkForChanges/serverless.yml
index 1a992bd5f..b5133b429 100644
--- a/test/fixtures/checkForChanges/serverless.yml
+++ b/test/fixtures/checkForChanges/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 functions:
   fn1:
diff --git a/test/fixtures/cognitoUserPool/serverless.yml b/test/fixtures/cognitoUserPool/serverless.yml
index d18a4eabf..7fd58d0fa 100644
--- a/test/fixtures/cognitoUserPool/serverless.yml
+++ b/test/fixtures/cognitoUserPool/serverless.yml
@@ -12,13 +12,13 @@ functions:
     handler: core.basic
     events:
       - cognitoUserPool:
-          pool: ${self:service.name} CUP Basic
+          pool: ${self:service} CUP Basic
           trigger: PreSignUp
   existingSimple:
     handler: core.existingSimple
     events:
       - cognitoUserPool:
-          pool: ${self:service.name} CUP Existing Simple
+          pool: ${self:service} CUP Existing Simple
           trigger: PreSignUp
           existing: true
   # testing if two functions share one cognito user pool with multiple configs
@@ -26,10 +26,10 @@ functions:
     handler: core.existingMulti
     events:
       - cognitoUserPool:
-          pool: ${self:service.name} CUP Existing Multi
+          pool: ${self:service} CUP Existing Multi
           trigger: PreSignUp
           existing: true
       - cognitoUserPool:
-          pool: ${self:service.name} CUP Existing Multi
+          pool: ${self:service} CUP Existing Multi
           trigger: PreAuthentication
           existing: true
diff --git a/test/fixtures/eventBridge/serverless.yml b/test/fixtures/eventBridge/serverless.yml
index c6d015a4c..072f16044 100644
--- a/test/fixtures/eventBridge/serverless.yml
+++ b/test/fixtures/eventBridge/serverless.yml
@@ -22,7 +22,7 @@ functions:
     handler: core.eventBusCustom
     events:
       - eventBridge:
-          eventBus: ${self:service.name}-named-event-bus
+          eventBus: ${self:service}-named-event-bus
           pattern:
             source:
               - serverless.test
diff --git a/test/fixtures/function/serverless.yml b/test/fixtures/function/serverless.yml
index a02c25635..889ae366d 100644
--- a/test/fixtures/function/serverless.yml
+++ b/test/fixtures/function/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 functions:
   foo:
diff --git a/test/fixtures/functionCloudFront/serverless.yml b/test/fixtures/functionCloudFront/serverless.yml
index 51cacd710..be9ba4592 100644
--- a/test/fixtures/functionCloudFront/serverless.yml
+++ b/test/fixtures/functionCloudFront/serverless.yml
@@ -5,6 +5,8 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
+
 functions:
   foo:
     handler: index.handler
diff --git a/test/fixtures/functionDestinations/serverless.yml b/test/fixtures/functionDestinations/serverless.yml
index 2bf38c77f..1f37be3ba 100644
--- a/test/fixtures/functionDestinations/serverless.yml
+++ b/test/fixtures/functionDestinations/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 functions:
   target:
diff --git a/test/fixtures/functionLayers/serverless.yml b/test/fixtures/functionLayers/serverless.yml
index 0ccc4edd3..d3fd805bb 100644
--- a/test/fixtures/functionLayers/serverless.yml
+++ b/test/fixtures/functionLayers/serverless.yml
@@ -1,6 +1,7 @@
 service: service
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 layers:
   testLayer:
diff --git a/test/fixtures/httpApi/serverless.yml b/test/fixtures/httpApi/serverless.yml
index 3d2cf1999..d3cff3f2e 100644
--- a/test/fixtures/httpApi/serverless.yml
+++ b/test/fixtures/httpApi/serverless.yml
@@ -6,6 +6,7 @@ frameworkVersion: '*'
 provider:
   name: aws
   logRetentionInDays: 14
+  lambdaHashingVersion: 20201221
 
 functions:
   foo:
diff --git a/test/fixtures/httpApiCatchAll/serverless.yml b/test/fixtures/httpApiCatchAll/serverless.yml
index 821f1e01b..28a5ebb31 100644
--- a/test/fixtures/httpApiCatchAll/serverless.yml
+++ b/test/fixtures/httpApiCatchAll/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 functions:
   foo:
diff --git a/test/fixtures/httpApiExport/serverless.yml b/test/fixtures/httpApiExport/serverless.yml
index 7897042ae..66fdbafd5 100644
--- a/test/fixtures/httpApiExport/serverless.yml
+++ b/test/fixtures/httpApiExport/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 resources:
   Resources:
diff --git a/test/fixtures/invocation/serverless.yml b/test/fixtures/invocation/serverless.yml
index c324dc6cb..a2c1b09f3 100644
--- a/test/fixtures/invocation/serverless.yml
+++ b/test/fixtures/invocation/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 functions:
   callback:
diff --git a/test/fixtures/iot/serverless.yml b/test/fixtures/iot/serverless.yml
index eb25aaf26..ca84f45ca 100644
--- a/test/fixtures/iot/serverless.yml
+++ b/test/fixtures/iot/serverless.yml
@@ -12,4 +12,4 @@ functions:
     handler: core.iotBasic
     events:
       - iot:
-          sql: "SELECT * FROM '${self:service.name}/test'"
+          sql: "SELECT * FROM '${self:service}/test'"
diff --git a/test/fixtures/layer/serverless.yml b/test/fixtures/layer/serverless.yml
index 9a0a4c19a..550975f5d 100644
--- a/test/fixtures/layer/serverless.yml
+++ b/test/fixtures/layer/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 functions:
   function:
diff --git a/test/fixtures/packageArtifact/serverless.yml b/test/fixtures/packageArtifact/serverless.yml
index b23893630..57307593b 100644
--- a/test/fixtures/packageArtifact/serverless.yml
+++ b/test/fixtures/packageArtifact/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 package:
   artifact: artifact.zip
diff --git a/test/fixtures/packageArtifactInServerlessDir/serverless.yml b/test/fixtures/packageArtifactInServerlessDir/serverless.yml
index a67c0d3a0..097748ccf 100644
--- a/test/fixtures/packageArtifactInServerlessDir/serverless.yml
+++ b/test/fixtures/packageArtifactInServerlessDir/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 plugins:
   # Mutates `package.artifact` to point to copied `.serverless/NAME.zip`
diff --git a/test/fixtures/packaging/serverless.yml b/test/fixtures/packaging/serverless.yml
index be525d1b3..bf6e0073b 100644
--- a/test/fixtures/packaging/serverless.yml
+++ b/test/fixtures/packaging/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 functions:
   fnService:
diff --git a/test/fixtures/plugin/serverless.yml b/test/fixtures/plugin/serverless.yml
index 1b74a571a..43d21b831 100644
--- a/test/fixtures/plugin/serverless.yml
+++ b/test/fixtures/plugin/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
 
 plugins:
   - ./plugin
diff --git a/test/fixtures/provisionedConcurrency/serverless.yml b/test/fixtures/provisionedConcurrency/serverless.yml
index 1b4f0cc53..78a23b467 100644
--- a/test/fixtures/provisionedConcurrency/serverless.yml
+++ b/test/fixtures/provisionedConcurrency/serverless.yml
@@ -22,7 +22,7 @@ functions:
                 - kinesis
                 - Ref: AWS::Region
                 - Ref: AWS::AccountId
-                - stream/${self:service.name}-kinesis
+                - stream/${self:service}-kinesis
       - sqs:
           arn:
             Fn::Join:
@@ -32,4 +32,4 @@ functions:
                 - sqs
                 - Ref: AWS::Region
                 - Ref: AWS::AccountId
-                - ${self:service.name}-provisioned
+                - ${self:service}-provisioned
diff --git a/test/fixtures/requestSchema/serverless.yml b/test/fixtures/requestSchema/serverless.yml
index 859122330..7b321bcc4 100644
--- a/test/fixtures/requestSchema/serverless.yml
+++ b/test/fixtures/requestSchema/serverless.yml
@@ -2,6 +2,7 @@ service: service
 
 provider:
   name: aws
+  lambdaHashingVersion: 20201221
   apiGateway:
     request:
       schemas:
diff --git a/test/fixtures/sns/serverless.yml b/test/fixtures/sns/serverless.yml
index cc0207259..c5466898e 100644
--- a/test/fixtures/sns/serverless.yml
+++ b/test/fixtures/sns/serverless.yml
@@ -11,14 +11,14 @@ functions:
   snsMinimal:
     handler: core.snsMinimal
     events:
-      - sns: ${self:service.name}-minimal
+      - sns: ${self:service}-minimal
 
   snsMultipleFilteredLeft:
     handler: core.snsMultipleFilteredLeft
     events:
       - sns:
-          topicName: ${self:service.name}-filtered
-          displayName: 'Integration Test: ${self:service.name}-filtered'
+          topicName: ${self:service}-filtered
+          displayName: 'Integration Test: ${self:service}-filtered'
           filterPolicy:
             side:
               - left
@@ -26,8 +26,8 @@ functions:
     handler: core.snsMultipleFilteredRight
     events:
       - sns:
-          topicName: ${self:service.name}-filtered
-          displayName: 'Integration Test: ${self:service.name}-filtered'
+          topicName: ${self:service}-filtered
+          displayName: 'Integration Test: ${self:service}-filtered'
           filterPolicy:
             side:
               - right
@@ -42,5 +42,5 @@ functions:
               - - 'arn:aws:sns'
                 - Ref: 'AWS::Region'
                 - Ref: 'AWS::AccountId'
-                - ${self:service.name}-existing
-          topicName: ${self:service.name}-existing
+                - ${self:service}-existing
+          topicName: ${self:service}-existing
diff --git a/test/fixtures/sqs/serverless.yml b/test/fixtures/sqs/serverless.yml
index 29db59493..65863d6e9 100644
--- a/test/fixtures/sqs/serverless.yml
+++ b/test/fixtures/sqs/serverless.yml
@@ -20,4 +20,4 @@ functions:
                 - sqs
                 - Ref: AWS::Region
                 - Ref: AWS::AccountId
-                - ${self:service.name}-basic
+                - ${self:service}-basic
diff --git a/test/fixtures/stream/serverless.yml b/test/fixtures/stream/serverless.yml
index 70e7cd1ff..4973b90de 100644
--- a/test/fixtures/stream/serverless.yml
+++ b/test/fixtures/stream/serverless.yml
@@ -29,7 +29,7 @@ functions:
                 - kinesis
                 - Ref: AWS::Region
                 - Ref: AWS::AccountId
-                - stream/${self:service.name}-kinesis
+                - stream/${self:service}-kinesis
           batchSize: 100
           startingPosition: TRIM_HORIZON
           batchWindow: 1
@@ -48,4 +48,4 @@ resources:
             KeyType: HASH
         StreamSpecification:
           StreamViewType: KEYS_ONLY
-        TableName: ${self:service.name}-table
+        TableName: ${self:service}-table
diff --git a/test/integrationPackage/fixtures/artifact/serverless.yml b/test/integrationPackage/fixtures/artifact/serverless.yml
index 57c66f926..afdb2ec60 100644
--- a/test/integrationPackage/fixtures/artifact/serverless.yml
+++ b/test/integrationPackage/fixtures/artifact/serverless.yml
@@ -5,6 +5,7 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
+  lambdaHashingVersion: 20201221
 
 functions:
   hello:
diff --git a/test/integrationPackage/fixtures/individually-function/serverless.yml b/test/integrationPackage/fixtures/individually-function/serverless.yml
index b6c8eedad..aba9cf5d2 100644
--- a/test/integrationPackage/fixtures/individually-function/serverless.yml
+++ b/test/integrationPackage/fixtures/individually-function/serverless.yml
@@ -5,6 +5,7 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
+  lambdaHashingVersion: 20201221
 
 functions:
   hello:
diff --git a/test/integrationPackage/fixtures/individually/serverless.yml b/test/integrationPackage/fixtures/individually/serverless.yml
index 99fd88179..68377a331 100644
--- a/test/integrationPackage/fixtures/individually/serverless.yml
+++ b/test/integrationPackage/fixtures/individually/serverless.yml
@@ -5,6 +5,7 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
+  lambdaHashingVersion: 20201221
 
 package:
   individually: true
diff --git a/test/integrationPackage/fixtures/regular/serverless.yml b/test/integrationPackage/fixtures/regular/serverless.yml
index 05fb66fb4..8e9937299 100644
--- a/test/integrationPackage/fixtures/regular/serverless.yml
+++ b/test/integrationPackage/fixtures/regular/serverless.yml
@@ -5,10 +5,11 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
+  lambdaHashingVersion: 20201221
 
 functions:
   hello:
     handler: handler.hello
   custom-name:
-    name: ${self:service}-${self:provider.region}-custom-name
+    name: ${self:service}-${opt:region, self:provider.region, 'us-east-1'}-custom-name
     handler: handler.hello
diff --git a/test/unit/lib/plugins/aws/deploy/index.test.js b/test/unit/lib/plugins/aws/deploy/index.test.js
index c849f6f69..729f3ea31 100644
--- a/test/unit/lib/plugins/aws/deploy/index.test.js
+++ b/test/unit/lib/plugins/aws/deploy/index.test.js
@@ -425,7 +425,7 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
           'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
       })
       .returns({
-        Metadata: { filesha256: 'o3jgmZRgwiNIhECDFntBIwUJuH2YOhryxKIqZ0wlUbQ=' },
+        Metadata: { filesha256: 'Cs3d4Sap0nwF6NPJnw4JN1gI41zodxGGmmmKw2C8hRs=' },
       });
     s3HeadObjectStub
       .withArgs({
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
index 33a5a125f..eefb1ede4 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
@@ -1044,7 +1044,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
                   'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
               })
               .returns({
-                Metadata: { filesha256: 'p2wLB86RTnPkFQLaGCUQFdk6/nwyVGiX2mGJl2m0bD0=' },
+                Metadata: { filesha256: 'Pa14GST706iFrSIacw7FepUBMx+tYEs7VVv4YYY6wPs=' },
               });
 
             headObjectStub