diff --git a/efcms-service/serverless.yml b/efcms-service/serverless.yml
index 148360f98c2..40fef03fe71 100644
--- a/efcms-service/serverless.yml
+++ b/efcms-service/serverless.yml
@@ -290,7 +290,7 @@ resources:
 
 functions:
   getUploadPolicy:
-    handler: src/documents/getUploadPolicy.lambda.create
+    handler: src/documents/getUploadPolicyLambda.create
     events:
       - http:
           path: v1/documents/uploadPolicy
@@ -310,7 +310,7 @@ functions:
                   'application/json': 'policyUrl'
 
   getDownloadPolicyUrl:
-    handler: src/documents/downloadPolicyUrl.lambda.get
+    handler: src/documents/downloadPolicyUrlLambda.get
     events:
       - http:
           path: v1/documents/{documentId}/downloadPolicyUrl
@@ -330,7 +330,7 @@ functions:
                   'application/json': 'policyUrl'
 
   updateCase:
-    handler: src/cases/updateCase.lambda.put
+    handler: src/cases/updateCaseLambda.put
     events:
       - http:
           path: v1/cases/{caseId}
@@ -354,7 +354,7 @@ functions:
 
 
   createCase:
-    handler: src/cases/createCase.lambda.create
+    handler: src/cases/createCaseLambda.create
     events:
       - http:
           path: v1/cases
@@ -383,7 +383,7 @@ functions:
                   'application/json': case
 
   getCases:
-    handler: src/cases/getCases.lambda.get
+    handler: src/cases/getCasesLambda.get
     events:
       - http:
           path: v1/cases
@@ -403,7 +403,7 @@ functions:
                   'application/json': case
 
   getCase:
-    handler: src/cases/getCase.lambda.get
+    handler: src/cases/getCaseLambda.get
     events:
       - http:
           path: v1/cases/{caseId}
@@ -427,7 +427,7 @@ functions:
                   'application/json': case
 
   sendToIRS:
-    handler: src/cases/sendPetitionToIRS.lambda.post
+    handler: src/cases/sendPetitionToIRSLambda.post
     events:
       - http:
           path: v1/cases/{caseId}/irsPetitionPackage
@@ -450,7 +450,7 @@ functions:
                   'application/json': 'unprocessableEntityError'
 
   swagger:
-    handler: src/swagger/swagger.lambda.handler
+    handler: src/swagger/swaggerLambda.handler
     events:
       - http:
           path: v1/swagger
diff --git a/efcms-service/src/cases/createCase.lambda.js b/efcms-service/src/cases/createCaseLambda.js
similarity index 100%
rename from efcms-service/src/cases/createCase.lambda.js
rename to efcms-service/src/cases/createCaseLambda.js
diff --git a/efcms-service/src/cases/createCase.lambda.test.js b/efcms-service/src/cases/createCaseLambda.test.js
similarity index 98%
rename from efcms-service/src/cases/createCase.lambda.test.js
rename to efcms-service/src/cases/createCaseLambda.test.js
index 2362d025eb0..56c8c636115 100644
--- a/efcms-service/src/cases/createCase.lambda.test.js
+++ b/efcms-service/src/cases/createCaseLambda.test.js
@@ -2,7 +2,7 @@ const expect = require('chai').expect;
 const lambdaTester = require('lambda-tester');
 const client = require('ef-cms-shared/src/persistence/dynamodbClientService');
 const sinon = require('sinon');
-const createCase = require('./createCase.lambda');
+const createCase = require('./createCaseLambda');
 const chai = require('chai');
 chai.use(require('chai-string'));
 const { MOCK_DOCUMENTS } = require('ef-cms-shared/src/test/mockDocuments');
