diff --git a/api/src/main/java/org/openmrs/Form.java b/api/src/main/java/org/openmrs/Form.java
index bc006cd9cf0f..a73cf28e8e0d 100644
--- a/api/src/main/java/org/openmrs/Form.java
+++ b/api/src/main/java/org/openmrs/Form.java
@@ -16,28 +16,52 @@
 import java.util.List;
 import java.util.Set;
 
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
 /**
  * Form
  *
  * @version 1.0
  */
 @Audited
+@Entity
+@Table(name = "form")
+@AttributeOverride(name="description", column = @Column(name = "description", length = 1024))
 public class Form extends BaseChangeableOpenmrsMetadata {
 	
 	public static final long serialVersionUID = 845634L;
 	
 	// Fields
-	
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "form_id")
 	private Integer formId;
-	
+
+	@Column(name = "version", nullable = false, length = 50)
 	private String version;
 	
+	@Column(name = "build", nullable = true)
 	private Integer build;
 	
+	@Column(name = "published", length = 1)
 	private Boolean published = false;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "encounter_type")
 	private EncounterType encounterType;
-	
+
+	@OneToMany(mappedBy = "form", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
 	private Set<FormField> formFields;
 	
 	// Constructors
@@ -231,4 +255,4 @@ public void setId(Integer id) {
 		setFormId(id);
 		
 	}
-}
+}
\ No newline at end of file
diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml
index 71c1b5f83e7e..4f86df809b49 100644
--- a/api/src/main/resources/hibernate.cfg.xml
+++ b/api/src/main/resources/hibernate.cfg.xml
@@ -32,7 +32,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Field.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/Form.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FormField.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Obs.hbm.xml" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml
deleted file mode 100644
index 1e67c45288ab..000000000000
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    This Source Code Form is subject to the terms of the Mozilla Public License,
-    v. 2.0. If a copy of the MPL was not distributed with this file, You can
-    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
-    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
-
-    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
-    graphic logo is a trademark of OpenMRS Inc.
-
--->
-<!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="org.openmrs">
-
-	<class name="Form" table="form">
-
-		<id name="formId" type="int" column="form_id" unsaved-value="0">
-			<generator class="native">
-				<param name="sequence">form_form_id_seq</param>
-			</generator>
-		</id>
-
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
-
-		<property name="name" type="java.lang.String" 
-			column="name" not-null="true" length="255" />
-
-		<property name="version" type="java.lang.String" 
-			column="version" not-null="true" length="50" />
-		
-		<property name="build" type="java.lang.Integer" column="build" 
-			not-null="false" />
-		
-		<property name="published" type="boolean" column="published"
-			length="1" not-null="false" />
-
-		<property name="description" type="java.lang.String" 
-			column="description" length="1024" />
-
-		<many-to-one name="encounterType" class="EncounterType">
-			<column name="encounter_type" />
-		</many-to-one>
-
-		<many-to-one name="creator" class="User" not-null="true">
-			<column name="creator" />
-		</many-to-one>
-
-		<property name="dateCreated" type="java.util.Date" 
-			column="date_created" not-null="true" length="19" />
-
-		<many-to-one name="changedBy" class="User">
-			<column name="changed_by" />
-		</many-to-one>
-
-		<property name="dateChanged" type="java.util.Date" 
-			column="date_changed" length="19" />
-
-		<set name="formFields" lazy="true" inverse="true" cascade="all-delete-orphan">
-			<key>
-				<column name="form_id" />
-			</key>
-			<one-to-many class="FormField" />
-		</set>
-
-		<property name="retired" type="boolean" 
-			column="retired" length="1" not-null="true"/>
-
-		<many-to-one name="retiredBy" class="User">
-			<column name="retired_by" />
-		</many-to-one>
-
-		<property name="dateRetired" type="java.util.Date"
-			column="date_retired" length="19" />
-
-		<property name="retireReason" type="java.lang.String" 
-			column="retired_reason" length="255" />
-
-	</class>
-</hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-1.9.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-1.9.x.xml
index 92311c463dbf..b4a5e90f5927 100644
--- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-1.9.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-1.9.x.xml
@@ -721,7 +721,7 @@
 			</column>
 			<column name="retired_by" type="int"/>
 			<column name="date_retired" type="DATETIME"/>
