diff --git a/Makefile b/Makefile
index 993df80c..813e5019 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ deploy-ms-idp: ## 🔐 Create an Identity Provider
 	@echo -e "\e[34m$@\e[0m" || true
 	cd deploy && pwsh ./New-IdentityProvider.ps1
 
-generate-access-token: ## 🔐 Generate and access token
+generate-access-token: ## 🔐 Generate an access token
 	@echo -e "\e[34m$@\e[0m" || true
 	./scripts/generate_access_token.sh
 
diff --git a/data-reconciliation-app/Makefile b/data-reconciliation-app/Makefile
index 5460d77b..a9db2e58 100755
--- a/data-reconciliation-app/Makefile
+++ b/data-reconciliation-app/Makefile
@@ -102,7 +102,7 @@ deploy-mccf: ## 🚀 Deploy Managed CCF
 deploy-ms-idp: ## 🔐 Create an Identity Provider
 	@cd .. && $(MAKE) deploy-ms-idp
 
-generate-access-token: ## 🔐 Generate and access token
+generate-access-token: ## 🔐 Generate an access token
 	@cd .. && $(MAKE) generate-access-token
 
 # Keep this at the bottom.
diff --git a/data-reconciliation-app/docs/adr/03-reconciliation-logic.md b/data-reconciliation-app/docs/adr/03-reconciliation-logic.md
index 2de38cb1..33b8d00f 100755
--- a/data-reconciliation-app/docs/adr/03-reconciliation-logic.md
+++ b/data-reconciliation-app/docs/adr/03-reconciliation-logic.md
@@ -21,7 +21,7 @@ When a user requests a reconciliation report via the `/report` endpoint, it is g
 
 This decouples data ingestion from reconciliation reporting.
 
-Reconciliation is implemented by querying CFF KV Store for all the keys this user has submitted. Any keys unknown to this user are not used in the reconciliation report. This ensures the user only sees a report with their submitted data.
+Reconciliation is implemented by querying CCF KV Store for all the keys this user has submitted. Any keys unknown to this user are not used in the reconciliation report. This ensures the user only sees a report with their submitted data.
 
 ## Scenarios
 
diff --git a/data-reconciliation-app/src/repositories/kv-repository.ts b/data-reconciliation-app/src/repositories/kv-repository.ts
index 0558c3f1..82bede8e 100755
--- a/data-reconciliation-app/src/repositories/kv-repository.ts
+++ b/data-reconciliation-app/src/repositories/kv-repository.ts
@@ -3,54 +3,54 @@ import { ReconciledRecord } from "../models/reconciled-record";
 import { ServiceResult } from "../utils/service-result";
 
 /**
- * Generic Key-Value implementation wrapping CFF TypedKvMap storage engine
+ * Generic Key-Value implementation wrapping CCF TypedKvMap storage engine
  */
 export interface IRepository<T> {
   /**
-   * Store {T} in CFF TypedKvMap storage by key
+   * Store {T} in CCF TypedKvMap storage by key
    * @param {string} key
    * @param {T} value
    */
   set(key: string, value: T): ServiceResult<T>;
 
   /**
-   * Retrive {T} in CFF TypedKvMap storage by key
+   * Retrive {T} in CCF TypedKvMap storage by key
    * @param {string} key
    * @param {T} value
    */
   get(key: string): ServiceResult<T>;
 
   /**
-   * Check if {T} exists in CFF TypedKvMap storage by key
+   * Check if {T} exists in CCF TypedKvMap storage by key
    * @param {string} key
    * @param {T} value
    */
   has(key: string): ServiceResult<boolean>;
 
   /**
-   * Retrieve all keys in CFF TypedKvMap storage
+   * Retrieve all keys in CCF TypedKvMap storage
    */
   keys(): ServiceResult<string[]>;
 
   /**
-   * Retrieve all values in CFF TypedKvMap storage
+   * Retrieve all values in CCF TypedKvMap storage
    */
   values(): ServiceResult<T[]>;
 
   /**
-   * Get size of CFF TypedKvMap storage
+   * Get size of CCF TypedKvMap storage
    * @returns {ServiceResult<number>}
    */
   get size(): ServiceResult<number>;
 
   /**
-   * Iterate through CFF TypedKvMap storage by key
+   * Iterate through CCF TypedKvMap storage by key
    * @param callback
    */
   forEach(callback: (key: string, value: T) => void): ServiceResult<string>;
 
   /**
-   * Clears CFF TypedKvMap storage
+   * Clears CCF TypedKvMap storage
    */
   clear(): ServiceResult<void>;
 }
