diff --git a/config/mifosxdev-eclipse-preferences.epf b/config/fineractdev-eclipse-preferences.epf
similarity index 100%
rename from config/mifosxdev-eclipse-preferences.epf
rename to config/fineractdev-eclipse-preferences.epf
diff --git a/fineract-provider/src/main/dist/How to run MifosX.txt b/fineract-provider/src/main/dist/How to run Fineract.txt
similarity index 100%
rename from fineract-provider/src/main/dist/How to run MifosX.txt
rename to fineract-provider/src/main/dist/How to run Fineract.txt
diff --git a/fineract-provider/src/main/dist/runmifosx.bat b/fineract-provider/src/main/dist/runfineract.bat
similarity index 100%
rename from fineract-provider/src/main/dist/runmifosx.bat
rename to fineract-provider/src/main/dist/runfineract.bat
diff --git a/fineract-provider/src/main/dist/runmifosx.sh b/fineract-provider/src/main/dist/runfineract.sh
similarity index 100%
rename from fineract-provider/src/main/dist/runmifosx.sh
rename to fineract-provider/src/main/dist/runfineract.sh
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/MifosPlatformTenant.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/FineractPlatformTenant.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/MifosPlatformTenant.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/FineractPlatformTenant.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/MifosPlatformTenantConnection.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/FineractPlatformTenantConnection.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/MifosPlatformTenantConnection.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/FineractPlatformTenantConnection.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/MifosEntityAccessConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/FineractEntityAccessConstants.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/MifosEntityAccessConstants.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/FineractEntityAccessConstants.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/MifosEntityApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResource.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/MifosEntityApiResource.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResource.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/MifosEntityApiResourceConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResourceConstants.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/MifosEntityApiResourceConstants.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResourceConstants.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/MifosEntityAccessData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/FineractEntityAccessData.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/MifosEntityAccessData.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/FineractEntityAccessData.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/MifosEntityDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/FineractEntityDataValidator.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/MifosEntityDataValidator.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/FineractEntityDataValidator.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/MifosEntityRelationData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/FineractEntityRelationData.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/MifosEntityRelationData.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/FineractEntityRelationData.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/MifosEntityToEntityMappingData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/FineractEntityToEntityMappingData.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/MifosEntityToEntityMappingData.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/data/FineractEntityToEntityMappingData.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntity.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntity.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntity.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntity.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityAccess.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccess.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityAccess.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccess.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityAccessRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessRepository.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityAccessRepository.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessRepository.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityAccessRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessRepositoryWrapper.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityAccessRepositoryWrapper.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessRepositoryWrapper.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityAccessType.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessType.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityAccessType.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessType.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityRelation.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelation.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityRelation.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelation.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityRelationRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepository.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityRelationRepository.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepository.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityRelationRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepositoryWrapper.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityRelationRepositoryWrapper.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepositoryWrapper.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityToEntityMapping.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMapping.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityToEntityMapping.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMapping.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityToEntityMappingRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMappingRepository.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityToEntityMappingRepository.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMappingRepository.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityToEntityMappingRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMappingRepositoryWrapper.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityToEntityMappingRepositoryWrapper.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMappingRepositoryWrapper.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityType.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityType.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/MifosEntityType.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityType.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/MifosEntityAccessConfigurationException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/FineractEntityAccessConfigurationException.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/MifosEntityAccessConfigurationException.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/FineractEntityAccessConfigurationException.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/MifosEntityAccessNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/FineractEntityAccessNotFoundException.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/MifosEntityAccessNotFoundException.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/FineractEntityAccessNotFoundException.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/MifosEntityToEntityMappingDateException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/FineractEntityToEntityMappingDateException.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/MifosEntityToEntityMappingDateException.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/FineractEntityToEntityMappingDateException.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/MifosEntityToEntityMappingNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/FineractEntityToEntityMappingNotFoundException.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/MifosEntityToEntityMappingNotFoundException.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/FineractEntityToEntityMappingNotFoundException.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessReadService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadService.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessReadService.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadService.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessReadServiceImpl.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessUtil.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessUtil.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessUtil.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessUtil.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessWriteService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteService.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessWriteService.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteService.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessWriteServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/MifosEntityAccessWriteServiceImpl.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/listener/MifosHookListener.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/listener/FineractHookListener.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/listener/MifosHookListener.java
rename to fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/listener/FineractHookListener.java
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/MifosStyleLoanRepaymentScheduleTransactionProcessor.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/FineractStyleLoanRepaymentScheduleTransactionProcessor.java
similarity index 100%
rename from fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/MifosStyleLoanRepaymentScheduleTransactionProcessor.java
rename to fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/FineractStyleLoanRepaymentScheduleTransactionProcessor.java