diff --git a/build.gradle b/build.gradle
index 5a1e7b7..2bb5f04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,19 +40,19 @@
 
 ext.versions = [
         frameworkservicestarter : '0.1.0-BUILD-SNAPSHOT',
-        mifosidentity           : '0.1.0-BUILD-SNAPSHOT',
-        mifosprovisioner        : '0.1.0-BUILD-SNAPSHOT',
-        mifosrhythm             : '0.1.0-BUILD-SNAPSHOT',
-        mifosoffice             : '0.1.0-BUILD-SNAPSHOT',
-        mifoscustomer           : '0.1.0-BUILD-SNAPSHOT',
-        mifosaccounting         : '0.1.0-BUILD-SNAPSHOT',
-        mifosportfolio          : '0.1.0-BUILD-SNAPSHOT',
-        mifosdeposit            : '0.1.0-BUILD-SNAPSHOT',
-        mifosteller             : '0.1.0-BUILD-SNAPSHOT',
-        mifosreporting          : '0.1.0-BUILD-SNAPSHOT',
+        fineractcnidentity      : '0.1.0-BUILD-SNAPSHOT',
+        fineractcnprovisioner   : '0.1.0-BUILD-SNAPSHOT',
+        fineractcnrhythm        : '0.1.0-BUILD-SNAPSHOT',
+        fineractcnoffice        : '0.1.0-BUILD-SNAPSHOT',
+        fineractcncustomer      : '0.1.0-BUILD-SNAPSHOT',
+        fineractcnaccounting    : '0.1.0-BUILD-SNAPSHOT',
+        fineractcnportfolio     : '0.1.0-BUILD-SNAPSHOT',
+        fineractcndeposit       : '0.1.0-BUILD-SNAPSHOT',
+        fineractcnteller        : '0.1.0-BUILD-SNAPSHOT',
+        fineractcnreporting     : '0.1.0-BUILD-SNAPSHOT',
         kuelapcheques           : '0.1.0-BUILD-SNAPSHOT',
-        mifospayroll            : '0.1.0-BUILD-SNAPSHOT',
-        mifosgroup              : '0.1.0-BUILD-SNAPSHOT',
+        fineractcnpayroll       : '0.1.0-BUILD-SNAPSHOT',
+        fineractcngroup         : '0.1.0-BUILD-SNAPSHOT',
         frameworkapi            : '0.1.0-BUILD-SNAPSHOT',
         frameworklang           : '0.1.0-BUILD-SNAPSHOT',
         frameworktest           : '0.1.0-BUILD-SNAPSHOT',
@@ -94,22 +94,22 @@
     compile(
             [group: 'com.google.code.findbugs', name: 'jsr305'],
             [group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka-server'],
-            [group: 'org.apache.fineract.cn.office', name: 'api', version: versions.mifosoffice],
-            [group: 'org.apache.fineract.cn.provisioner', name: 'api', version: versions.mifosprovisioner],
-            [group: 'org.apache.fineract.cn.identity', name: 'api', version: versions.mifosidentity],
-            [group: 'org.apache.fineract.cn.rhythm', name: 'api', version: versions.mifosrhythm],
-            [group: 'org.apache.fineract.cn.rhythm', name: 'spi', version: versions.mifosrhythm],
+            [group: 'org.apache.fineract.cn.office', name: 'api', version: versions.fineractcnoffice],
+            [group: 'org.apache.fineract.cn.provisioner', name: 'api', version: versions.fineractcnprovisioner],
+            [group: 'org.apache.fineract.cn.identity', name: 'api', version: versions.fineractcnidentity],
+            [group: 'org.apache.fineract.cn.rhythm', name: 'api', version: versions.fineractcnrhythm],
+            [group: 'org.apache.fineract.cn.rhythm', name: 'spi', version: versions.fineractcnrhythm],
 
-            [group: 'org.apache.fineract.cn.customer', name: 'api', version: versions.mifoscustomer],
-            [group: 'org.apache.fineract.cn.accounting', name: 'api', version: versions.mifosaccounting],
-            [group: 'org.apache.fineract.cn.accounting', name: 'importer', version: versions.mifosaccounting],
-            [group: 'org.apache.fineract.cn.portfolio', name: 'api', version: versions.mifosportfolio],
-            [group: 'org.apache.fineract.cn.deposit-account-management', name: 'api', version: versions.mifosdeposit],
-            [group: 'org.apache.fineract.cn.teller', name: 'api', version: versions.mifosteller],
-            [group: 'org.apache.fineract.cn.reporting', name: 'api', version: versions.mifosreporting],
+            [group: 'org.apache.fineract.cn.customer', name: 'api', version: versions.fineractcncustomer],
+            [group: 'org.apache.fineract.cn.accounting', name: 'api', version: versions.fineractcnaccounting],
+            [group: 'org.apache.fineract.cn.accounting', name: 'importer', version: versions.fineractcnaccounting],
+            [group: 'org.apache.fineract.cn.portfolio', name: 'api', version: versions.fineractcnportfolio],
+            [group: 'org.apache.fineract.cn.deposit-account-management', name: 'api', version: versions.fineractcndeposit],
+            [group: 'org.apache.fineract.cn.teller', name: 'api', version: versions.fineractcnteller],
+            [group: 'org.apache.fineract.cn.reporting', name: 'api', version: versions.fineractcnreporting],
             [group: 'org.apache.fineract.cn.cheques', name: 'api', version: versions.kuelapcheques],
-            [group: 'org.apache.fineract.cn.payroll', name: 'api', version: versions.mifospayroll],
-            [group: 'org.apache.fineract.cn.group', name: 'api', version: versions.mifosgroup],
+            [group: 'org.apache.fineract.cn.payroll', name: 'api', version: versions.fineractcnpayroll],
+            [group: 'org.apache.fineract.cn.group', name: 'api', version: versions.fineractcngroup],
 
             [group: 'org.apache.fineract.cn.anubis', name: 'api', version: versions.frameworkanubis],
             [group: 'org.apache.fineract.cn.anubis', name: 'test', version: versions.frameworkanubis],
diff --git a/scripts/windows/initial-setup.bat b/scripts/windows/initial-setup.bat
index 28fe21b..a5e0ddf 100644
--- a/scripts/windows/initial-setup.bat
+++ b/scripts/windows/initial-setup.bat
@@ -24,72 +24,72 @@
 cd core
 
 REM initialize lang
-git clone https://github.com/%githubAccount%/lang.git
+git clone https://github.com/%githubAccount%/fineract-cn-lang.git
 cd lang
-git remote add upstream https://github.com/mifosio/lang.git
+git remote add upstream https://github.com/apache/fineract-cn-lang.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze async
-git clone https://github.com/%githubAccount%/async.git
+git clone https://github.com/%githubAccount%/fineract-cn-async.git
 cd async
-git remote add upstream https://github.com/mifosio/async.git
+git remote add upstream https://github.com/apache/fineract-cn-async.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze cassandra
-git clone https://github.com/%githubAccount%/cassandra.git
+git clone https://github.com/%githubAccount%/fineract-cn-cassandra.git
 cd cassandra
-git remote add upstream https://github.com/mifosio/cassandra.git
+git remote add upstream https://github.com/apache/fineract-cn-cassandra.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze mariadb
-git clone https://github.com/%githubAccount%/mariadb.git
+git clone https://github.com/%githubAccount%/fineract-cn-mariadb.git
 cd mariadb
-git remote add upstream https://github.com/mifosio/mariadb.git
+git remote add upstream https://github.com/apache/fineract-cn-mariadb.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze data-jpa
-git clone https://github.com/%githubAccount%/data-jpa.git
+git clone https://github.com/%githubAccount%/fineract-cn-data-jpa.git
 cd data-jpa
-git remote add upstream https://github.com/mifosio/data-jpa.git
+git remote add upstream https://github.com/apache/fineract-cn-data-jpa.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze command
-git clone https://github.com/%githubAccount%/command.git
+git clone https://github.com/%githubAccount%/fineract-cn-command.git
 cd command
-git remote add upstream https://github.com/mifosio/command.git
+git remote add upstream https://github.com/apache/fineract-cn-command.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze api
-git clone https://github.com/%githubAccount%/api.git
+git clone https://github.com/%githubAccount%/fineract-cn-api.git
 cd api
-git remote add upstream https://github.com/mifosio/api.git
+git remote add upstream https://github.com/apache/fineract-cn-api.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze test
-git clone https://github.com/%githubAccount%/test.git
+git clone https://github.com/%githubAccount%/fineract-cn-test.git
 cd test
-git remote add upstream https://github.com/mifosio/test.git
+git remote add upstream https://github.com/apache/fineract-cn-test.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
@@ -112,9 +112,9 @@
 cd ..
 
 REM initialze crypto
-git clone https://github.com/%githubAccount%/crypto.git
+git clone https://github.com/%githubAccount%/fineract-cn-crypto.git
 cd crypto
-git remote add upstream https://github.com/mifosio/crypto.git
+git remote add upstream https://github.com/apache/fineract-cn-crypto.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
@@ -124,144 +124,144 @@
 cd ..
 
 REM initialze anubis
-git clone https://github.com/%githubAccount%/anubis.git
+git clone https://github.com/%githubAccount%/fineract-cn-anubis.git
 cd anubis
-git remote add upstream https://github.com/mifosio/anubis.git
+git remote add upstream https://github.com/apache/fineract-cn-anubis.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialize permitted-feign-client
-git clone https://github.com/%githubAccount%/permitted-feign-client.git
+git clone https://github.com/%githubAccount%/fineract-cn-permitted-feign-client.git
 cd permitted-feign-client
-git remote add upstream https://github.com/mifosio/permitted-feign-client.git
+git remote add upstream https://github.com/apache/fineract-cn-permitted-feign-client.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze provisioner
-git clone https://github.com/%githubAccount%/provisioner.git
+git clone https://github.com/%githubAccount%/fineract-cn-provisioner.git
 cd provisioner
-git remote add upstream https://github.com/mifosio/provisioner.git
+git remote add upstream https://github.com/apache/fineract-cn-provisioner.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze identity
-git clone https://github.com/%githubAccount%/identity.git
+git clone https://github.com/%githubAccount%/fineract-cn-identity.git
 cd identity
-git remote add upstream https://github.com/mifosio/identity.git
+git remote add upstream https://github.com/apache/fineract-cn-identity.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze rhythm
-git clone https://github.com/%githubAccount%/rhythm.git
+git clone https://github.com/%githubAccount%/fineract-cn-rhythm.git
 cd rhythm
-git remote add upstream https://github.com/mifosio/rhythm.git
+git remote add upstream https://github.com/apache/fineract-cn-rhythm.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze template
-git clone https://github.com/%githubAccount%/template.git
+git clone https://github.com/%githubAccount%/fineract-cn-template.git
 cd template
-git remote add upstream https://github.com/mifosio/template.git
+git remote add upstream https://github.com/apache/fineract-cn-template.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze office
-git clone https://github.com/%githubAccount%/office.git
+git clone https://github.com/%githubAccount%/fineract-cn-office.git
 cd office
-git remote add upstream https://github.com/mifosio/office.git
+git remote add upstream https://github.com/apache/fineract-cn-office.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze customer
-git clone https://github.com/%githubAccount%/customer.git
+git clone https://github.com/%githubAccount%/fineract-cn-customer.git
 cd customer
-git remote add upstream https://github.com/mifosio/customer.git
+git remote add upstream https://github.com/apache/fineract-cn-customer.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze group
-git clone https://github.com/%githubAccount%/group.git
+git clone https://github.com/%githubAccount%/fineract-cn-group.git
 cd group
-git remote add upstream https://github.com/mifosio/group.git
+git remote add upstream https://github.com/apache/fineract-cn-group.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze accounting
-git clone https://github.com/%githubAccount%/accounting.git
+git clone https://github.com/%githubAccount%/fineract-cn-accounting.git
 cd accounting
-git remote add upstream https://github.com/mifosio/accounting.git
+git remote add upstream https://github.com/apache/fineract-cn-accounting.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze portfolio
-git clone https://github.com/%githubAccount%/portfolio.git
+git clone https://github.com/%githubAccount%/fineract-cn-portfolio.git
 cd portfolio
-git remote add upstream https://github.com/mifosio/portfolio.git
+git remote add upstream https://github.com/apache/fineract-cn-portfolio.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze deposit-account-management
-git clone https://github.com/%githubAccount%/deposit-account-management.git
+git clone https://github.com/%githubAccount%/fineract-cn-deposit-account-management.git
 cd deposit-account-management
-git remote add upstream https://github.com/mifosio/deposit-account-management.git
+git remote add upstream https://github.com/apache/fineract-cn-deposit-account-management.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze cheques
-git clone https://github.com/%githubAccount%/cheques.git
+git clone https://github.com/%githubAccount%/fineract-cn-cheques.git
 cd cheques
-git remote add upstream https://github.com/mifosio/cheques.git
+git remote add upstream https://github.com/apache/fineract-cn-cheques.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze teller
-git clone https://github.com/%githubAccount%/teller.git
+git clone https://github.com/%githubAccount%/fineract-cn-teller.git
 cd teller
-git remote add upstream https://github.com/mifosio/teller.git
+git remote add upstream https://github.com/apache/fineract-cn-teller.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze reporting
-git clone https://github.com/%githubAccount%/reporting.git
+git clone https://github.com/%githubAccount%/fineract-cn-reporting.git
 cd reporting
-git remote add upstream https://github.com/mifosio/reporting.git
+git remote add upstream https://github.com/apache/fineract-cn-reporting.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze payroll
-git clone https://github.com/%githubAccount%/payroll.git
+git clone https://github.com/%githubAccount%/fineract-cn-payroll.git
 cd payroll
-git remote add upstream https://github.com/mifosio/payroll.git
+git remote add upstream https://github.com/apache/fineract-cn-payroll.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
@@ -271,56 +271,38 @@
 cd integration-tests
 
 REM initialze service-starter
-git clone https://github.com/%githubAccount%/service-starter.git
+git clone https://github.com/%githubAccount%/fineract-cn-service-starter.git
 cd service-starter
-git remote add upstream https://github.com/mifosio/service-starter.git
+git remote add upstream https://github.com/apache/fineract-cn-service-starter.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze default-setup
-git clone https://github.com/%githubAccount%/default-setup.git
+git clone https://github.com/%githubAccount%/fineract-cn-default-setup.git
 cd default-setup
-git remote add upstream https://github.com/mifosio/default-setup.git
+git remote add upstream https://github.com/apache/fineract-cn-default-setup.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
 REM initialze demo-server
-git clone https://github.com/%githubAccount%/demo-server.git
+git clone https://github.com/%githubAccount%/fineract-cn-demo-server.git
 cd demo-server
-git remote add upstream https://github.com/mifosio/demo-server.git
+git remote add upstream https://github.com/apache/fineract-cn-demo-server.git
 git checkout develop
 CALL gradlew publishToMavenLocal
 TIMEOUT /T 5
 cd ..
 
-REM initialze test-provisioner-identity-organization
-git clone https://github.com/%githubAccount%/test-provisioner-identity-organization.git
-cd test-provisioner-identity-organization
-git remote add upstream https://github.com/mifosio/test-provisioner-identity-organization.git
-git checkout develop
-CALL gradlew build
-TIMEOUT /T 5
-cd ..
-
-REM initialze test-accounting-portfolio
-git clone https://github.com/%githubAccount%/test-accounting-portfolio.git
-cd test-accounting-portfolio
-git remote add upstream https://github.com/mifosio/test-accounting-portfolio.git
-git checkout develop
-CALL gradlew build
-TIMEOUT /T 5
-cd ..
-
 cd ..
 
 REM initialze Web App
-git clone https://github.com/%githubAccount%/fims-web-app.git
+git clone https://github.com/%githubAccount%/fineract-cn-fims-web-app.git
 cd fims-web-app
-git remote add upstream https://github.com/mifosio/fims-web-app.git
+git remote add upstream https://github.com/apache/fineract-cn-fims-web-app.git
 git checkout develop
 CALL npm i
 TIMEOUT /T 5