diff --git a/data-reconciliation-app/src/utils/api-result.ts b/data-reconciliation-app/src/utils/api-result.ts
index 128765e7..754e7969 100755
--- a/data-reconciliation-app/src/utils/api-result.ts
+++ b/data-reconciliation-app/src/utils/api-result.ts
@@ -10,7 +10,7 @@ export enum StatusCode {
 }
 
 /**
- * Status code for CFF network conventions
+ * Status code for CCF network conventions
  */
 export interface CCFResponse {
   statusCode: number;
@@ -19,7 +19,7 @@ export interface CCFResponse {
 }
 
 /**
- * Utility class for wrapping the response with CFF network conventions
+ * Utility class for wrapping the response with CCF network conventions
  */
 export class ApiResult {
   /**
diff --git a/decentralize-rbac-app/src/repositories/kv-repository.ts b/decentralize-rbac-app/src/repositories/kv-repository.ts
index 5416c950..4173aa86 100755
--- a/decentralize-rbac-app/src/repositories/kv-repository.ts
+++ b/decentralize-rbac-app/src/repositories/kv-repository.ts
@@ -7,50 +7,50 @@ import { ServiceResult } from "../utils/service-result";
  */
 export interface IRepository<T> {
   /**
-   * Store {T} in CFF TypedKvMap storage by key
+   * Store {T} in CCF TypedKvMap storage by key
    * @param {string} key
    * @param {T} value
    */
   set(key: string, value: T): ServiceResult<T>;
 
   /**
-   * Retrive {T} in CFF TypedKvMap storage by key
+   * Retrive {T} in CCF TypedKvMap storage by key
    * @param {string} key
    * @param {T} value
    */
   get(key: string): ServiceResult<T>;
 
   /**
-   * Check if {T} exists in CFF TypedKvMap storage by key
+   * Check if {T} exists in CCF TypedKvMap storage by key
    * @param {string} key
    * @param {T} value
    */
   has(key: string): ServiceResult<boolean>;
 
   /**
-   * Retrieve all keys in CFF TypedKvMap storage
+   * Retrieve all keys in CCF TypedKvMap storage
    */
   keys(): ServiceResult<string[]>;
 
   /**
-   * Retrieve all values in CFF TypedKvMap storage
+   * Retrieve all values in CCF TypedKvMap storage
    */
   values(): ServiceResult<T[]>;
 
   /**
-   * Get size of CFF TypedKvMap storage
+   * Get size of CCF TypedKvMap storage
    * @returns {ServiceResult<number>}
    */
   get size(): ServiceResult<number>;
 
   /**
-   * Iterate through CFF TypedKvMap storage by key
+   * Iterate through CCF TypedKvMap storage by key
    * @param callback
    */
   forEach(callback: (key: string, value: T) => void): ServiceResult<string>;
 
   /**
-   * Clears CFF TypedKvMap storage
+   * Clears CCF TypedKvMap storage
    */
   clear(): ServiceResult<void>;
 
diff --git a/decentralize-rbac-app/src/utils/api-result.ts b/decentralize-rbac-app/src/utils/api-result.ts
index f02fff98..ac32970b 100755
--- a/decentralize-rbac-app/src/utils/api-result.ts
+++ b/decentralize-rbac-app/src/utils/api-result.ts
@@ -10,7 +10,7 @@ export enum StatusCode {
 }
 
 /**
- * Status code for CFF network conventions
+ * Status code for CCF network conventions
  */
 export interface CCFResponse {
   statusCode: number;
@@ -19,7 +19,7 @@ export interface CCFResponse {
 }
 
 /**
- * Utility class for wrapping the response with CFF network conventions
+ * Utility class for wrapping the response with CCF network conventions
  */
 export class ApiResult {
   /**