-			<column name="retired_reason" type="varchar(255)"/>
+			<column name="retire_reason" type="varchar(255)"/>
 			<column name="uuid" type="char(38)" />
 		</createTable>
 		<modifySql dbms="mssql">
diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.1.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.1.x.xml
index da4732ed7efc..290ab20b0bac 100644
--- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.1.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.1.x.xml
@@ -1072,7 +1072,7 @@
             </column>
             <column name="retired_by" type="INT"/>
             <column name="date_retired" type="datetime"/>
-            <column name="retired_reason" type="VARCHAR(255)"/>
+            <column name="retire_reason" type="VARCHAR(255)"/>
             <column name="uuid" type="CHAR(38)">
                 <constraints nullable="false" unique="true"/>
             </column>
diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.2.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.2.x.xml
index 10457f77ff26..45b8a9c8abab 100644
--- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.2.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.2.x.xml
@@ -1147,7 +1147,7 @@
             </column>
             <column name="retired_by" type="INT"/>
             <column name="date_retired" type="datetime"/>
-            <column name="retired_reason" type="VARCHAR(255)"/>
+            <column name="retire_reason" type="VARCHAR(255)"/>
             <column name="uuid" type="CHAR(38)">
                 <constraints nullable="false" unique="true"/>
             </column>
diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.3.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.3.x.xml
index e4db8a95edd7..bda612f99bf1 100644
--- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.3.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.3.x.xml
@@ -1149,7 +1149,7 @@
             </column>
             <column name="retired_by" type="INT"/>
             <column name="date_retired" type="datetime"/>
-            <column name="retired_reason" type="VARCHAR(255)"/>
+            <column name="retire_reason" type="VARCHAR(255)"/>
             <column name="uuid" type="CHAR(38)">
                 <constraints nullable="false" unique="true"/>
             </column>
diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.4.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.4.x.xml
index acd8077823c1..2951382f8fa3 100644
--- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.4.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.4.x.xml
@@ -1145,7 +1145,7 @@
             </column>
             <column defaultValueComputed="NULL" name="retired_by" type="INT"/>
             <column defaultValueComputed="NULL" name="date_retired" type="datetime"/>
-            <column name="retired_reason" type="VARCHAR(255)"/>
+            <column name="retire_reason" type="VARCHAR(255)"/>
             <column name="uuid" type="CHAR(38)">
                 <constraints nullable="false"/>
             </column>
diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.5.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.5.x.xml
index bdc637bfec25..e8dfa22a58a9 100644
--- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.5.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.5.x.xml
@@ -1205,7 +1205,7 @@
       </column>  
       <column name="retired_by" type="INT"/>  
       <column name="date_retired" type="datetime"/>  
-      <column name="retired_reason" type="VARCHAR(255)"/>  
+      <column name="retire_reason" type="VARCHAR(255)"/>  
       <column name="uuid" type="CHAR(38)"> 
         <constraints nullable="false"/> 
       </column> 
diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.6.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.6.x.xml
index 9370739daac7..7397ddafc5d8 100644
--- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.6.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.6.x.xml
@@ -1213,7 +1213,7 @@
       </column>  
       <column name="retired_by" type="INT"/>  
       <column name="date_retired" type="datetime"/>  
-      <column name="retired_reason" type="VARCHAR(255)"/>  
+      <column name="retire_reason" type="VARCHAR(255)"/>  
       <column name="uuid" type="CHAR(38)"> 
         <constraints nullable="false" unique="true"/> 
       </column> 
diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml
index 61692a8709b8..1264b3e35d49 100644
--- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml
@@ -1235,7 +1235,7 @@
       </column>  
       <column defaultValueComputed="NULL" name="retired_by" type="INT"/>  
       <column defaultValueComputed="NULL" name="date_retired" type="datetime(0)"/>  
-      <column name="retired_reason" type="VARCHAR(255)"/>  
+      <column name="retire_reason" type="VARCHAR(255)"/>  
       <column name="uuid" type="CHAR(38)"> 
         <constraints nullable="false" unique="true"/> 
       </column> 
diff --git a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.8.x.xml b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.8.x.xml
index f1f80fc13072..39ef44d57544 100644
--- a/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.8.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.8.x.xml
@@ -1235,7 +1235,7 @@
       </column>  
       <column defaultValueComputed="NULL" name="retired_by" type="INT"/>  
       <column defaultValueComputed="NULL" name="date_retired" type="datetime(0)"/>  
-      <column name="retired_reason" type="VARCHAR(255)"/>  
+      <column name="retire_reason" type="VARCHAR(255)"/>  
       <column name="uuid" type="CHAR(38)"> 
         <constraints nullable="false" unique="true"/> 
       </column> 
diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.0.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.0.x.xml
index c666a2095dc1..945f8b0939d6 100644
--- a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.0.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.0.x.xml
@@ -305,7 +305,7 @@
 			</column>
 			<column name="retired_by" type="int(11)" />
 			<column name="date_retired" type="datetime" />
-			<column name="retired_reason" type="varchar(255)" defaultValue="null"/>
+			<column name="retire_reason" type="varchar(255)" defaultValue="null"/>
 		</createTable>
 		<addForeignKeyConstraint constraintName="location_tag_creator"
 			baseTableName="location_tag" baseColumnNames="creator"
diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml
index f390e6d7b196..3d09356fb4a7 100644
--- a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml
@@ -53,5 +53,17 @@
 			<column name="retired_by" type="INT" />
 		</addColumn>
 	</changeSet>
+	<changeSet id="TRUNK-5804-2025-09-12" author="elijah">
+    <preConditions onFail="MARK_RAN">
+        <columnExists tableName="form" columnName="retired_reason"/>
+    </preConditions>
+    <comment>Rename retired_reason to retire_reason for consistency</comment>
+    <renameColumn 
+        tableName="form"
+        oldColumnName="retired_reason" 
+        newColumnName="retire_reason" 
+        columnDataType="varchar(255)"/>
+</changeSet>
+
 
 </databaseChangeLog>
diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
index da44bdd89565..91890a1204aa 100644
--- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java
+++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -44,6 +44,7 @@
 import org.openmrs.DrugOrder;
 import org.openmrs.Encounter;
 import org.openmrs.EncounterRole;
+import org.openmrs.Form;
 import org.openmrs.FreeTextDosingInstructions;
 import org.openmrs.GlobalProperty;
 import org.openmrs.Location;
@@ -2787,6 +2788,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 				.addAnnotatedClass(ConceptNameTag.class)
 			    .addAnnotatedClass(CareSetting.class) 
 				.addAnnotatedClass(LocationTag.class)
+				.addAnnotatedClass(Form.class)
 				.getMetadataBuilder().build();
 
 
