diff --git a/app/models/exchange_rate/syncer.rb b/app/models/exchange_rate/importer.rb
similarity index 99%
rename from app/models/exchange_rate/syncer.rb
rename to app/models/exchange_rate/importer.rb
index a1ee44b5..b55ea73b 100644
--- a/app/models/exchange_rate/syncer.rb
+++ b/app/models/exchange_rate/importer.rb
@@ -1,4 +1,4 @@
-class ExchangeRate::Syncer
+class ExchangeRate::Importer
   MissingExchangeRateError = Class.new(StandardError)
   MissingStartRateError = Class.new(StandardError)
 
diff --git a/app/models/exchange_rate/provided.rb b/app/models/exchange_rate/provided.rb
index 5a1b4c60..1d111a49 100644
--- a/app/models/exchange_rate/provided.rb
+++ b/app/models/exchange_rate/provided.rb
@@ -34,7 +34,7 @@ module ExchangeRate::Provided
         return 0
       end
 
-      ExchangeRate::Syncer.new(
+      ExchangeRate::Importer.new(
         exchange_rate_provider: provider,
         from: from,
         to: to,
diff --git a/app/models/security/price/syncer.rb b/app/models/security/price/importer.rb
similarity index 99%
rename from app/models/security/price/syncer.rb
rename to app/models/security/price/importer.rb
index 824998cd..c632867f 100644
--- a/app/models/security/price/syncer.rb
+++ b/app/models/security/price/importer.rb
@@ -1,4 +1,4 @@
-class Security::Price::Syncer
+class Security::Price::Importer
   MissingSecurityPriceError = Class.new(StandardError)
   MissingStartPriceError    = Class.new(StandardError)
 
diff --git a/app/models/security/provided.rb b/app/models/security/provided.rb
index 2214ccfa..e5acf5b2 100644
--- a/app/models/security/provided.rb
+++ b/app/models/security/provided.rb
@@ -82,7 +82,7 @@ module Security::Provided
       return 0
     end
 
-    Security::Price::Syncer.new(
+    Security::Price::Importer.new(
       security: self,
       security_provider: provider,
       start_date: start_date,
diff --git a/test/models/account/market_data_import_test.rb b/test/models/account/market_data_importer_test.rb
similarity index 100%
rename from test/models/account/market_data_import_test.rb
rename to test/models/account/market_data_importer_test.rb
diff --git a/test/models/exchange_rate/syncer_test.rb b/test/models/exchange_rate/importer_test.rb
similarity index 95%
rename from test/models/exchange_rate/syncer_test.rb
rename to test/models/exchange_rate/importer_test.rb
index 58818834..90f6e7b7 100644
--- a/test/models/exchange_rate/syncer_test.rb
+++ b/test/models/exchange_rate/importer_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 require "ostruct"
 
-class ExchangeRate::SyncerTest < ActiveSupport::TestCase
+class ExchangeRate::ImporterTest < ActiveSupport::TestCase
   include ProviderTestHelper
 
   setup do
@@ -21,7 +21,7 @@ class ExchangeRate::SyncerTest < ActiveSupport::TestCase
              .with(from: "USD", to: "EUR", start_date: get_provider_fetch_start_date(2.days.ago.to_date), end_date: Date.current)
              .returns(provider_response)
 
-    ExchangeRate::Syncer.new(
+    ExchangeRate::Importer.new(
       exchange_rate_provider: @provider,
       from: "USD",
       to: "EUR",
@@ -53,7 +53,7 @@ class ExchangeRate::SyncerTest < ActiveSupport::TestCase
              .with(from: "USD", to: "EUR", start_date: get_provider_fetch_start_date(1.day.ago.to_date), end_date: Date.current)
              .returns(provider_response)
 
-    ExchangeRate::Syncer.new(
+    ExchangeRate::Importer.new(
       exchange_rate_provider: @provider,
       from: "USD",
       to: "EUR",
@@ -75,7 +75,7 @@ class ExchangeRate::SyncerTest < ActiveSupport::TestCase
 
     @provider.expects(:fetch_exchange_rates).never
 
-    ExchangeRate::Syncer.new(
+    ExchangeRate::Importer.new(
       exchange_rate_provider: @provider,
       from: "USD",
       to: "EUR",
@@ -103,7 +103,7 @@ class ExchangeRate::SyncerTest < ActiveSupport::TestCase
              .with(from: "USD", to: "EUR", start_date: get_provider_fetch_start_date(2.days.ago.to_date), end_date: Date.current)
              .returns(provider_response)
 
-    ExchangeRate::Syncer.new(
+    ExchangeRate::Importer.new(
       exchange_rate_provider: @provider,
       from: "USD",
       to: "EUR",
@@ -129,7 +129,7 @@ class ExchangeRate::SyncerTest < ActiveSupport::TestCase
              .with(from: "USD", to: "EUR", start_date: get_provider_fetch_start_date(Date.current), end_date: Date.current)
              .returns(provider_response)
 
-    ExchangeRate::Syncer.new(
+    ExchangeRate::Importer.new(
       exchange_rate_provider: @provider,
       from: "USD",
       to: "EUR",
diff --git a/test/models/security/price/syncer_test.rb b/test/models/security/price/importer_test.rb
similarity index 95%
rename from test/models/security/price/syncer_test.rb
rename to test/models/security/price/importer_test.rb
index 25a3f14c..9e769d08 100644
--- a/test/models/security/price/syncer_test.rb
+++ b/test/models/security/price/importer_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 require "ostruct"
 
-class Security::Price::SyncerTest < ActiveSupport::TestCase
+class Security::Price::ImporterTest < ActiveSupport::TestCase
   include ProviderTestHelper
 
   setup do
@@ -23,7 +23,7 @@ class Security::Price::SyncerTest < ActiveSupport::TestCase
                    start_date: get_provider_fetch_start_date(2.days.ago.to_date), end_date: Date.current)
              .returns(provider_response)
 
-    Security::Price::Syncer.new(
+    Security::Price::Importer.new(
       security: @security,
       security_provider: @provider,
       start_date: 2.days.ago.to_date,
@@ -52,7 +52,7 @@ class Security::Price::SyncerTest < ActiveSupport::TestCase
                    start_date: get_provider_fetch_start_date(1.day.ago.to_date), end_date: Date.current)
              .returns(provider_response)
 
-    Security::Price::Syncer.new(
+    Security::Price::Importer.new(
       security: @security,
       security_provider: @provider,
       start_date: 3.days.ago.to_date,
@@ -73,7 +73,7 @@ class Security::Price::SyncerTest < ActiveSupport::TestCase
 
     @provider.expects(:fetch_security_prices).never
 
-    Security::Price::Syncer.new(
+    Security::Price::Importer.new(
       security: @security,
       security_provider: @provider,
       start_date: 3.days.ago.to_date,
@@ -100,7 +100,7 @@ class Security::Price::SyncerTest < ActiveSupport::TestCase
                    start_date: get_provider_fetch_start_date(2.days.ago.to_date), end_date: Date.current)
              .returns(provider_response)
 
-    Security::Price::Syncer.new(
+    Security::Price::Importer.new(
       security: @security,
       security_provider: @provider,
       start_date: 2.days.ago.to_date,
@@ -126,7 +126,7 @@ class Security::Price::SyncerTest < ActiveSupport::TestCase
                    start_date: get_provider_fetch_start_date(Date.current), end_date: Date.current)
              .returns(provider_response)
 
-    Security::Price::Syncer.new(
+    Security::Price::Importer.new(
       security: @security,
       security_provider: @provider,
       start_date: Date.current,