diff --git a/app/models/constants/case_log.rb b/app/models/constants/case_log.rb
index ba9aa508a..c09f3b996 100644
--- a/app/models/constants/case_log.rb
+++ b/app/models/constants/case_log.rb
@@ -104,7 +104,7 @@ module Constants::CaseLog
 
   PREVIOUS_TENANCY = {
     "Owner occupation (private)" => 26,
-    "Owner occupation (low cost home ownership)" => 27,
+    "Owner occupation (low-cost home ownership)" => 27,
     "Private sector tenancy" => 3,
     "Tied housing or rented with job" => 4,
     "Supported housing" => 6,
@@ -121,11 +121,11 @@ module Constants::CaseLog
     "Home Office Asylum Support" => 24,
     "Children’s home or foster care" => 13,
     "Rough sleeping" => 19,
-    "Other" => 25,
-    "Fixed term Local Authority General Needs tenancy" => 30,
-    "Lifetime Local Authority General Needs tenancy" => 31,
-    "Fixed term PRP General Needs tenancy" => 32,
-    "Lifetime PRP General Needs tenancy" => 33,
+    "Any other accommodation" => 25,
+    "Fixed-term local authority general needs tenancy" => 30,
+    "Lifetime local authority general needs tenancy" => 31,
+    "Fixed-term private registered provider (PRP) general needs tenancy" => 32,
+    "Lifetime private registered provider (PRP) general needs tenancy" => 33,
   }.freeze
 
   RESERVIST = {
@@ -1122,7 +1122,7 @@ module Constants::CaseLog
                             "Supported housing",
                             "Sheltered accommodation",
                             "Home Office Asylum Support",
-                            "Other"].freeze
+                            "Any other accommodation"].freeze
 
   OPTIONAL_FIELDS = %w[postcode_known la_known first_time_property_let_as_social_housing tenant_code propcode].freeze
 end
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 70a142646..469aa3602 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1343,21 +1343,21 @@
               "description": "",
               "questions": {
                 "prevten": {
-                  "header": "What was the tenant’s housing situation immediately before this letting?",
-                  "hint_text": "",
+                  "header": "Where was the household immediately before this letting?",
+                  "hint_text": "This is where the household was the night before they moved.",
                   "type": "radio",
                   "answer_options": {
                     "0": {
-                      "value": "Owner occupation (private)"
+                      "value": "Fixed-term local authority general needs tenancy"
                     },
                     "1": {
-                      "value": "Owner occupation (low cost home ownership)"
+                      "value": "Lifetime local authority general needs tenancy"
                     },
                     "2": {
-                      "value": "Private sector tenancy"
+                      "value": "Fixed-term private registered provider (PRP) general needs tenancy"
                     },
                     "3": {
-                      "value": "Tied housing or rented with job"
+                      "value": "Lifetime private registered provider (PRP) general needs tenancy"
                     },
                     "4": {
                       "value": "Supported housing"
@@ -1366,55 +1366,55 @@
                       "value": "Sheltered accommodation"
                     },
                     "6": {
-                      "value": "Residential care home"
+                      "value": "Private sector tenancy"
                     },
                     "7": {
-                      "value": "Living with friends or family"
+                      "value": "Owner occupation (private)"
                     },
                     "8": {
-                      "value": "Refuge"
+                      "value": "Owner occupation (low-cost home ownership)"
                     },
                     "9": {
-                      "value": "Hospital"
+                      "value": "Living with friends or family"
                     },
                     "10": {
-                      "value": "Prison or approved probation hostel"
+                      "value": "Direct access hostel"
                     },
                     "11": {
-                      "value": "Direct access hostel"
+                      "value": "Bed and breakfast"
                     },
                     "12": {
-                      "value": "Bed and breakfast"
+                      "value": "Prison or approved probation hostel"
                     },
                     "13": {
-                      "value": "Mobile home or caravan"
+                      "value": "Hospital"
                     },
                     "14": {
                       "value": "Any other temporary accommodation"
                     },
                     "15": {
-                      "value": "Home Office Asylum Support"
+                      "value": "Rough sleeping"
                     },
                     "16": {
-                      "value": "Children’s home or foster care"
+                      "value": "Tied housing or rented with job"
                     },
                     "17": {
-                      "value": "Rough sleeping"
+                      "value": "Mobile home or caravan"
                     },
                     "18": {
-                      "value": "Other"
+                      "value": "Refuge"
                     },
                     "19": {
-                      "value": "Fixed term Local Authority General Needs tenancy"
+                      "value": "Children’s home or foster care"
                     },
                     "20": {
-                      "value": "Lifetime Local Authority General Needs tenancy"
+                      "value": "Residential care home"
                     },
                     "21": {
-                      "value": "Fixed term PRP General Needs tenancy"
+                      "value": "Home Office Asylum Support"
                     },
                     "22": {
-                      "value": "Lifetime PRP General Needs tenancy"
+                      "value": "Any other accommodation"
                     }
                   }
                 }
@@ -2383,12 +2383,8 @@
                 }
               },
               "depends_on": [
-                {
-                  "tenancy": "Secure (including flexible)"
-                },
-                {
-                  "tenancy": "Assured Shorthold"
-                }
+                { "tenancy": "Secure (including flexible)" },
+                { "tenancy": "Assured Shorthold" }
               ]
             },
             "letting_in_sheltered_accommodation": {
diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb
index c49168d4f..3ca826ba0 100644
--- a/spec/models/case_log_spec.rb
+++ b/spec/models/case_log_spec.rb
@@ -897,7 +897,7 @@ RSpec.describe CaseLog do
         check_rsnvac_validation("Supported housing")
         check_rsnvac_validation("Sheltered accommodation")
         check_rsnvac_validation("Home Office Asylum Support")
-        check_rsnvac_validation("Other")
+        check_rsnvac_validation("Any other accommodation")
       end
 
       it "cannot be temp accommodation if source of letting referral " do