diff --git a/Gaia-x Proof Manager API.postman_collection.json b/Gaia-x Proof Manager API.postman_collection.json
index 9bae7aa5319cd45e28df67119f8217187bc40729..69d2668604510277a735e5ba72c6dbaede66b1f2 100644
--- a/Gaia-x Proof Manager API.postman_collection.json	
+++ b/Gaia-x Proof Manager API.postman_collection.json	
@@ -1,8 +1,8 @@
 {
 	"info": {
 		"_postman_id": "8cdaf3fb-ded2-4518-8464-c196c01c622f",
-		"name": "Gaia-x Proof Manager API",
-		"description": "API documentation for GAIA-X Proof Manager",
+		"name": "XFSC Proof Manager API",
+		"description": "API documentation for XFSC Proof Manager",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
 		"_exporter_id": "10250261"
 	},
diff --git a/LICENSE b/LICENSE
index 33f48080615e98cdd9d1bfed3fa1bc2c3d9d89cc..325adcc555f45f7575811f8d96aff6980c355d72 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-GAIA-X "Proof Manager" 
+XFSC "Proof Manager" 
 
 is the microservice responsible for handling the features related to
 proof presentation in the Organizational Credential Manager.
diff --git a/src/main.ts b/src/main.ts
index 8674d25a74e6794ca6892e06e1247d823321b5bf..cc14de2e21de48c2b6780efacdc7c77ce1ce61f5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -24,8 +24,8 @@ async function bootstrap() {
   });
 
   const swaggerConfig = new DocumentBuilder()
-    .setTitle('Gaia-x Proof Manager API')
-    .setDescription('API documentation for GAIA-X Proof Manager')
+    .setTitle('XFSC Proof Manager API')
+    .setDescription('API documentation for XFSC Proof Manager')
     .setVersion('1.0')
     .addServer(`localhost:${configService.get('PORT')}`)
     .build();
