diff --git a/financial-services-accelerator/accelerators/ob-apim/README.md b/financial-services-accelerator/accelerators/fs-apim/README.md
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/README.md
rename to financial-services-accelerator/accelerators/fs-apim/README.md
diff --git a/financial-services-accelerator/accelerators/ob-apim/bin/configure.ps1 b/financial-services-accelerator/accelerators/fs-apim/bin/configure.ps1
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/bin/configure.ps1
rename to financial-services-accelerator/accelerators/fs-apim/bin/configure.ps1
diff --git a/financial-services-accelerator/accelerators/ob-apim/bin/configure.sh b/financial-services-accelerator/accelerators/fs-apim/bin/configure.sh
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/bin/configure.sh
rename to financial-services-accelerator/accelerators/fs-apim/bin/configure.sh
diff --git a/financial-services-accelerator/accelerators/ob-apim/bin/merge.ps1 b/financial-services-accelerator/accelerators/fs-apim/bin/merge.ps1
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/bin/merge.ps1
rename to financial-services-accelerator/accelerators/fs-apim/bin/merge.ps1
diff --git a/financial-services-accelerator/accelerators/ob-apim/bin/merge.sh b/financial-services-accelerator/accelerators/fs-apim/bin/merge.sh
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/bin/merge.sh
rename to financial-services-accelerator/accelerators/fs-apim/bin/merge.sh
diff --git a/financial-services-accelerator/accelerators/ob-apim/carbon-home/repository/conf/financial-services.xml b/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/carbon-home/repository/conf/financial-services.xml
rename to financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml
diff --git a/financial-services-accelerator/accelerators/ob-apim/carbon-home/repository/deployment/server/synapse-configs/default/sequences/jsonConverter.xml b/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/deployment/server/synapse-configs/default/sequences/jsonConverter.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/carbon-home/repository/deployment/server/synapse-configs/default/sequences/jsonConverter.xml
rename to financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/deployment/server/synapse-configs/default/sequences/jsonConverter.xml
diff --git a/financial-services-accelerator/accelerators/ob-apim/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2 b/financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
rename to financial-services-accelerator/accelerators/fs-apim/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
diff --git a/financial-services-accelerator/accelerators/ob-apim/pom.xml b/financial-services-accelerator/accelerators/fs-apim/pom.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/pom.xml
rename to financial-services-accelerator/accelerators/fs-apim/pom.xml
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/conf/configure.properties b/financial-services-accelerator/accelerators/fs-apim/repository/conf/configure.properties
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/conf/configure.properties
rename to financial-services-accelerator/accelerators/fs-apim/repository/conf/configure.properties
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/Accounts/account-info-swagger.yaml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/Accounts/account-info-swagger.yaml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/Accounts/account-info-swagger.yaml
rename to financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/Accounts/account-info-swagger.yaml
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/Accounts/accounts-dynamic-endpoint-insequence.xml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/Accounts/accounts-dynamic-endpoint-insequence.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/Accounts/accounts-dynamic-endpoint-insequence.xml
rename to financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/Accounts/accounts-dynamic-endpoint-insequence.xml
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/ConfirmationOfFunds/funds-confirmation-openapi.yaml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/ConfirmationOfFunds/funds-confirmation-openapi.yaml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/ConfirmationOfFunds/funds-confirmation-openapi.yaml
rename to financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/ConfirmationOfFunds/funds-confirmation-openapi.yaml
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/DynamicClientRegistration/dcr-swagger.yaml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/DynamicClientRegistration/dcr-swagger.yaml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/DynamicClientRegistration/dcr-swagger.yaml
rename to financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/DynamicClientRegistration/dcr-swagger.yaml
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/Payments/payment-initiation-openapi.yaml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/Payments/payment-initiation-openapi.yaml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/Payments/payment-initiation-openapi.yaml
rename to financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/Payments/payment-initiation-openapi.yaml
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/SelfCarePortal/scp-insequence.xml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/SelfCarePortal/scp-insequence.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/SelfCarePortal/scp-insequence.xml
rename to financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/SelfCarePortal/scp-insequence.xml
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/SelfCarePortal/scp-swagger.yaml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/SelfCarePortal/scp-swagger.yaml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/SelfCarePortal/scp-swagger.yaml
rename to financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/SelfCarePortal/scp-swagger.yaml
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/VRP/VRP-swagger.yaml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/VRP/VRP-swagger.yaml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/VRP/VRP-swagger.yaml
rename to financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/VRP/VRP-swagger.yaml
diff --git a/financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/VRP/vrp-dynamic-endpoint-insequence-3.1.9.xml b/financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/VRP/vrp-dynamic-endpoint-insequence-3.1.9.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/repository/resources/apis/VRP/vrp-dynamic-endpoint-insequence-3.1.9.xml
rename to financial-services-accelerator/accelerators/fs-apim/repository/resources/apis/VRP/vrp-dynamic-endpoint-insequence-3.1.9.xml
diff --git a/financial-services-accelerator/accelerators/ob-apim/src/assembly/bin.xml b/financial-services-accelerator/accelerators/fs-apim/src/assembly/bin.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-apim/src/assembly/bin.xml
rename to financial-services-accelerator/accelerators/fs-apim/src/assembly/bin.xml
diff --git a/financial-services-accelerator/accelerators/ob-is/README.md b/financial-services-accelerator/accelerators/fs-is/README.md
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/README.md
rename to financial-services-accelerator/accelerators/fs-is/README.md
diff --git a/financial-services-accelerator/accelerators/ob-is/bin/configure.ps1 b/financial-services-accelerator/accelerators/fs-is/bin/configure.ps1
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/bin/configure.ps1
rename to financial-services-accelerator/accelerators/fs-is/bin/configure.ps1
diff --git a/financial-services-accelerator/accelerators/ob-is/bin/configure.sh b/financial-services-accelerator/accelerators/fs-is/bin/configure.sh
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/bin/configure.sh
rename to financial-services-accelerator/accelerators/fs-is/bin/configure.sh
diff --git a/financial-services-accelerator/accelerators/ob-is/bin/merge.ps1 b/financial-services-accelerator/accelerators/fs-is/bin/merge.ps1
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/bin/merge.ps1
rename to financial-services-accelerator/accelerators/fs-is/bin/merge.ps1
diff --git a/financial-services-accelerator/accelerators/ob-is/bin/merge.sh b/financial-services-accelerator/accelerators/fs-is/bin/merge.sh
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/bin/merge.sh
rename to financial-services-accelerator/accelerators/fs-is/bin/merge.sh
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/h2.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/h2.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/h2.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/h2.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/mssql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mssql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/mssql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mssql.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/mysql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mysql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/mysql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/mysql.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/oracle.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/oracle.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/oracle.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/oracle.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/postgresql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/postgresql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/account-metadata/postgresql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/account-metadata/postgresql.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/h2.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/h2.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/h2.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/h2.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/mssql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mssql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/mssql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mssql.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/mysql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mysql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/mysql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/mysql.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/oracle.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/oracle.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/oracle.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/oracle.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/postgresql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/postgresql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/consent/postgresql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/consent/postgresql.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/event-notifications/mssql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/mssql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/event-notifications/mssql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/mssql.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/event-notifications/mysql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/mysql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/event-notifications/mysql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/mysql.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/event-notifications/oracle.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/oracle.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/event-notifications/oracle.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/oracle.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/event-notifications/postgresql.sql b/financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/postgresql.sql
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/dbscripts/open-banking/event-notifications/postgresql.sql
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/dbscripts/open-banking/event-notifications/postgresql.sql
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/repository/conf/common.auth.script.js b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/common.auth.script.js
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/repository/conf/common.auth.script.js
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/common.auth.script.js
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/repository/conf/financial-services.xml b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/repository/conf/financial-services.xml
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/repository/conf/financial-services.xml
diff --git a/financial-services-accelerator/accelerators/ob-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2 b/financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
rename to financial-services-accelerator/accelerators/fs-is/carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
diff --git a/financial-services-accelerator/accelerators/ob-is/pom.xml b/financial-services-accelerator/accelerators/fs-is/pom.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/pom.xml
rename to financial-services-accelerator/accelerators/fs-is/pom.xml
diff --git a/financial-services-accelerator/accelerators/ob-is/repository/conf/configure.properties b/financial-services-accelerator/accelerators/fs-is/repository/conf/configure.properties
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/repository/conf/configure.properties
rename to financial-services-accelerator/accelerators/fs-is/repository/conf/configure.properties
diff --git a/financial-services-accelerator/accelerators/ob-is/src/assembly/bin.xml b/financial-services-accelerator/accelerators/fs-is/src/assembly/bin.xml
similarity index 100%
rename from financial-services-accelerator/accelerators/ob-is/src/assembly/bin.xml
rename to financial-services-accelerator/accelerators/fs-is/src/assembly/bin.xml