diff --git a/efcms-service/src/cases/getCase.lambda.js b/efcms-service/src/cases/getCaseLambda.js
similarity index 100%
rename from efcms-service/src/cases/getCase.lambda.js
rename to efcms-service/src/cases/getCaseLambda.js
diff --git a/efcms-service/src/cases/getCase.lambda.test.js b/efcms-service/src/cases/getCaseLambda.test.js
similarity index 98%
rename from efcms-service/src/cases/getCase.lambda.test.js
rename to efcms-service/src/cases/getCaseLambda.test.js
index b3a16fcd65d..afbd5c2cc0c 100644
--- a/efcms-service/src/cases/getCase.lambda.test.js
+++ b/efcms-service/src/cases/getCaseLambda.test.js
@@ -1,6 +1,6 @@
 const expect = require('chai').expect;
 const lambdaTester = require('lambda-tester');
-const getCase = require('./getCase.lambda');
+const getCase = require('./getCaseLambda');
 const client = require('ef-cms-shared/src/persistence/dynamodbClientService');
 const sinon = require('sinon');
 const chai = require('chai');
diff --git a/efcms-service/src/cases/getCases.lambda.js b/efcms-service/src/cases/getCasesLambda.js
similarity index 100%
rename from efcms-service/src/cases/getCases.lambda.js
rename to efcms-service/src/cases/getCasesLambda.js
diff --git a/efcms-service/src/cases/getCases.lambda.test.js b/efcms-service/src/cases/getCasesLambda.test.js
similarity index 98%
rename from efcms-service/src/cases/getCases.lambda.test.js
rename to efcms-service/src/cases/getCasesLambda.test.js
index eb2f6729b22..4eb6b35a2db 100644
--- a/efcms-service/src/cases/getCases.lambda.test.js
+++ b/efcms-service/src/cases/getCasesLambda.test.js
@@ -1,6 +1,6 @@
 const expect = require('chai').expect;
 const lambdaTester = require('lambda-tester');
-const getCases = require('./getCases.lambda');
+const getCases = require('./getCasesLambda');
 const chai = require('chai');
 const client = require('ef-cms-shared/src/persistence/dynamodbClientService');
 const sinon = require('sinon');
diff --git a/efcms-service/src/cases/sendPetitionToIRS.lambda.js b/efcms-service/src/cases/sendPetitionToIRSLambda.js
similarity index 100%
rename from efcms-service/src/cases/sendPetitionToIRS.lambda.js
rename to efcms-service/src/cases/sendPetitionToIRSLambda.js
diff --git a/efcms-service/src/cases/sendPetitionToIRS.lambda.test.js b/efcms-service/src/cases/sendPetitionToIRSLambda.test.js
similarity index 96%
rename from efcms-service/src/cases/sendPetitionToIRS.lambda.test.js
rename to efcms-service/src/cases/sendPetitionToIRSLambda.test.js
index 6dc44ba2cff..71b109c09a1 100644
--- a/efcms-service/src/cases/sendPetitionToIRS.lambda.test.js
+++ b/efcms-service/src/cases/sendPetitionToIRSLambda.test.js
@@ -2,7 +2,7 @@ const expect = require('chai').expect;
 const lambdaTester = require('lambda-tester');
 const client = require('ef-cms-shared/src/persistence/dynamodbClientService');
 const sinon = require('sinon');
-const sendPetitionToIRS = require('./sendPetitionToIRS.lambda');
+const sendPetitionToIRS = require('./sendPetitionToIRSLambda');
 const chai = require('chai');
 chai.use(require('chai-string'));
 
diff --git a/efcms-service/src/cases/updateCase.lambda.js b/efcms-service/src/cases/updateCaseLambda.js
similarity index 100%
rename from efcms-service/src/cases/updateCase.lambda.js
rename to efcms-service/src/cases/updateCaseLambda.js
diff --git a/efcms-service/src/cases/updateCase.lambda.test.js b/efcms-service/src/cases/updateCaseLambda.test.js
similarity index 98%
rename from efcms-service/src/cases/updateCase.lambda.test.js
rename to efcms-service/src/cases/updateCaseLambda.test.js
index dcb24f4a537..d9302f45227 100644
--- a/efcms-service/src/cases/updateCase.lambda.test.js
+++ b/efcms-service/src/cases/updateCaseLambda.test.js
@@ -2,7 +2,7 @@ const expect = require('chai').expect;
 const lambdaTester = require('lambda-tester');
 const client = require('ef-cms-shared/src/persistence/dynamodbClientService');
 const sinon = require('sinon');