diff --git a/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java b/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java
index 092b59c49b5e..2a2aadbba3ad 100644
--- a/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java
+++ b/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java
@@ -32,7 +32,7 @@ public class DatabaseUpdaterDatabaseIT extends DatabaseIT {
 	 * This constant needs to be updated when adding new Liquibase update files to openmrs-core.
 	 */
 	
-	private static final int CHANGE_SET_COUNT_FOR_GREATER_THAN_2_1_X = 905;
+	private static final int CHANGE_SET_COUNT_FOR_GREATER_THAN_2_1_X = 906;
 
 	private static final int CHANGE_SET_COUNT_FOR_2_1_X = 870;
 
diff --git a/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateFormDAOTestDataSet.xml b/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateFormDAOTestDataSet.xml
index 7e662eec791a..a9b62cd9cdac 100644
--- a/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateFormDAOTestDataSet.xml
+++ b/api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateFormDAOTestDataSet.xml
@@ -15,11 +15,11 @@
   <field field_id="2" name="Some same concept" description="This is a duplicate field" field_type="1" concept_id="3" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="a2843248-ca4c-4349-a3b7-1162b98d91df"/>
   <field field_id="3" name="Some same concept" description="This is a duplicate field" field_type="1" concept_id="3" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="b1843148-da2f-4349-c9c7-1164b98d91dd"/>
   
-  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebdf-d0d1c45eb577"/>
-  <form form_id="2" name="Basic Other Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a-jhbUN0-788nhiuhi-DGof-90oGH"/>
-  <form form_id="3" name="Some Retired Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" encounter_type="1" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c158-6731-4ebd-89ff-hiui8hjJKK"/>
-  <form form_id="4" name="Another Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" encounter_type="1" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="true" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-c45kjni2891"/>
-  
+  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebdf-d0d1c45eb577"/>
+  <form form_id="2" name="Basic Other Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a-jhbUN0-788nhiuhi-DGof-90oGH"/>
+  <form form_id="3" name="Some Retired Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" encounter_type="1" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c158-6731-4ebd-89ff-hiui8hjJKK"/>
+  <form form_id="4" name="Another Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" encounter_type="1" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="true" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-c45kjni2891"/>
+
   <form_field form_field_id="2" form_id="1" field_id="1" field_number="1" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:11:53.0" creator="1" date_created="2006-07-18 11:04:36.0" sort_weight="10.0" uuid="6cbc3f1a-0b69-4f93-8865-f7ee4dd6a879"/>
   <form_field form_field_id="3" form_id="1" field_id="1" field_number="2" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:12:05.0" creator="1" date_created="2006-07-18 11:06:52.0" sort_weight="20.0" uuid="22a5ea24-f755-42c2-ae56-b0d23aaa46f7"/>
   <form_field form_field_id="5" form_id="2" field_id="1" field_number="3" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:13:59.0" creator="1" date_created="2006-07-18 11:13:57.0" sort_weight="30.0" uuid="0d38e38e-19da-41d6-9d24-af7e08e5e0f0"/>
diff --git a/api/src/test/resources/org/openmrs/api/include/FormServiceTest-formFields.xml b/api/src/test/resources/org/openmrs/api/include/FormServiceTest-formFields.xml
index 442471e81e3d..3ef93187406e 100644
--- a/api/src/test/resources/org/openmrs/api/include/FormServiceTest-formFields.xml
+++ b/api/src/test/resources/org/openmrs/api/include/FormServiceTest-formFields.xml
@@ -14,7 +14,7 @@
   <field field_id="1" name="Some concept" description="This is a test field" field_type="1" concept_id="1" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="e1843048-ca2f-4349-a9b7-1165b98d91de"/>
   <field field_id="2" name="Some same concept" description="This is a duplicate field" field_type="1" concept_id="1" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="a2843248-ca4c-4349-a3b7-1162b98d91df"/>
   <field field_id="3" name="Some same concept" description="This is a duplicate field" field_type="1" concept_id="1" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="b1843148-da2f-4349-c9c7-1164b98d91dd"/>
-  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb577"/>
+  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb577"/>
   <form_field form_field_id="2" form_id="1" field_id="1" field_number="1" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:11:53.0" creator="1" date_created="2006-07-18 11:04:36.0" sort_weight="10.0" uuid="6cbc3f1a-0b69-4f93-8865-f7ee4dd6a879"/>
   <form_field form_field_id="3" form_id="1" field_id="1" field_number="2" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:12:05.0" creator="1" date_created="2006-07-18 11:06:52.0" sort_weight="20.0" uuid="22a5ea24-f755-42c2-ae56-b0d23aaa46f7"/>
   <form_field form_field_id="5" form_id="1" field_id="1" field_number="3" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:13:59.0" creator="1" date_created="2006-07-18 11:13:57.0" sort_weight="30.0" uuid="0d38e38e-19da-41d6-9d24-af7e08e5e0f0"/>
diff --git a/api/src/test/resources/org/openmrs/api/include/FormServiceTest-multipleForms-formFields.xml b/api/src/test/resources/org/openmrs/api/include/FormServiceTest-multipleForms-formFields.xml
index 2b551b1c90cf..6d489587e3c0 100644
--- a/api/src/test/resources/org/openmrs/api/include/FormServiceTest-multipleForms-formFields.xml
+++ b/api/src/test/resources/org/openmrs/api/include/FormServiceTest-multipleForms-formFields.xml
@@ -14,17 +14,17 @@
   <field field_id="1" name="Some concept" description="This is a test field" field_type="1" concept_id="1" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="e1843048-ca2f-4349-a9b7-1165b98d91de"/>
   <field field_id="2" name="Some same concept" description="This is a duplicate field" field_type="1" concept_id="1" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="a2843248-ca4c-4349-a3b7-1162b98d91df"/>
   <field field_id="3" name="Some same concept" description="This is a duplicate field" field_type="1" concept_id="1" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="b1843148-da2f-4349-c9c7-1164b98d91dd"/>
-  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb577"/>
+  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb577"/>
   <form_field form_field_id="2" form_id="1" field_id="1" field_number="1" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:11:53.0" creator="1" date_created="2006-07-18 11:04:36.0" sort_weight="10.0" uuid="6cbc3f1a-0b69-4f93-8865-f7ee4dd6a879"/>
   <form_field form_field_id="3" form_id="1" field_id="1" field_number="2" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:12:05.0" creator="1" date_created="2006-07-18 11:06:52.0" sort_weight="20.0" uuid="22a5ea24-f755-42c2-ae56-b0d23aaa46f7"/>
   <form_field form_field_id="5" form_id="1" field_id="1" field_number="3" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:13:59.0" creator="1" date_created="2006-07-18 11:13:57.0" sort_weight="30.0" uuid="0d38e38e-19da-41d6-9d24-af7e08e5e0f0"/>
   <form_field form_field_id="6" form_id="1" field_id="2" field_number="4" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:13:59.0" creator="1" date_created="2006-07-18 11:13:57.0" sort_weight="30.0" uuid="3bb44f19-e162-219a-a5f5-19bd1eaa0f3b"/>
   <form_field form_field_id="7" form_id="1" field_id="3" field_number="5" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:13:59.0" creator="1" date_created="2006-07-18 11:13:57.0" sort_weight="30.0" uuid="dbb44d19-d162-219d-d5f5-19dd1daa0f3b"/>
   
-  <form form_id="2" name="Basic Form 2" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb571"/>
+  <form form_id="2" name="Basic Form 2" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb571"/>
   <form_field form_field_id="8" form_id="2" field_id="1" field_number="6" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:11:53.0" creator="1" date_created="2006-07-18 11:04:36.0" sort_weight="10.0" uuid="6cbc3f1a-0b69-4f93-8865-f7ee4dd6a871"/>
-  
-  <form form_id="3" name="Basic Form 3" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb570"/>
+
+  <form form_id="3" name="Basic Form 3" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb570"/>
   <form_field form_field_id="9" form_id="3" field_id="1" field_number="7" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:11:53.0" creator="1" date_created="2006-07-18 11:04:36.0" sort_weight="10.0" uuid="6cbc3f1a-0b69-4f93-8865-f7ee4dd6a870"/>
   
 </dataset>
diff --git a/api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml b/api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml
index 9bd4767e1d69..3b35e8de369d 100644
--- a/api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml
+++ b/api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml
@@ -84,11 +84,11 @@
   <hl7_in_queue hl7_in_queue_id="2" hl7_source="1" hl7_source_key="asdf" message_state="0" date_created="2004-08-12 00:00:00.0" uuid="cccc7348-5bf2-4050-b824-0aa009490000" hl7_data="a malformed hl7 message" />
 
 
-  <form form_id="16" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="1" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb000"/>
-  <form form_id="66" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="1" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb001"/>
-  <form form_id="3" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="2" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb002"/>
-  <form form_id="15" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="2" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb003"/>
-  <form form_id="4" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="2" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb004"/>
-  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="2" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="d9218f76-6c39-45f4-8efa-4c5c6c199f50"/>
+  <form form_id="16" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="1" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb000"/>
+  <form form_id="66" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="1" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb001"/>
+  <form form_id="3" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="2" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb002"/>
+  <form form_id="15" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="2" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb003"/>
+  <form form_id="4" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="2" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="c156e1a8-6731-4ebd-89ff-d0d1c45eb004"/>
+  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" encounter_type="2" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="d9218f76-6c39-45f4-8efa-4c5c6c199f50"/>
 
 </dataset>
diff --git a/api/src/test/resources/org/openmrs/include/standardTestDataset.xml b/api/src/test/resources/org/openmrs/include/standardTestDataset.xml
index 77b0acf426a8..a485d30a5964 100644
--- a/api/src/test/resources/org/openmrs/include/standardTestDataset.xml
+++ b/api/src/test/resources/org/openmrs/include/standardTestDataset.xml
@@ -313,7 +313,7 @@
   <field_type field_type_id="1" name="some field type" is_set="false" creator="1" date_created="2005-01-01 00:00:00.0" uuid="abf16b7d-39a5-4911-89da-0eefbfef7cb4"/>
   <field_type field_type_id="2" name="some field type 2" is_set="false" creator="1" date_created="2005-01-01 00:00:00.0" uuid="e7016b7d-39a5-4911-89da-0eefbfef7cb5"/>
   <field field_id="1" name="Some concept" description="This is a test field" field_type="1" concept_id="3" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="db016b7d-39a5-4911-89da-0eefbfef7cb2"/>
-  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="d9218f76-6c39-45f4-8efa-4c5c6c199f50"/>
+  <form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retire_reason="" uuid="d9218f76-6c39-45f4-8efa-4c5c6c199f50"/>
   <form_field form_field_id="2" form_id="1" field_id="1" field_number="1" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:11:53.0" creator="1" date_created="2006-07-18 11:04:36.0" sort_weight="10.0" uuid="1c822b7b-7840-463d-ba70-e0c8338a4c2d"/>
   <form_field form_field_id="3" form_id="1" field_id="1" field_number="2" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:12:05.0" creator="1" date_created="2006-07-18 11:06:52.0" sort_weight="20.0" uuid="1d26a18a-3f72-42e1-b6a2-59ab6494afb2"/>
   <form_field form_field_id="5" form_id="1" field_id="1" field_number="3" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:13:59.0" creator="1" date_created="2006-07-18 11:13:57.0" sort_weight="30.0" uuid="92e63d19-9b11-4bbf-8622-85bb191b2409"/>
diff --git a/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml b/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml
index 4b5dd88a5dd4..515698e872ee 100644
--- a/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml
+++ b/api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml
@@ -254,7 +254,7 @@
 	<field_type field_type_id="1" name="some field type" is_set="false" creator="1" date_created="2005-01-01 00:00:00.0" uuid="abf16b7d-39a5-4911-89da-0eefbfef7cb4"/>
 	<field_type field_type_id="2" name="some field type 2" is_set="false" creator="1" date_created="2005-01-01 00:00:00.0" uuid="e7016b7d-39a5-4911-89da-0eefbfef7cb5"/>
 	<field field_id="1" name="Some concept" description="This is a test field" field_type="1" concept_id="3" table_name="" default_value="" select_multiple="false" creator="1" date_created="2006-07-18 11:03:31.0" retired="false" uuid="db016b7d-39a5-4911-89da-0eefbfef7cb2"/>
-	<form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false" retired_reason="" uuid="d9218f76-6c39-45f4-8efa-4c5c6c199f50"/>
+	<form form_id="1" name="Basic Form" version="0.1" build="0" published="0" description="Test form" creator="1" date_created="2005-08-07 00:00:00.0" changed_by="1" date_changed="2007-10-24 14:51:53.0" retired="false"  uuid="d9218f76-6c39-45f4-8efa-4c5c6c199f50"/>
 	<form_field form_field_id="2" form_id="1" field_id="1" field_number="1" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:11:53.0" creator="1" date_created="2006-07-18 11:04:36.0" sort_weight="10.0" uuid="1c822b7b-7840-463d-ba70-e0c8338a4c2d"/>
 	<form_field form_field_id="3" form_id="1" field_id="1" field_number="2" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:12:05.0" creator="1" date_created="2006-07-18 11:06:52.0" sort_weight="20.0" uuid="1d26a18a-3f72-42e1-b6a2-59ab6494afb2"/>
 	<form_field form_field_id="5" form_id="1" field_id="1" field_number="3" field_part="" required="false" changed_by="1" date_changed="2006-07-18 11:13:59.0" creator="1" date_created="2006-07-18 11:13:57.0" sort_weight="30.0" uuid="92e63d19-9b11-4bbf-8622-85bb191b2409"/>
diff --git a/initial_test_db.sql b/initial_test_db.sql
index 8bc50aa8ee7a..b89d9eab89d6 100644
--- a/initial_test_db.sql
+++ b/initial_test_db.sql
@@ -1823,7 +1823,7 @@ CREATE TABLE `form` (
   `retired` tinyint(1) NOT NULL DEFAULT 0,
   `retired_by` int(11) DEFAULT NULL,
   `date_retired` datetime DEFAULT NULL,
-  `retired_reason` varchar(255) DEFAULT NULL,
+  `retire_reason` varchar(255) DEFAULT NULL,
   `uuid` char(38) NOT NULL,
   PRIMARY KEY (`form_id`),
   UNIQUE KEY `uuid_form` (`uuid`),
diff --git a/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-SNAPSHOT.xml b/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-SNAPSHOT.xml
index 11e5bee4c06b..db6d8f600ecf 100644
--- a/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-SNAPSHOT.xml
+++ b/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-SNAPSHOT.xml
@@ -1235,7 +1235,7 @@
             </column>
             <column defaultValueComputed="NULL" name="retired_by" type="INT"/>
             <column defaultValueComputed="NULL" name="date_retired" type="datetime(0)"/>
-            <column name="retired_reason" type="VARCHAR(255)"/>
+            <column name="retire_reason" type="VARCHAR(255)"/>
             <column name="uuid" type="CHAR(38)">
                 <constraints nullable="false" unique="true"/>
             </column>
diff --git a/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-UPDATED-SNAPSHOT.xml b/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-UPDATED-SNAPSHOT.xml
index 96a6e56e8c9a..b02382fba21e 100644
--- a/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-UPDATED-SNAPSHOT.xml
+++ b/liquibase/src/test/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-UPDATED-SNAPSHOT.xml
@@ -1235,7 +1235,7 @@
       </column>  
       <column defaultValueComputed="NULL" name="retired_by" type="INT"/>  
       <column defaultValueComputed="NULL" name="date_retired" type="datetime(0)"/>  
-      <column name="retired_reason" type="VARCHAR(255)"/>  
+      <column name="retire_reason" type="VARCHAR(255)"/>  
       <column name="uuid" type="CHAR(38)"> 
         <constraints nullable="false" unique="true"/> 
       </column>