diff --git a/api/src/main/resources/liquibase-update-to-2.2.xml b/api/src/main/resources/liquibase-update-to-2.2.xml
index f64f6b86bc31..ed4346a28908 100644
--- a/api/src/main/resources/liquibase-update-to-2.2.xml
+++ b/api/src/main/resources/liquibase-update-to-2.2.xml
@@ -117,14 +117,23 @@
                                      baseTableName="patient_program_attribute" baseColumnNames="voided_by"
             referencedTableName="users" referencedColumnNames="user_id" />
     </changeSet>
-	<changeSet id="20180214-1000" author="Kelechi+iheanyi">
+	<changeSet author="Kelechi+iheanyi" id="20180508-1000">
 		<preConditions onFail="MARK_RAN">
-			<not><tableExists tableName="condition"/></not>
+			<tableExists tableName="conditions"/>
 		</preConditions>
 		<comment>
-			Add condition table
+			Rename conditions table to emrapi_conditions
 		</comment>
-		<createTable tableName="condition">
+		<renameTable newTableName="emrapi_conditions" oldTableName="conditions" />
+	</changeSet>
+	<changeSet id="20180508-1001" author="Kelechi+iheanyi">
+		<preConditions onFail="MARK_RAN">
+			<not><tableExists tableName="conditions"/></not>
+		</preConditions>
+		<comment>
+			Add conditions table
+		</comment>
+		<createTable tableName="conditions">
 			<column name="condition_id" type="int" autoIncrement="true">
 				<constraints primaryKey="true" nullable="false"/>
 			</column>
@@ -162,27 +171,40 @@
 			<column name="end_date" type="datetime" />
 		</createTable>
 		<addForeignKeyConstraint constraintName="condition_previous_version_fk"
-								 baseTableName="condition" baseColumnNames="previous_version"
-								 referencedTableName="condition" referencedColumnNames="condition_id" />
+								 baseTableName="conditions" baseColumnNames="previous_version"
+								 referencedTableName="conditions" referencedColumnNames="condition_id" />
 		<addForeignKeyConstraint constraintName="condition_condition_coded_fk"
-								 baseTableName="condition" baseColumnNames="condition_coded"
+								 baseTableName="conditions" baseColumnNames="condition_coded"
 								 referencedTableName="concept" referencedColumnNames="concept_id " />
 		<addForeignKeyConstraint constraintName="condition_condition_coded_name_fk"
-								 baseTableName="condition" baseColumnNames="condition_coded_name"
+								 baseTableName="conditions" baseColumnNames="condition_coded_name"
 								 referencedTableName="concept_name" referencedColumnNames="concept_name_id " />
 		<addForeignKeyConstraint constraintName="condition_creator_fk"
-								 baseTableName="condition" baseColumnNames="creator"
+								 baseTableName="conditions" baseColumnNames="creator"
 								 referencedTableName="users" referencedColumnNames="user_id" />
 		<addForeignKeyConstraint constraintName="condition_changed_by_fk"
-								 baseTableName="condition" baseColumnNames="changed_by"
+								 baseTableName="conditions" baseColumnNames="changed_by"
 								 referencedTableName="users" referencedColumnNames="user_id" />
 		<addForeignKeyConstraint constraintName="condition_voided_by_fk"
-								 baseTableName="condition" baseColumnNames="voided_by"
+								 baseTableName="conditions" baseColumnNames="voided_by"
 								 referencedTableName="users" referencedColumnNames="user_id" />
 		<addForeignKeyConstraint constraintName="condition_patient_fk"
-								 baseTableName="condition" baseColumnNames="patient_id"
+								 baseTableName="conditions" baseColumnNames="patient_id"
 								 referencedTableName="patient" referencedColumnNames="patient_id" />
 	</changeSet>
+	<changeSet id="20180508-1002" author="Kelechi+iheanyi">
+		<preConditions onFail="MARK_RAN">
+			<tableExists tableName="emrapi_conditions" />
+			<tableExists tableName="conditions" />
+		</preConditions>
+		<comment>
+			Migrate data from the emrapi_conditions table to the new conditions table
+		</comment>
+		<sql>
+			INSERT into `conditions` (condition_id, previous_version, patient_id, clinical_status, condition_non_coded, condition_coded, onset_date, additional_detail, end_date, creator, date_created, voided, voided_by, date_voided, void_reason, uuid)
+			SELECT condition_id, previous_condition_id, patient_id, status, condition_non_coded, concept_id, onset_date, additional_detail, end_date, creator, date_created, voided, voided_by, date_voided, void_reason, uuid FROM `emrapi_conditions`;
+		</sql>
+	</changeSet>
 	<changeSet id="20181402-TRUNK-5339" author="esirkings">
 		<preConditions onFail="MARK_RAN">
 			<not>
