diff --git a/app/controllers/verification/residence_controller.rb b/app/controllers/verification/residence_controller.rb
index 107e0a1e0..b9951502e 100644
--- a/app/controllers/verification/residence_controller.rb
+++ b/app/controllers/verification/residence_controller.rb
@@ -4,11 +4,11 @@ class Verification::ResidenceController < ApplicationController
   skip_authorization_check
 
   def new
-    @residence = Residence.new
+    @residence = Verification::Residence.new
   end
 
   def create
-    @residence = Residence.new(residence_params.merge(user: current_user))
+    @residence = Verification::Residence.new(residence_params.merge(user: current_user))
     if @residence.save
       redirect_to verified_user_path, notice: t('verification.residence.create.flash.success')
     else
diff --git a/app/models/residence.rb b/app/models/verification/residence.rb
similarity index 97%
rename from app/models/residence.rb
rename to app/models/verification/residence.rb
index 511f1cb0c..ec8deda2b 100644
--- a/app/models/residence.rb
+++ b/app/models/verification/residence.rb
@@ -1,4 +1,4 @@
-class Residence
+class Verification::Residence
   include ActiveModel::Model
   include ActiveModel::Dates
 
diff --git a/app/views/verification/residence/new.html.erb b/app/views/verification/residence/new.html.erb
index 83e1b6f73..c61df2f27 100644
--- a/app/views/verification/residence/new.html.erb
+++ b/app/views/verification/residence/new.html.erb
@@ -3,7 +3,7 @@
 
     <h1 class="inline-block"><%= t('verification.residence.new.title') %></h1>
 
-    <%= form_for @residence, url: residence_path do |f| %>
+    <%= form_for @residence, as: "residence", url: residence_path do |f| %>
       <%= render 'errors' %>
 
       <%= f.select :document_type, document_types, prompt: "" %>
diff --git a/spec/factories.rb b/spec/factories.rb
index 578d7b250..336ef8452 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -20,7 +20,7 @@ FactoryGirl.define do
     uid "MyString"
   end
 
-  factory :residence do
+  factory :verification_residence, class: Verification::Residence do
     document_number  '12345678Z'
     document_type    1
     date_of_birth    Date.new(1980, 12, 31)
diff --git a/spec/models/residence_spec.rb b/spec/models/residence_spec.rb
index 66eb34951..189132c1f 100644
--- a/spec/models/residence_spec.rb
+++ b/spec/models/residence_spec.rb
@@ -1,8 +1,8 @@
 require 'rails_helper'
 
-describe Residence do
+describe Verification::Residence do
 
-  let(:residence) { build(:residence) }
+  let(:residence) { build(:verification_residence) }
 
   describe "validations" do
 
@@ -12,12 +12,12 @@ describe Residence do
 
     describe "dates" do
       it "should be valid with a valid date of birth" do
-        residence = Residence.new({"date_of_birth(3i)"=>"1", "date_of_birth(2i)"=>"1", "date_of_birth(1i)"=>"1980"})
+        residence = Verification::Residence.new({"date_of_birth(3i)"=>"1", "date_of_birth(2i)"=>"1", "date_of_birth(1i)"=>"1980"})
         expect(residence.errors[:date_of_birth].size).to eq(0)
       end
 
       it "should not be valid without a date of birth" do
-        residence = Residence.new({"date_of_birth(3i)"=>"", "date_of_birth(2i)"=>"", "date_of_birth(1i)"=>""})
+        residence = Verification::Residence.new({"date_of_birth(3i)"=>"", "date_of_birth(2i)"=>"", "date_of_birth(1i)"=>""})
         residence.valid?
         expect(residence.errors[:date_of_birth]).to include("can't be blank")
       end
@@ -28,7 +28,7 @@ describe Residence do
       residence.user = user
       residence.save
 
-      residence2 = build(:residence)
+      residence2 = build(:verification_residence)
 
       residence.valid?
       expect(residence.errors[:document_number]).to include("Already in use")