diff --git a/src/presentationProof/controller/controller.spec.ts b/src/presentationProof/controller/controller.spec.ts
index a2d73d7685649f4c729716290b9c28b741d8cd0a..527de3467a5c522fe1a86f1b6f9b4ee664accd40 100644
--- a/src/presentationProof/controller/controller.spec.ts
+++ b/src/presentationProof/controller/controller.spec.ts
@@ -291,7 +291,7 @@ describe('Proof Presentation Controller', () => {
     it('should return an presentation request send successfully', async () => {
       const query: SendProofRequest = {
         credentialDefId:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         connectionId: '1d50f39b-200a-460d-8198-c2dac92d813a',
         attributes: [
           {
@@ -311,7 +311,7 @@ describe('Proof Presentation Controller', () => {
         requestMessage: {
           '@type': 'https://didcomm.org/present-proof/1.0/request-presentation',
           '@id': 'caa5a5e8-8965-4457-8df0-a6db6e18617b',
-          comment: 'Gaia-x Test',
+          comment: 'test',
           'request_presentations~attach': [[Object]],
         },
         state: 'request-sent',
@@ -329,7 +329,7 @@ describe('Proof Presentation Controller', () => {
         participant_id: '662dc769-a4de-4c95-934c-f6dab8cf432c',
         connectionId: '1d50f39b-200a-460d-8198-c2dac92d813a',
         credential_def_id:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         schemaId: '',
         their_did: '',
         status: 'request-sent',
@@ -357,7 +357,7 @@ describe('Proof Presentation Controller', () => {
     it('should return an could not get agent details. please try again.', async () => {
       const query: SendProofRequest = {
         credentialDefId:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         connectionId: '1d50f39b-200a-460d-8198-c2dac92d813a',
         attributes: [
           {
@@ -439,7 +439,7 @@ describe('Proof Presentation Controller', () => {
     it('should return an presentation request send successfully', async () => {
       const query: SendProofRequest = {
         credentialDefId:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         connectionId: '1d50f39b-200a-460d-8198-c2dac92d813a',
         attributes: [
           {
@@ -482,7 +482,7 @@ describe('Proof Presentation Controller', () => {
         participant_id: '662dc769-a4de-4c95-934c-f6dab8cf432c',
         connectionId: '',
         credential_def_id:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         schemaId: '',
         their_did: '',
         status: 'request-sent',
@@ -512,7 +512,7 @@ describe('Proof Presentation Controller', () => {
     it('should return an could not get agent details. please try again.', async () => {
       const query: SendProofRequest = {
         credentialDefId:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         connectionId: '1d50f39b-200a-460d-8198-c2dac92d813a',
         attributes: [
           {
diff --git a/src/presentationProof/services/service.spec.ts b/src/presentationProof/services/service.spec.ts
index 1ed06a608d02bcf9606c45cadcf1ce92181c165d..91dce24427889e5554f8b9a932ab57a7038556d3 100644
--- a/src/presentationProof/services/service.spec.ts
+++ b/src/presentationProof/services/service.spec.ts
@@ -79,7 +79,7 @@ describe('ConnectionsService', () => {
         requestMessage: {
           '@type': 'https://didcomm.org/present-proof/1.0/request-presentation',
           '@id': '34881067-b9fc-49a4-814d-dee4668b4f90',
-          comment: 'Gaia-x Test',
+          comment: 'Test',
           'request_presentations~attach': [
             {
               '@id': 'libindy-request-presentation-0',
@@ -119,7 +119,7 @@ describe('ConnectionsService', () => {
             participant_id: '66398cf4-e14d-4d92-9dc4-b40a48ae97dd',
             connectionId: '',
             credential_def_id:
-              'S2YLfsoaWyePckkhLDqn4j:3:CL:183415:gaia-x test new test',
+              'S2YLfsoaWyePckkhLDqn4j:3:CL:183415:test new test',
             schemaId: '',
             their_did: '',
             status: 'request-sent',
@@ -132,7 +132,7 @@ describe('ConnectionsService', () => {
             participant_id: '66398cf4-e14d-4d92-9dc4-b40a48ae97dd',
             connectionId: 'b213f9bd-3774-40dd-8f1f-085950c10c30',
             credential_def_id:
-              'TP6CJhQ9xuPnTPpVu1kinR:3:CL:221970:gaia-x test sprint 4',
+              'TP6CJhQ9xuPnTPpVu1kinR:3:CL:221970:test sprint 4',
             schemaId: '',
             their_did: '',
             status: 'request-sent',
@@ -151,7 +151,7 @@ describe('ConnectionsService', () => {
             participant_id: '66398cf4-e14d-4d92-9dc4-b40a48ae97dd',
             connectionId: '',
             credential_def_id:
-              'S2YLfsoaWyePckkhLDqn4j:3:CL:183415:gaia-x test new test',
+              'S2YLfsoaWyePckkhLDqn4j:3:CL:183415:test new test',
             schemaId: '',
             their_did: '',
             status: 'request-sent',
@@ -164,7 +164,7 @@ describe('ConnectionsService', () => {
             participant_id: '66398cf4-e14d-4d92-9dc4-b40a48ae97dd',
             connectionId: 'b213f9bd-3774-40dd-8f1f-085950c10c30',
             credential_def_id:
-              'TP6CJhQ9xuPnTPpVu1kinR:3:CL:221970:gaia-x test sprint 4',
+              'TP6CJhQ9xuPnTPpVu1kinR:3:CL:221970:test sprint 4',
             schemaId: '',
             their_did: '',
             status: 'request-sent',
@@ -191,7 +191,7 @@ describe('ConnectionsService', () => {
           participant_id: '66398cf4-e14d-4d92-9dc4-b40a48ae97dd',
           connectionId: '',
           credential_def_id:
-            'S2YLfsoaWyePckkhLDqn4j:3:CL:183415:gaia-x test new test',
+            'S2YLfsoaWyePckkhLDqn4j:3:CL:183415:test new test',
           schemaId: '',
           status: 'request-sent',
           created_date: '2022-04-13T13:14:10.057Z',
@@ -205,7 +205,7 @@ describe('ConnectionsService', () => {
         participant_id: '662dc769-a4de-4c95-934c-f6dab8cf432c',
         connectionId: 'b6724f85-a633-43ee-9c1c-736eaccbb6f9',
         credential_def_id:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         schemaId: '',
         their_did: '',
         status: 'request-sent',
@@ -219,7 +219,7 @@ describe('ConnectionsService', () => {
         participant_id: '662dc769-a4de-4c95-934c-f6dab8cf432c',
         connectionId: 'b6724f85-a633-43ee-9c1c-736eaccbb6f9',
         credential_def_id:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         schemaId: '',
         their_did: '',
         status: 'request-sent',
@@ -239,7 +239,7 @@ describe('ConnectionsService', () => {
   describe('send presentation request function', () => {
     it('send presentation request', async () => {
       const serviceDto: SendProofRequest = {
-        comment: 'Gaia-x Test',
+        comment: 'Test',
         attributes: [
           {
             attribute_name: 'email',
@@ -253,7 +253,7 @@ describe('ConnectionsService', () => {
           },
         ],
         credentialDefId:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         connectionId: 'b6724f85-a633-43ee-9c1c-736eaccbb6f9',
         participantId: '',
         proofRecordId: '',
@@ -300,7 +300,7 @@ describe('ConnectionsService', () => {
         requestMessage: {
           '@type': 'https://didcomm.org/present-proof/1.0/request-presentation',
           '@id': 'cb5df550-36a4-4cba-8afc-3b89cedbc6bb',
-          comment: 'Gaia-x Test',
+          comment: 'Test',
           'request_presentations~attach': [[Object]],
         },
         state: 'request-sent',
@@ -329,7 +329,7 @@ describe('ConnectionsService', () => {
   describe('send out of band presentation request function', () => {
     it('send out of band presentation request', async () => {
       const serviceDto: SendProofRequest = {
-        comment: 'Gaia-x Test',
+        comment: 'Test',
         attributes: [
           {
             attribute_name: 'email',
@@ -343,7 +343,7 @@ describe('ConnectionsService', () => {
           },
         ],
         credentialDefId:
-          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:gaia-x principal member credential 0.2',
+          'Knwz4KG97ta6EnC5BT7uH3:3:CL:241901:principal member credential 0.2',
         connectionId: '',
         participantId: '662dc769-a4de-4c95-934c-f6dab8cf432c',
         proofRecordId: '',
@@ -377,7 +377,7 @@ describe('ConnectionsService', () => {
         requestMessage: {
           '@type': 'https://didcomm.org/present-proof/1.0/request-presentation',
           '@id': 'cb5df550-36a4-4cba-8afc-3b89cedbc6bb',
-          comment: 'Gaia-x Test',
+          comment: 'Test',
           'request_presentations~attach': [[Object]],
         },
         state: 'request-sent',
@@ -449,7 +449,7 @@ describe('ConnectionsService', () => {
         requestMessage: {
           '@type': 'https://didcomm.org/present-proof/1.0/request-presentation',
           '@id': 'cb5df550-36a4-4cba-8afc-3b89cedbc6bb',
-          comment: 'Gaia-x Test',
+          comment: 'Test',
           'request_presentations~attach': [[Object]],
         },
         state: 'request-sent',
diff --git a/swagger.json b/swagger.json
index 2e4faaff64fefb89767a88f78b5d276cfedd84d6..b0ef7cec7c6b85131ef1db895b2cea8e26ad4085 100644
--- a/swagger.json
+++ b/swagger.json
@@ -923,8 +923,8 @@
     }
   },
   "info": {
-    "title": "Gaia-x Proof Manager API",
-    "description": "API documentation for GAIA-X Proof Manager",
+    "title": "XFSC Proof Manager API",
+    "description": "API documentation for XFSC Proof Manager",
     "version": "1.0",
     "contact": {}
   },