update java code due to table renames.

mifosng-provider/src/main/java/org/mifosng/platform/ReadExtraDataAndReportingServiceImpl.java

@@ -575,7 +575,7 @@ public class ReadExtraDataAndReportingServiceImpl implements
 	}
 
 	private String getFullDatasetName(final String type, final String set) {
-		return type + "_extra_" + set;
+		return type + "_x_" + set;
 	}
 
 	private static String replace(String str, String pattern, String replace) {

mifosng-provider/src/main/java/org/mifosng/platform/charge/domain/Charge.java

@@ -11,7 +11,7 @@ import javax.persistence.UniqueConstraint;
 import java.math.BigDecimal;
 
 @Entity
-@Table(name = "o_charge", uniqueConstraints = {
+@Table(name = "m_charge", uniqueConstraints = {
     @UniqueConstraint(columnNames = {"name"}, name = "name")
 })
 public class Charge extends AbstractAuditableCustom<AppUser, Long> {

mifosng-provider/src/main/java/org/mifosng/platform/charge/service/ChargeReadPlatformServiceImpl.java

@@ -58,7 +58,7 @@ public class ChargeReadPlatformServiceImpl implements ChargeReadPlatformService
     private static final class ChargeMapper implements RowMapper<ChargeData> {
 
         public String chargeSchema(){
-            return "c.id as id, c.name as name, c.amount as amount from o_charge c ";
+            return "c.id as id, c.name as name, c.amount as amount from m_charge c ";
         }
 
         @Override

mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Client.java

@@ -18,7 +18,7 @@ import org.mifosng.platform.organisation.domain.Office;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "portfolio_client")
+@Table(name = "m_client")
 public class Client extends AbstractAuditableCustom<AppUser, Long> {
 
     @SuppressWarnings("unused")

mifosng-provider/src/main/java/org/mifosng/platform/client/domain/Note.java

@@ -12,7 +12,7 @@ import org.mifosng.platform.loan.domain.LoanTransaction;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "portfolio_note")
+@Table(name = "m_note")
 public class Note extends AbstractAuditableCustom<AppUser, Long> {
 
 	@ManyToOne

mifosng-provider/src/main/java/org/mifosng/platform/client/service/ClientReadPlatformServiceImpl.java

@@ -132,7 +132,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
 
 		public String clientSchema() {
 			return "c.office_id as officeId, c.id as id, c.firstname as firstname, c.lastname as lastname, c.external_id as externalId, " +
-					"c.joining_date as joinedDate from portfolio_client c";
+					"c.joining_date as joinedDate from m_client c";
 		}
 
 		@Override
@@ -171,7 +171,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
     private static final class ClientLookupMapper implements RowMapper<ClientLookup>{
 
         public String clientLookupSchema() {
-            return "c.id as id, c.firstname as firstname, c.lastname as lastname from portfolio_client c";
+            return "c.id as id, c.firstname as firstname, c.lastname as lastname from m_client c";
         }
 
         @Override
@@ -243,8 +243,8 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
 			loanAccountSummary
 					.append("l.product_id as productId, lp.name as productName,")
 					.append("l.loan_status_id as statusId ")
-					.append("from portfolio_loan l ")
-					.append("LEFT JOIN portfolio_product_loan AS lp ON lp.id = l.product_id ");
+					.append("from m_loan l ")
+					.append("LEFT JOIN m_product_loan AS lp ON lp.id = l.product_id ");
 
 			return loanAccountSummary.toString();
 		}
@@ -321,7 +321,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
 		public String schema() {
 			return "n.id as id, n.client_id as clientId, n.loan_id as loanId, n.loan_transaction_id as transactionId, n.note_type_enum as noteTypeEnum, n.note as note, "
 					+ "n.created_date as createdDate, n.createdby_id as createdById, n.lastmodified_date as lastModifiedDate, n.lastmodifiedby_id as lastModifiedById"
-					+ " from portfolio_note n";
+					+ " from m_note n";
 		}
 
 		@Override

mifosng-provider/src/main/java/org/mifosng/platform/currency/domain/ApplicationCurrency.java

@@ -7,7 +7,7 @@ import javax.persistence.Table;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
 @Entity
-@Table(name = "ref_currency")
+@Table(name = "m_currency")
 public class ApplicationCurrency extends AbstractPersistable<Long> {
 
     @Column(name = "code", nullable = false, length=3)

mifosng-provider/src/main/java/org/mifosng/platform/currency/service/CurrencyReadPlatformServiceImpl.java

@@ -30,7 +30,7 @@ public class CurrencyReadPlatformServiceImpl implements CurrencyReadPlatformServ
 
 		context.authenticatedUser();
 
-		String sql = "select c.code as code, c.name as name, c.decimal_places as decimalPlaces, c.display_symbol as displaySymbol, c.internationalized_name_code as nameCode from org_organisation_currency c";
+		String sql = "select c.code as code, c.name as name, c.decimal_places as decimalPlaces, c.display_symbol as displaySymbol, c.internationalized_name_code as nameCode from m_organisation_currency c";
 
 		RowMapper<CurrencyData> rm = new CurrencyMapper();
 
@@ -40,7 +40,7 @@ public class CurrencyReadPlatformServiceImpl implements CurrencyReadPlatformServ
 	@Override
 	public List<CurrencyData> retrieveAllPlatformCurrencies() {
 
-		String sql = "select c.code as code, c.name as name, c.decimal_places as decimalPlaces, c.display_symbol as displaySymbol, c.internationalized_name_code as nameCode from ref_currency c";
+		String sql = "select c.code as code, c.name as name, c.decimal_places as decimalPlaces, c.display_symbol as displaySymbol, c.internationalized_name_code as nameCode from m_currency c";
 
 		RowMapper<CurrencyData> rm = new CurrencyMapper();
 

mifosng-provider/src/main/java/org/mifosng/platform/fund/domain/Fund.java

@@ -11,7 +11,7 @@ import org.mifosng.platform.infrastructure.AbstractAuditableCustom;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "org_fund", uniqueConstraints={
+@Table(name = "m_fund", uniqueConstraints={
 		@UniqueConstraint(columnNames = {"name"}, name="fund_name_org"), 
 		@UniqueConstraint(columnNames = {"external_id"}, name="fund_externalid_org")
 })

mifosng-provider/src/main/java/org/mifosng/platform/fund/service/FundReadPlatformServiceImpl.java

@@ -30,7 +30,7 @@ public class FundReadPlatformServiceImpl implements FundReadPlatformService {
 	private static final class FundMapper implements RowMapper<FundData> {
 
 		public String schema() {
-			return " f.id as id, f.name as name, f.external_id as externalId from org_fund f ";
+			return " f.id as id, f.name as name, f.external_id as externalId from m_fund f ";
 		}
 
 		@Override

mifosng-provider/src/main/java/org/mifosng/platform/group/domain/Group.java

@@ -17,7 +17,7 @@ import org.mifosng.platform.infrastructure.AbstractAuditableCustom;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "portfolio_group")
+@Table(name = "m_group")
 public class Group extends AbstractAuditableCustom<AppUser, Long> {
 
     @Column(name = "name", length = 100, unique = true)
@@ -30,7 +30,7 @@ public class Group extends AbstractAuditableCustom<AppUser, Long> {
     private boolean deleted = false;
     
     @ManyToMany
-    @JoinTable(name = "portfolio_group_client",
+    @JoinTable(name = "m_group_client",
                joinColumns = @JoinColumn(name = "group_id"),
                inverseJoinColumns = @JoinColumn(name = "client_id"))
     private Set<Client> clientMembers;

mifosng-provider/src/main/java/org/mifosng/platform/group/service/GroupReadPlatformServiceImpl.java

@@ -76,7 +76,7 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService {
     private static final class GroupMapper implements RowMapper<GroupData> {
 
         public String groupSchema() {
-            return "g.id as id, g.external_id as externalId, g.name as name from portfolio_group g";
+            return "g.id as id, g.external_id as externalId, g.name as name from m_group g";
         }
 
         @Override
@@ -106,7 +106,7 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService {
     private static final class ClientMemberSummaryDataMapper implements RowMapper<ClientLookup> {
 
         public String clientMemberSummarySchema() {
-            return "cm.id, cm.firstname, cm.lastname from portfolio_client cm INNER JOIN portfolio_group_client pgc ON pgc.client_id = cm.id";
+            return "cm.id, cm.firstname, cm.lastname from m_client cm INNER JOIN m_group_client pgc ON pgc.client_id = cm.id";
         }
 
         @Override

mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java

@@ -38,7 +38,7 @@ import org.mifosng.platform.infrastructure.AbstractAuditableCustom;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "portfolio_loan", uniqueConstraints = @UniqueConstraint(columnNames = { "external_id" }))
+@Table(name = "m_loan", uniqueConstraints = @UniqueConstraint(columnNames = { "external_id" }))
 public class Loan extends AbstractAuditableCustom<AppUser, Long> {
 
 	@ManyToOne

mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanProduct.java

@@ -26,7 +26,7 @@ import org.mifosng.platform.user.domain.AppUser;
  * They allow for constraints to be added at product level.
  */
 @Entity
-@Table(name = "portfolio_product_loan")
+@Table(name = "m_product_loan")
 public class LoanProduct extends AbstractAuditableCustom<AppUser, Long> {
 
 	@ManyToOne

mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanRepaymentScheduleInstallment.java

@@ -18,7 +18,7 @@ import org.mifosng.platform.infrastructure.AbstractAuditableCustom;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "portfolio_loan_repayment_schedule")
+@Table(name = "m_loan_repayment_schedule")
 public class LoanRepaymentScheduleInstallment extends AbstractAuditableCustom<AppUser, Long> {
 
     @ManyToOne(optional = false)

mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/LoanTransaction.java

@@ -27,7 +27,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * Disbursements, Repayments, Waivers, Write-off etc
  */
 @Entity
-@Table(name = "portfolio_loan_transaction")
+@Table(name = "m_loan_transaction")
 public class LoanTransaction extends AbstractAuditableCustom<AppUser, Long> {
 
     @ManyToOne(optional = false)

mifosng-provider/src/main/java/org/mifosng/platform/loan/service/LoanReadPlatformServiceImpl.java

@@ -414,10 +414,10 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
 					+ " l.amortization_method_enum as amortizationType, l.interest_method_enum as interestType, l.interest_calculated_in_period_enum as interestCalculationPeriodType,"
 					+ " l.loan_status_id as lifeCycleStatusId, "
 					+ " l.currency_code as currencyCode, l.currency_digits as currencyDigits, rc.`name` as currencyName, rc.display_symbol as currencyDisplaySymbol, rc.internationalized_name_code as currencyNameCode"
-					+ " from portfolio_loan l"
-					+ " join portfolio_product_loan lp on lp.id = l.product_id"
-					+ " join ref_currency rc on rc.`code` = l.currency_code"
-					+ " left join org_fund f on f.id = l.fund_id";
+					+ " from m_loan l"
+					+ " join m_product_loan lp on lp.id = l.product_id"
+					+ " join m_currency rc on rc.`code` = l.currency_code"
+					+ " left join m_fund f on f.id = l.fund_id";
 		}
 
 		@Override
@@ -531,9 +531,9 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
 					+ " ls.principal_amount as principal, ls.principal_completed_derived as principalPaid, "
 					+ " ls.interest_amount as interest, ls.interest_completed_derived as interestPaid, ls.interest_waived_derived as interestWaived, "
 					+ " l.currency_code as currencyCode, l.currency_digits as currencyDigits, rc.`name` as currencyName, rc.display_symbol as currencyDisplaySymbol, rc.internationalized_name_code as currencyNameCode "
-					+ " from portfolio_loan l "
-					+ " join portfolio_loan_repayment_schedule ls on ls.loan_id = l.id "
-					+ " join ref_currency rc on rc.`code` = l.currency_code ";
+					+ " from m_loan l "
+					+ " join m_loan_repayment_schedule ls on ls.loan_id = l.id "
+					+ " join m_currency rc on rc.`code` = l.currency_code ";
 		}
 
 		@Override
@@ -592,9 +592,9 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService {
 
 			return " tr.id as id, tr.transaction_type_enum as transactionType, tr.transaction_date as `date`, tr.amount as total, "
 					+ " l.currency_code as currencyCode, l.currency_digits as currencyDigits, rc.`name` as currencyName, rc.display_symbol as currencyDisplaySymbol, rc.internationalized_name_code as currencyNameCode "
-					+ " from portfolio_loan l "
-					+ " join portfolio_loan_transaction tr on tr.loan_id = l.id"
-					+ " join ref_currency rc on rc.`code` = l.currency_code ";
+					+ " from m_loan l "
+					+ " join m_transaction tr on tr.loan_id = l.id"
+					+ " join m_currency rc on rc.`code` = l.currency_code ";
 		}
 
 		@Override

mifosng-provider/src/main/java/org/mifosng/platform/loanproduct/service/LoanProductReadPlatformServiceImpl.java

@@ -142,10 +142,10 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo
 					+ "lp.amortization_method_enum as amortizationMethod, lp.arrearstolerance_amount as tolerance, "
 					+ "lp.created_date as createdon, lp.lastmodified_date as modifiedon, "
 					+ "curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, curr.display_symbol as currencyDisplaySymbol "
-					+ " from portfolio_product_loan lp "
-					+ " left join org_fund f on f.id = lp.fund_id"
+					+ " from m_product_loan lp "
+					+ " left join m_fund f on f.id = lp.fund_id"
 					+ " left join ref_loan_transaction_processing_strategy ltps on ltps.id = lp.loan_transaction_strategy_id"
-					+ " join ref_currency curr on curr.code = lp.currency_code";
+					+ " join m_currency curr on curr.code = lp.currency_code";
 		}
 
 		@Override
@@ -224,7 +224,7 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo
 			RowMapper<LoanProductLookup> {
 
 		public String loanProductLookupSchema() {
-			return "lp.id as id, lp.name as name from portfolio_product_loan lp";
+			return "lp.id as id, lp.name as name from m_product_loan lp";
 		}
 
 		@Override

mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/Office.java

@@ -24,7 +24,7 @@ import org.mifosng.platform.infrastructure.AbstractAuditableCustom;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "org_office", uniqueConstraints={
+@Table(name = "m_office", uniqueConstraints={
 												@UniqueConstraint(columnNames = {"name"}, name="name_org"), 
 												@UniqueConstraint(columnNames = {"external_id"}, name="externalid_org")
 })

mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OfficeTransaction.java

@@ -20,7 +20,7 @@ import org.mifosng.platform.infrastructure.AbstractAuditableCustom;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "portfolio_office_transaction")
+@Table(name = "m_office_transaction")
 public class OfficeTransaction extends AbstractAuditableCustom<AppUser, Long> {
 
 	@SuppressWarnings("unused")

mifosng-provider/src/main/java/org/mifosng/platform/organisation/domain/OrganisationCurrency.java

@@ -8,7 +8,7 @@ import org.mifosng.platform.infrastructure.AbstractAuditableCustom;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "org_organisation_currency")
+@Table(name = "m_organisation_currency")
 public class OrganisationCurrency extends AbstractAuditableCustom<AppUser, Long> {
 
     @SuppressWarnings("unused")

mifosng-provider/src/main/java/org/mifosng/platform/organisation/service/OfficeReadPlatformServiceImpl.java

@@ -46,7 +46,7 @@ public class OfficeReadPlatformServiceImpl implements OfficeReadPlatformService
 			return " o.id as id, o.name as name, "
 					+ nameDecoratedBaseOnHierarchy
 					+ " as nameDecorated, o.external_id as externalId, o.opening_date as openingDate, o.hierarchy as hierarchy, parent.id as parentId, parent.name as parentName "
-					+ "from org_office o LEFT JOIN org_office AS parent ON parent.id = o.parent_id ";
+					+ "from m_office o LEFT JOIN m_office AS parent ON parent.id = o.parent_id ";
 		}
 
 		@Override
@@ -72,7 +72,7 @@ public class OfficeReadPlatformServiceImpl implements OfficeReadPlatformService
 
 		public String officeLookupSchema() {
 			return " o.id as id, " + nameDecoratedBaseOnHierarchy
-					+ " as nameDecorated, o.name as name from org_office o ";
+					+ " as nameDecorated, o.name as name from m_office o ";
 		}
 
 		@Override

mifosng-provider/src/main/java/org/mifosng/platform/saving/domain/DepositAccount.java

@@ -26,7 +26,7 @@ import org.mifosng.platform.savingproduct.domain.DepositProduct;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "portfolio_deposit_account", uniqueConstraints = @UniqueConstraint(name="deposit_acc_external_id", columnNames = { "external_id" }))
+@Table(name = "m_deposit_account", uniqueConstraints = @UniqueConstraint(name="deposit_acc_external_id", columnNames = { "external_id" }))
 public class DepositAccount extends AbstractAuditableCustom<AppUser, Long> {
 	
 	@SuppressWarnings("unused")

mifosng-provider/src/main/java/org/mifosng/platform/saving/service/DepositAccountReadPlatformServiceImpl.java

@@ -128,10 +128,10 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead
 				+  " da.created_date as createdon, da.lastmodified_date as modifiedon, "
 				+  " c.firstname as firstname, c.lastname as lastname, pd.name as productName,"
 				+  " curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, curr.display_symbol as currencyDisplaySymbol" 
-				+  " from portfolio_deposit_account da " 
-				+  " join ref_currency curr on curr.code = da.currency_code " 
-				+  " join portfolio_client c on c.id = da.client_id " 
-				+  " join portfolio_product_deposit pd on pd.id = da.product_id";
+				+  " from m_deposit_account da " 
+				+  " join m_currency curr on curr.code = da.currency_code " 
+				+  " join m_client c on c.id = da.client_id " 
+				+  " join m_product_deposit pd on pd.id = da.product_id";
 		}
 
 		@Override

mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/DepositProduct.java

@@ -17,7 +17,7 @@ import org.mifosng.platform.loan.domain.PeriodFrequencyType;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "portfolio_product_deposit", uniqueConstraints={
+@Table(name = "m_product_deposit", uniqueConstraints={
 												@UniqueConstraint(columnNames = {"name"}, name="name_deposit_product"), 
 												@UniqueConstraint(columnNames = {"external_id"}, name="externalid_deposit_product")
 })

mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/domain/SavingProduct.java

@@ -14,7 +14,7 @@ import org.mifosng.platform.infrastructure.AbstractAuditableCustom;
 import org.mifosng.platform.user.domain.AppUser;
 
 @Entity
-@Table(name = "portfolio_product_savings")
+@Table(name = "m_product_savings")
 public class SavingProduct extends AbstractAuditableCustom<AppUser, Long> {
 	
 	@Column(name = "name", nullable = false)

mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/DepositProductReadPlatformServiceImpl.java

@@ -75,7 +75,7 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead
 					"dp.maturity_default_interest_rate as maturityDefaultInterestRate, " +
 					"dp.maturity_min_interest_rate as maturityMinInterestRate, dp.maturity_max_interest_rate as maturityMaxInterestRate, dp.is_renewal_allowed as canRenew, dp.is_preclosure_allowed as canPreClose, dp.pre_closure_interest_rate as preClosureInterestRate, " +
 					"curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, curr.display_symbol as currencyDisplaySymbol " +
-					"from portfolio_product_deposit dp join ref_currency curr on curr.code = dp.currency_code ";
+					"from m_product_deposit dp join m_currency curr on curr.code = dp.currency_code ";
 		}
 
 		@Override
@@ -121,7 +121,7 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead
 	private static final class DepositProductLookupMapper implements RowMapper<DepositProductLookup> {
 
 		public String depositProductLookupSchema() {
-			return "dp.id as id, dp.name as name from portfolio_product_deposit dp";
+			return "dp.id as id, dp.name as name from m_product_deposit dp";
 		}
 
 		@Override

mifosng-provider/src/main/java/org/mifosng/platform/savingproduct/service/SavingProductReadPlatformServiceImpl.java

@@ -94,7 +94,7 @@ public class SavingProductReadPlatformServiceImpl implements
 		public String savingProductSchema(){
 			return "sp.id as id,sp.name as name, sp.description as description,sp.currency_code as currencyCode, sp.currency_digits as currencyDigits,sp.interest_rate as interestRate,sp.minimum_balance as minimumBalance,sp.maximum_balance as maximumBalance,sp.created_date as createdon, sp.lastmodified_date as modifiedon, "
 				+  "curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, curr.display_symbol as currencyDisplaySymbol" 
-				+  "  from portfolio_product_savings sp join ref_currency curr on curr.code = sp.currency_code";
+				+  "  from m_product_savings sp join m_currency curr on curr.code = sp.currency_code";
 		}
 
 		@Override
@@ -128,7 +128,7 @@ public class SavingProductReadPlatformServiceImpl implements
 			RowMapper<SavingProductLookup> {
 
 		public String savingProductLookupSchema() {
-			return "sp.id as id, sp.name as name from portfolio_product_savings sp";
+			return "sp.id as id, sp.name as name from m_product_savings sp";
 		}
 
 		@Override

mifosng-provider/src/main/java/org/mifosng/platform/user/domain/AppUser.java

@@ -25,7 +25,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 
 @Entity
-@Table(name = "admin_appuser", uniqueConstraints=@UniqueConstraint(columnNames = {"username"}, name="username_org"))
+@Table(name = "m_appuser", uniqueConstraints=@UniqueConstraint(columnNames = {"username"}, name="username_org"))
 public class AppUser extends AbstractAuditableCustom<AppUser, Long> implements PlatformUser {
 
     @Column(name = "email", nullable=false, length=100)
@@ -63,7 +63,7 @@ public class AppUser extends AbstractAuditableCustom<AppUser, Long> implements P
     private Office office;
 
     @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "admin_appuser_role", joinColumns = @JoinColumn(name = "appuser_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
+    @JoinTable(name = "m_appuser_role", joinColumns = @JoinColumn(name = "appuser_id"), inverseJoinColumns = @JoinColumn(name = "role_id"))
     private Set<Role>    roles;
     
 

mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java

@@ -10,7 +10,7 @@ import org.mifosng.platform.api.data.PermissionData;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
 @Entity
-@Table(name = "admin_permission")
+@Table(name = "m_permission")
 public class Permission extends AbstractPersistable<Long> {
 
     @Column(name = "code", nullable = false, length=100)

mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Role.java

@@ -20,7 +20,7 @@ import org.mifosng.platform.api.data.RoleData;
 import org.mifosng.platform.infrastructure.AbstractAuditableCustom;
 
 @Entity
-@Table(name = "admin_role")
+@Table(name = "m_role")
 public class Role extends AbstractAuditableCustom<AppUser, Long> {
 
     @Column(name="name", nullable=false, length=100)
@@ -30,7 +30,7 @@ public class Role extends AbstractAuditableCustom<AppUser, Long> {
     private String          description;
 
     @ManyToMany(fetch = FetchType.EAGER)
-    @JoinTable(name = "admin_role_permission", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "permission_id"))
+    @JoinTable(name = "m_role_permission", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "permission_id"))
     private Set<Permission> permissions;
 
     protected Role() {

mifosng-provider/src/main/java/org/mifosng/platform/user/service/AppUserReadPlatformServiceImpl.java

@@ -147,7 +147,7 @@ public class AppUserReadPlatformServiceImpl implements AppUserReadPlatformServic
 		}
 
 		public String schema() {
-			return " u.id as id, u.username as username, u.firstname as firstname, u.lastname as lastname, u.email as email, u.office_id as officeId from admin_appuser u ";
+			return " u.id as id, u.username as username, u.firstname as firstname, u.lastname as lastname, u.email as email, u.office_id as officeId from m_appuser u ";
 		}
 
 		private String fromOfficeList(final List<OfficeData> officeList, final Long officeId) {

mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java

@@ -51,7 +51,7 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform
 		}
 
 		public String schema() {
-			return " p.id as id, p.default_name as name, p.default_description as description, p.code as code, p.group_enum as groupType from admin_permission p ";
+			return " p.id as id, p.default_name as name, p.default_description as description, p.code as code, p.group_enum as groupType from m_permission p ";
 		}
 	}
 }

mifosng-provider/src/main/java/org/mifosng/platform/user/service/RoleReadPlatformServiceImpl.java

@@ -65,7 +65,7 @@ public class RoleReadPlatformServiceImpl implements RoleReadPlatformService {
 		}
 
 		public String schema() {
-			return " r.id as id, r.name as name, r.description as description from admin_role r";
+			return " r.id as id, r.name as name, r.description as description from m_role r";
 		}
 	}
 }