-const updateCase = require('./updateCase.lambda');
+const updateCase = require('./updateCaseLambda');
 const chai = require('chai');
 chai.use(require('chai-string'));
 const { MOCK_DOCUMENTS } = require('ef-cms-shared/src/test/mockDocuments');
diff --git a/efcms-service/src/documents/downloadPolicyUrl.lambda.js b/efcms-service/src/documents/downloadPolicyUrlLambda.js
similarity index 100%
rename from efcms-service/src/documents/downloadPolicyUrl.lambda.js
rename to efcms-service/src/documents/downloadPolicyUrlLambda.js
diff --git a/efcms-service/src/documents/downloadPolicyUrl.lambda.test.js b/efcms-service/src/documents/downloadPolicyUrlLambda.test.js
similarity index 95%
rename from efcms-service/src/documents/downloadPolicyUrl.lambda.test.js
rename to efcms-service/src/documents/downloadPolicyUrlLambda.test.js
index 5b312741720..e37f3f8e2fe 100644
--- a/efcms-service/src/documents/downloadPolicyUrl.lambda.test.js
+++ b/efcms-service/src/documents/downloadPolicyUrlLambda.test.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 
 const getDownloadPolicyUrlStub = sinon.stub();
-const downloadPolicyUrl = proxyquire('./downloadPolicyUrl.lambda', {
+const downloadPolicyUrl = proxyquire('./downloadPolicyUrlLambda', {
   '../applicationContext': {
     getPersistenceGateway: () => ({
       getDownloadPolicyUrl: getDownloadPolicyUrlStub,
diff --git a/efcms-service/src/documents/getUploadPolicy.lambda.js b/efcms-service/src/documents/getUploadPolicyLambda.js
similarity index 100%
rename from efcms-service/src/documents/getUploadPolicy.lambda.js
rename to efcms-service/src/documents/getUploadPolicyLambda.js
diff --git a/efcms-service/src/documents/getUploadPolicy.lambda.test.js b/efcms-service/src/documents/getUploadPolicyLambda.test.js
similarity index 95%
rename from efcms-service/src/documents/getUploadPolicy.lambda.test.js
rename to efcms-service/src/documents/getUploadPolicyLambda.test.js
index f52d1b19cd8..cc8e6daa6b4 100644
--- a/efcms-service/src/documents/getUploadPolicy.lambda.test.js
+++ b/efcms-service/src/documents/getUploadPolicyLambda.test.js
@@ -19,7 +19,7 @@ const MOCK_RESPONSE = {
 };
 
 const getUploadPolicyStub = sinon.stub();
-const getUploadPolicy = proxyquire('./getUploadPolicy.lambda', {
+const getUploadPolicy = proxyquire('./getUploadPolicyLambda', {
   '../applicationContext': {
     getPersistenceGateway: () => ({
       getUploadPolicy: getUploadPolicyStub,
diff --git a/efcms-service/src/swagger/swagger.lambda.js b/efcms-service/src/swagger/swaggerLambda.js
similarity index 100%
rename from efcms-service/src/swagger/swagger.lambda.js
rename to efcms-service/src/swagger/swaggerLambda.js
diff --git a/efcms-service/src/swagger/swagger.lambda.test.js b/efcms-service/src/swagger/swaggerLambda.test.js
similarity index 93%
rename from efcms-service/src/swagger/swagger.lambda.test.js
rename to efcms-service/src/swagger/swaggerLambda.test.js
index 6b10f0b3f64..499382f392a 100644
--- a/efcms-service/src/swagger/swagger.lambda.test.js
+++ b/efcms-service/src/swagger/swaggerLambda.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 
 chai.use(require('chai-string'));
 
-const swagger = require('./swagger.lambda');
+const swagger = require('./swaggerLambda');
 
 describe('swagger GET', function() {
   it('should GET and return a 200 status', function() {