diff --git a/app/models/form/sales/pages/gender_identity2_single_buyer.rb b/app/models/form/sales/pages/person1_gender_identity.rb
similarity index 64%
rename from app/models/form/sales/pages/gender_identity2_single_buyer.rb
rename to app/models/form/sales/pages/person1_gender_identity.rb
index df3e7d711..031cae8f3 100644
--- a/app/models/form/sales/pages/gender_identity2_single_buyer.rb
+++ b/app/models/form/sales/pages/person1_gender_identity.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Pages::GenderIdentity2SingleBuyer < ::Form::Page
+class Form::Sales::Pages::Person1GenderIdentity < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "person_1_gender_identity"
@@ -12,7 +12,7 @@ class Form::Sales::Pages::GenderIdentity2SingleBuyer < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::GenderIdentity2SingleBuyer.new(nil, nil, self),
+      Form::Sales::Questions::Person1GenderIdentity.new(nil, nil, self),
     ]
   end
 end
diff --git a/app/models/form/sales/pages/gender_identity3.rb b/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
similarity index 51%
rename from app/models/form/sales/pages/gender_identity3.rb
rename to app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
index e952949f2..ad1f6f55d 100644
--- a/app/models/form/sales/pages/gender_identity3.rb
+++ b/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
@@ -1,7 +1,7 @@
-class Form::Sales::Pages::GenderIdentity3 < ::Form::Page
+class Form::Sales::Pages::Person1GenderIdentityJointPurchase < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @id = "person_1_gender_identity"
+    @id = "person_1_gender_identity_joint_purchase"
     @header = ""
     @description = ""
     @subsection = subsection
@@ -12,7 +12,7 @@ class Form::Sales::Pages::GenderIdentity3 < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::GenderIdentity3.new(nil, nil, self),
+      Form::Sales::Questions::Person1GenderIdentityJointPurchase.new(nil, nil, self),
     ]
   end
 end
diff --git a/app/models/form/sales/questions/gender_identity2_single_buyer.rb b/app/models/form/sales/questions/person1_gender_identity.rb
similarity index 86%
rename from app/models/form/sales/questions/gender_identity2_single_buyer.rb
rename to app/models/form/sales/questions/person1_gender_identity.rb
index 6c15ba0da..8cf8f29af 100644
--- a/app/models/form/sales/questions/gender_identity2_single_buyer.rb
+++ b/app/models/form/sales/questions/person1_gender_identity.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Questions::GenderIdentity2SingleBuyer < ::Form::Question
+class Form::Sales::Questions::Person1GenderIdentity < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "sex2"
diff --git a/app/models/form/sales/questions/gender_identity3.rb b/app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb
similarity index 85%
rename from app/models/form/sales/questions/gender_identity3.rb
rename to app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb
index aa8e03694..1127bf313 100644
--- a/app/models/form/sales/questions/gender_identity3.rb
+++ b/app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Questions::GenderIdentity3 < ::Form::Question
+class Form::Sales::Questions::Person1GenderIdentityJointPurchase < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "sex3"
diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb
index 8164125ef..541b7734b 100644
--- a/app/models/form/sales/subsections/household_characteristics.rb
+++ b/app/models/form/sales/subsections/household_characteristics.rb
@@ -29,8 +29,8 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self),
       Form::Sales::Pages::Person1Age.new(nil, nil, self),
-      Form::Sales::Pages::GenderIdentity2SingleBuyer.new(nil, nil, self),
-      Form::Sales::Pages::GenderIdentity3.new(nil, nil, self),
+      Form::Sales::Pages::Person1GenderIdentity.new(nil, nil, self),
+      Form::Sales::Pages::Person1GenderIdentityJointPurchase.new(nil, nil, self),
       Form::Sales::Pages::Person2Known.new(nil, nil, self),
       Form::Sales::Pages::Person2Age.new(nil, nil, self),
       Form::Sales::Pages::Person3Known.new(nil, nil, self),
diff --git a/spec/models/form/sales/pages/gender_identity3_spec.rb b/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb
similarity index 89%
rename from spec/models/form/sales/pages/gender_identity3_spec.rb
rename to spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb
index 2ea651b56..304d496c8 100644
--- a/spec/models/form/sales/pages/gender_identity3_spec.rb
+++ b/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Pages::GenderIdentity3, type: :model do
+RSpec.describe Form::Sales::Pages::Person1GenderIdentityJointPurchase, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection) }
 
   let(:page_id) { nil }
diff --git a/spec/models/form/sales/pages/gender_identity2_single_buyer_spec.rb b/spec/models/form/sales/pages/person1_gender_identity_spec.rb
similarity index 90%
rename from spec/models/form/sales/pages/gender_identity2_single_buyer_spec.rb
rename to spec/models/form/sales/pages/person1_gender_identity_spec.rb
index ceecc19c1..9c80429a2 100644
--- a/spec/models/form/sales/pages/gender_identity2_single_buyer_spec.rb
+++ b/spec/models/form/sales/pages/person1_gender_identity_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Pages::GenderIdentity2SingleBuyer, type: :model do
+RSpec.describe Form::Sales::Pages::Person1GenderIdentity, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection) }
 
   let(:page_id) { nil }
diff --git a/spec/models/form/sales/questions/gender_identity3_spec.rb b/spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb
similarity index 92%
rename from spec/models/form/sales/questions/gender_identity3_spec.rb
rename to spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb
index ffdcbdddd..d1d97ba3d 100644
--- a/spec/models/form/sales/questions/gender_identity3_spec.rb
+++ b/spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Questions::GenderIdentity3, type: :model do
+RSpec.describe Form::Sales::Questions::Person1GenderIdentityJointPurchase, type: :model do
   subject(:question) { described_class.new(question_id, question_definition, page) }
 
   let(:question_id) { nil }
diff --git a/spec/models/form/sales/questions/gender_identity2_single_buyer_spec.rb b/spec/models/form/sales/questions/person1_gender_identity_spec.rb
similarity index 93%
rename from spec/models/form/sales/questions/gender_identity2_single_buyer_spec.rb
rename to spec/models/form/sales/questions/person1_gender_identity_spec.rb
index b77c12150..41adde38a 100644
--- a/spec/models/form/sales/questions/gender_identity2_single_buyer_spec.rb
+++ b/spec/models/form/sales/questions/person1_gender_identity_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Questions::GenderIdentity2SingleBuyer, type: :model do
+RSpec.describe Form::Sales::Questions::Person1GenderIdentity, type: :model do
   subject(:question) { described_class.new(question_id, question_definition, page) }
 
   let(:question_id) { nil }
diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb
index ac9e3260d..0146e9aea 100644
--- a/spec/models/form/sales/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
         number_of_others_in_property
         person_1_age
         person_1_gender_identity
-        person_1_gender_identity
+        person_1_gender_identity_joint_purchase
         person_2_known
         person_2_age
         person_3_known