diff --git a/app/models/letter.rb b/app/models/letter.rb
index 58e326d58..75b5a5437 100644
--- a/app/models/letter.rb
+++ b/app/models/letter.rb
@@ -18,7 +18,7 @@ class Letter
   end
 
   def address
-    @address ||= UserApi.new(user).address
+    @address ||= CensusApi.new(user).address
   end
 
   def letter_requested!
@@ -50,4 +50,4 @@ class Letter
       district:      address[:nombre_distrito] }
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/residence.rb b/app/models/residence.rb
index b9610015e..511f1cb0c 100644
--- a/app/models/residence.rb
+++ b/app/models/residence.rb
@@ -36,10 +36,10 @@ class Residence
 
     self.date_of_birth = date_to_string(date_of_birth)
 
-    residency = UserApi.new(self)
+    residency = CensusApi.new(self)
     errors.add(:residence_in_madrid, false) unless residency.valid?
 
     self.date_of_birth = string_to_date(date_of_birth)
   end
 
-end
\ No newline at end of file
+end
diff --git a/lib/user_api.rb b/lib/census_api.rb
similarity index 99%
rename from lib/user_api.rb
rename to lib/census_api.rb
index a5553e279..d3528f261 100644
--- a/lib/user_api.rb
+++ b/lib/census_api.rb
@@ -1,4 +1,4 @@
-class UserApi
+class CensusApi
   attr_accessor :client, :citizen, :response
 
   def initialize(citizen)
diff --git a/spec/features/verification/letter_spec.rb b/spec/features/verification/letter_spec.rb
index 4816bd9b1..fa4a451db 100644
--- a/spec/features/verification/letter_spec.rb
+++ b/spec/features/verification/letter_spec.rb
@@ -13,13 +13,13 @@ feature 'Verify Letter' do
     expect(page).to have_content "You will receive a letter to your home address"
   end
 
-  scenario "Error accessing address from UserApi" do
+  scenario "Error accessing address from CensusApi" do
     user = create(:user, residence_verified_at: Time.now, confirmed_phone: "611111111")
 
     login_as(user)
     visit new_letter_path
 
-    allow_any_instance_of(UserApi).to receive(:address).and_return(nil)
+    allow_any_instance_of(CensusApi).to receive(:address).and_return(nil)
 
     click_button "Send me a letter"
 
@@ -57,4 +57,4 @@ feature 'Verify Letter' do
     expect(URI.parse(current_url).path).to eq(new_sms_path)
   end
 
-end
\ No newline at end of file
+end