diff --git a/app/models/form/setup/questions/tenant_code.rb b/app/models/form/setup/questions/tenant_code.rb
index d819b898b..e299a3991 100644
--- a/app/models/form/setup/questions/tenant_code.rb
+++ b/app/models/form/setup/questions/tenant_code.rb
@@ -1,7 +1,7 @@
 class Form::Setup::Questions::TenantCode < ::Form::Question
   def initialize(id, hsh, page)
     super
-    @id = "tenancy_code"
+    @id = "tenancycode"
     @check_answer_label = "Tenant code"
     @header = "What is the tenant code?"
     @hint_text = "This is how you usually refer to this tenancy on your own systems."
diff --git a/spec/models/form/setup/pages/tenant_code_spec.rb b/spec/models/form/setup/pages/tenant_code_spec.rb
index 882bbc51a..14bbe6480 100644
--- a/spec/models/form/setup/pages/tenant_code_spec.rb
+++ b/spec/models/form/setup/pages/tenant_code_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Setup::Pages::TenantCode, type: :model do
   end
 
   it "has correct questions" do
-    expect(page.questions.map(&:id)).to eq(%w[tenancy_code])
+    expect(page.questions.map(&:id)).to eq(%w[tenancycode])
   end
 
   it "has the correct id" do
diff --git a/spec/models/form/setup/questions/tenant_code_spec.rb b/spec/models/form/setup/questions/tenant_code_spec.rb
index ed277b844..e4a4745ef 100644
--- a/spec/models/form/setup/questions/tenant_code_spec.rb
+++ b/spec/models/form/setup/questions/tenant_code_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Form::Setup::Questions::TenantCode, type: :model do
   end
 
   it "has the correct id" do
-    expect(question.id).to eq("tenancy_code")
+    expect(question.id).to eq("tenancycode")
   end
 
   it "has the correct header" do