diff --git a/src/api/mock-api-router.ts b/src/api/mock-api-router.ts
index eb322bf9..a3a184d6 100644
--- a/src/api/mock-api-router.ts
+++ b/src/api/mock-api-router.ts
@@ -7,7 +7,7 @@ import { MockRequestHandler, processRequest } from "./request-processor";
 
 export type HttpMethod = "get" | "post" | "put" | "patch" | "delete" | "head";
 
-export type Category = "vanilla" | "azure" | "llc" | "optional";
+export type Category = "vanilla" | "azure" | "dpg" | "optional";
 
 export class MockApiRouter {
   public router: Router;
diff --git a/src/reporter/coverage.ts b/src/reporter/coverage.ts
index de75612d..3ace6871 100644
--- a/src/reporter/coverage.ts
+++ b/src/reporter/coverage.ts
@@ -25,7 +25,7 @@ async function collectCoverage(coverageFolder: string) {
     General: getMergedReport("vanilla"),
     Azure: getMergedReport("azure"),
     Optional: getMergedReport("optional"),
-    LLC: getMergedReport("llc"),
+    DPG: getMergedReport("dpg"),
   };
 
   if (Object.keys(report).every((cat) => Object.keys(report[cat]).length === 0)) {
diff --git a/src/test-routes/llc/customization.ts b/src/test-routes/llc/customization.ts
index 9d88c3ea..765dc160 100644
--- a/src/test-routes/llc/customization.ts
+++ b/src/test-routes/llc/customization.ts
@@ -1,6 +1,6 @@
 import { app, json } from "../../api";
 
-app.category("llc", () => {
+app.category("dpg", () => {
   app.get("/customization/model/raw", "GetRawModel", (req) => {
     return {
       status: 200,
diff --git a/src/test-routes/llc/update.ts b/src/test-routes/llc/update.ts
index 3525b683..3efe6b6f 100644
--- a/src/test-routes/llc/update.ts
+++ b/src/test-routes/llc/update.ts
@@ -1,39 +1,39 @@
 import { app, json, ValidationError } from "../../api";
 import { coverageService } from "../../services";
 
-app.category("llc", () => {
-  app.get("/servicedriven/parameters", "LLCAddOptionalInput", (req) => {
+app.category("dpg", () => {
+  app.get("/servicedriven/parameters", "DPGAddOptionalInput", (req) => {
     return {
       status: 200,
       body: json({ message: `An object was successfully returned` }),
     };
   });
 
-  coverageService.register("llc", "LLCNewBodyType.JSON");
-  coverageService.register("llc", "LLCNewBodyType.JPEG");
+  coverageService.register("dpg", "DPGNewBodyType.JSON");
+  coverageService.register("dpg", "DPGNewBodyType.JPEG");
 
-  app.post("/servicedriven/parameters", "LLCNewBodyType", (req) => {
+  app.post("/servicedriven/parameters", "DPGNewBodyType", (req) => {
     switch (req.headers["content-type"]) {
       case "image/jpeg":
         // req.expect.rawBodyEquals("binary");
-        coverageService.track("llc", "LLCNewBodyType.JPEG");
+        coverageService.track("dpg", "DPGNewBodyType.JPEG");
         return { status: 200 };
       case "application/json":
         req.expect.bodyEquals({ url: "http://example.org/myimage.jpeg" });
-        coverageService.track("llc", "LLCNewBodyType.JSON");
+        coverageService.track("dpg", "DPGNewBodyType.JSON");
         return { status: 200 };
       default:
         throw new ValidationError("Should be image/jpeg or application/json", {}, req.headers["content-type"]);
     }
   });
 
-  app.delete("/servicedriven/parameters", "LLCAddNewOperation", (req) => {
+  app.delete("/servicedriven/parameters", "DPGAddNewOperation", (req) => {
     return {
       status: 204,
     };
   });
 
-  app.get("/servicedriven/newpath", "LLCAddNewPath", (req) => {
+  app.get("/servicedriven/newpath", "DPGAddNewPath", (req) => {
     return {
       status: 200,
       body: json({ message: `An object was successfully returned` }),
diff --git a/swagger/llc-customization.json b/swagger/llc-customization.json
index 34f944b1..70fea118 100644
--- a/swagger/llc-customization.json
+++ b/swagger/llc-customization.json
@@ -2,8 +2,8 @@
   "swagger": "2.0",
   "info": {
     "version": "1.0.0",
-    "title": "LLCClient",
-    "description": "LLC Swagger that tests our ability to grow up."
+    "title": "DPGClient",
+    "description": "DPG Swagger that tests our ability to grow up."
   },
   "host": "localhost:3000",
   "schemes": ["http"],
@@ -38,7 +38,9 @@
             "name": "input",
             "in": "body",
             "description": "Please put {'hello': 'world!'}",
-            "schema": { "$ref": "#/definitions/Input" },
+            "schema": {
+              "$ref": "#/definitions/Input"
+            },
             "required": true
           }
         ],
@@ -54,7 +56,10 @@
     },
     "/customization/paging/{mode}": {
       "get": {
-        "x-ms-pageable": { "nextLinkName": "nextLink", "itemName": "values" },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink",
+          "itemName": "values"
+        },
         "operationId": "getPages",
         "description": "Get pages that you will either return to users in pages of raw bodies, or pages of models following growup.",
         "parameters": [
diff --git a/swagger/llc_initial.json b/swagger/llc_initial.json
index 06c43b55..3935e677 100644
--- a/swagger/llc_initial.json
+++ b/swagger/llc_initial.json
@@ -2,8 +2,8 @@
   "swagger": "2.0",
   "info": {
     "version": "1.0.0",
-    "title": "LLCClient",
-    "description": "LLC Swagger, this is the initial swagger a service could do"
+    "title": "DPGClient",
+    "description": "DPG Swagger, this is the initial swagger a service could do"
   },
   "host": "localhost:3000",
   "schemes": ["http"],
@@ -80,7 +80,9 @@
             "name": "parameter",
             "in": "body",
             "description": "I am a body parameter. My only valid JSON entry is { url: \"http://example.org/myimage.jpeg\" }",
-            "schema": { "$ref": "#/definitions/PostInput" },
+            "schema": {
+              "$ref": "#/definitions/PostInput"
+            },
             "required": true
           }
         ],
diff --git a/swagger/llc_update1.json b/swagger/llc_update1.json
index 420e8fb8..23412273 100644
--- a/swagger/llc_update1.json
+++ b/swagger/llc_update1.json
@@ -2,8 +2,8 @@
   "swagger": "2.0",
   "info": {
     "version": "1.0.0",
-    "title": "LLCClient",
-    "description": "LLC Swagger, this is the initial swagger a service could do"
+    "title": "DPGClient",
+    "description": "DPG Swagger, this is the initial swagger a service could do"
   },
   "host": "localhost:3000",
   "schemes": ["http"],
@@ -99,7 +99,9 @@
             "name": "parameter",
             "in": "body",
             "description": "I am a body parameter with a new content type. My only valid JSON entry is { url: \"http://example.org/myimage.jpeg\" }",
-            "schema": { "$ref": "#/definitions/PostInput" },
+            "schema": {
+              "$ref": "#/definitions/PostInput"
+            },
             "required": true
           }
         ],