@@ -191,7 +213,6 @@
 		</preConditions>
 
 		<comment>Creating encounter_diagnosis table</comment>
-
 		<createTable tableName="encounter_diagnosis">
 			<column name="diagnosis_id" type="int" autoIncrement="true">
 				<constraints primaryKey="true" nullable="false" />
@@ -225,7 +246,7 @@
 								 referencedTableName="patient" referencedColumnNames="patient_id" />
 		<addForeignKeyConstraint constraintName="encounter_diagnosis_condition_id_fk"
 								 baseTableName="encounter_diagnosis" baseColumnNames="condition_id"
-								 referencedTableName="condition" referencedColumnNames="condition_id" />
+								 referencedTableName="conditions" referencedColumnNames="condition_id" />
 		<addForeignKeyConstraint constraintName="encounter_diagnosis_creator_fk"
 								 baseTableName="encounter_diagnosis" baseColumnNames="creator"
 								 referencedTableName="users" referencedColumnNames="user_id" />
@@ -252,17 +273,4 @@
 		<comment>Rename concept_numeric.precise to concept_numeric.allow_decimal</comment>
 		<renameColumn oldColumnName="precise" newColumnName="allow_decimal" tableName="concept_numeric"  columnDataType="BOOLEAN"/>
 	</changeSet>
-	<changeSet id="20180323-1000" author="Kelechi+iheanyi" dbms="mysql">
-		<preConditions onFail="MARK_RAN">
-			<tableExists tableName="condition" />
-			<tableExists tableName="conditions" />
-		</preConditions>
-		<comment>
-			Migrate data from the conditions table to the new condition table
-		</comment>
-		<sql>
-			INSERT into `condition` (condition_id, previous_version, patient_id, clinical_status, condition_non_coded, condition_coded, onset_date, additional_detail, end_date, creator, date_created, voided, voided_by, date_voided, void_reason, uuid)
-			SELECT condition_id, previous_condition_id, patient_id, status, condition_non_coded, concept_id, onset_date, additional_detail, end_date, creator, date_created, voided, voided_by, date_voided, void_reason, uuid FROM `conditions`;
-		</sql>
-	</changeSet>
 </databaseChangeLog>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Condition.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Condition.hbm.xml
index 4ce5fac17b87..f43ca04dbc0d 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Condition.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Condition.hbm.xml
@@ -15,7 +15,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.openmrs">
 
-	<class name="Condition" table="condition">
+	<class name="Condition" table="conditions">
 		<id name="conditionId" type="int" column="condition_id">
 			<generator class="native">
 				<param name="sequence">condition_condition_id_seq</param>
diff --git a/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateConditionDAOTestDataSet.xml b/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateConditionDAOTestDataSet.xml
index 57efa23828fc..9dc73f638078 100644
--- a/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateConditionDAOTestDataSet.xml
+++ b/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateConditionDAOTestDataSet.xml
@@ -11,12 +11,12 @@
 
 -->
 <dataset>
-  <condition condition_id="1" patient_id="2" clinical_status="INACTIVE" creator="1" date_created="2015-01-12 00:00:00" voided="false"
+  <conditions condition_id="1" patient_id="2" clinical_status="INACTIVE" creator="1" date_created="2015-01-12 00:00:00" voided="false"
     onset_date="2017-01-12 00:00:00" verification_status="PROVISIONAL" uuid="2cc6880e-2c46-15e4-9038-a6c5e4d22fb7"/>
-  <condition condition_id="2" patient_id="2" clinical_status="ACTIVE" creator="1" date_created="2015-01-12 00:00:00" voided="false"
+  <conditions condition_id="2" patient_id="2" clinical_status="ACTIVE" creator="1" date_created="2015-01-12 00:00:00" voided="false"
     onset_date="2017-01-12 00:00:50" verification_status="CONFIRMED" uuid="2cc6880e-2c46-11e4-9138-a6c5e4d20fb7"/>
-  <condition condition_id="4" patient_id="2" clinical_status="INACTIVE" creator="1" date_created="2016-01-12 00:00:00" voided="false"
+  <conditions condition_id="4" patient_id="2" clinical_status="INACTIVE" creator="1" date_created="2016-01-12 00:00:00" voided="false"
     onset_date="2017-01-12 00:00:52" end_date="2017-06-12 00:10:52" verification_status="CONFIRMED" uuid="2cb6880e-2cd6-11e4-9138-a6c5e4d20fb7"/>
-  <condition condition_id="6" patient_id="8" clinical_status="ACTIVE" creator="1" date_created="2015-04-12 00:00:00" voided="false"
+  <conditions condition_id="6" patient_id="8" clinical_status="ACTIVE" creator="1" date_created="2015-04-12 00:00:00" voided="false"
     onset_date="2017-02-12 00:40:00" verification_status="CONFIRMED" uuid="2cd6780e-2a46-11e4-9038-a6c5e4d26fc2"/>
 </dataset>
diff --git a/api/src/test/resources/org/openmrs/api/include/ConditionServiceImplTest-SetupCondition.xml b/api/src/test/resources/org/openmrs/api/include/ConditionServiceImplTest-SetupCondition.xml
index 14db8a318c74..28ce3cf5eccc 100644
--- a/api/src/test/resources/org/openmrs/api/include/ConditionServiceImplTest-SetupCondition.xml
+++ b/api/src/test/resources/org/openmrs/api/include/ConditionServiceImplTest-SetupCondition.xml
@@ -11,17 +11,17 @@
 
 -->
 <dataset>
-	<condition condition_id="1" patient_id="2" clinical_status="INACTIVE" creator="1" date_created="2015-01-12 00:00:00" 
+	<conditions condition_id="1" patient_id="2" clinical_status="INACTIVE" creator="1" date_created="2015-01-12 00:00:00" 
 			   voided="false" onset_date="2017-01-12 00:00:00" verification_status="PROVISIONAL" 
 			   uuid="2cc6880e-2c46-15e4-9038-a6c5e4d22fb7"/>
-	<condition condition_id="2" patient_id="2" clinical_status="ACTIVE" creator="1" date_created="2015-01-12 00:00:00" 
+	<conditions condition_id="2" patient_id="2" clinical_status="ACTIVE" creator="1" date_created="2015-01-12 00:00:00" 
 			   voided="false" onset_date="2017-01-12 00:00:50" verification_status="CONFIRMED" 
 			   uuid="2cc6880e-2c46-11e4-9138-a6c5e4d20fb7"/>
-	<condition condition_id="4" patient_id="2" clinical_status="ACTIVE" creator="1" date_created="2016-01-12 00:00:00" 
+	<conditions condition_id="4" patient_id="2" clinical_status="ACTIVE" creator="1" date_created="2016-01-12 00:00:00" 
 			   voided="true" date_voided="2017-01-12 00:00:52" voided_by="1" void_reason="test reason" 
 			   onset_date="2017-01-12 00:00:52" end_date="2017-06-12 00:10:52" verification_status="CONFIRMED" 
 			   uuid="2cb6880e-2cd6-11e4-9138-a6c5e4d20fb7"/>
-	<condition condition_id="6" patient_id="8" clinical_status="ACTIVE" creator="1" date_created="2015-04-12 00:00:00" 
+	<conditions condition_id="6" patient_id="8" clinical_status="ACTIVE" creator="1" date_created="2015-04-12 00:00:00" 
 			   voided="false" onset_date="2017-02-12 00:40:00" verification_status="CONFIRMED" 
 			   uuid="2cd6780e-2a46-11e4-9038-a6c5e4d26fc2"/>
 </dataset>
diff --git a/api/src/test/resources/org/openmrs/api/include/DiagnosisServiceImplTest-SetupDiagnosis.xml b/api/src/test/resources/org/openmrs/api/include/DiagnosisServiceImplTest-SetupDiagnosis.xml
index 7048a73d17d2..531a8e5d93a8 100644
--- a/api/src/test/resources/org/openmrs/api/include/DiagnosisServiceImplTest-SetupDiagnosis.xml
+++ b/api/src/test/resources/org/openmrs/api/include/DiagnosisServiceImplTest-SetupDiagnosis.xml
@@ -14,7 +14,7 @@
 	<encounter encounter_id="6" encounter_type="1" patient_id="2" location_id="2" form_id="1" 
 			   encounter_datetime="2008-08-19 00:00:00.0" creator="1" date_created="2008-08-19 12:34:40.0" 
 			   voided="false" uuid="y403fafb-e5e4-42d0-9d11-4f52e89d123r"/>
-	<condition condition_id="1" patient_id="2" clinical_status="INACTIVE" creator="1" date_created="2015-01-12 00:00:00" 
+	<conditions condition_id="1" patient_id="2" clinical_status="INACTIVE" creator="1" date_created="2015-01-12 00:00:00" 
 			   voided="false" onset_date="2017-01-12 00:00:00" verification_status="PROVISIONAL" 
 			   uuid="2cc6880e-2c46-15e4-9038-a6c5e4d22fb7"/>
 	<patient patient_id="2" creator="1" date_created="2005-09-22 00:00:00.0" changed_by="1"