diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 4014cd7fc..89ccd9ac6 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -51,7 +51,7 @@ class Admin::SettingsController < AdminController
       :admin_contacts_max_count,
       :tech_contacts_min_count,
       :tech_contacts_max_count,
-      :ds_algorithm,
+      :ds_digest_type,
       :dnskeys_min_count,
       :dnskeys_max_count,
       :ns_min_count,
diff --git a/app/models/dnskey.rb b/app/models/dnskey.rb
index 05adbe29a..02b43d729 100644
--- a/app/models/dnskey.rb
+++ b/app/models/dnskey.rb
@@ -69,7 +69,7 @@ class Dnskey < ActiveRecord::Base
   def generate_digest
     return unless flags == 257 || flags == 256 # require ZoneFlag, but optional SecureEntryPoint
     self.ds_alg = alg
-    self.ds_digest_type = Setting.ds_algorithm if ds_digest_type.blank? || !DS_DIGEST_TYPE.include?(ds_digest_type)
+    self.ds_digest_type = Setting.ds_digest_type if self.ds_digest_type.blank? || !DS_DIGEST_TYPE.include?(ds_digest_type)
 
     flags_hex = self.class.int_to_hex(flags)
     protocol_hex = self.class.int_to_hex(protocol)
diff --git a/app/views/admin/settings/index.haml b/app/views/admin/settings/index.haml
index fc4cc4e9d..ede30e979 100644
--- a/app/views/admin/settings/index.haml
+++ b/app/views/admin/settings/index.haml
@@ -47,8 +47,8 @@
             %th{class: 'col-xs-6'}= t(:setting)
             %th{class: 'col-xs-6'}= t(:value)
         %tbody
-          /= render 'setting_row', var: :transfer_wait_time
-          = render 'setting_row', var: :ds_algorithm
+          = render 'setting_row', var: :transfer_wait_time
+          = render 'setting_row', var: :ds_digest_type
           = render 'setting_row', var: :client_side_status_editing_enabled
           = render 'setting_row', var: :api_ip_whitelist_enabled
           = render 'setting_row', var: :registrar_ip_whitelist_enabled
diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb
index 35c3eebb3..812641a09 100644
--- a/config/initializers/initial_settings.rb
+++ b/config/initializers/initial_settings.rb
@@ -12,7 +12,7 @@ if con.present? && con.table_exists?('settings')
   Setting.save_default(:tech_contacts_max_count, 10)
   Setting.save_default(:expire_pending_confirmation, 48)
 
-  Setting.save_default(:ds_algorithm, 2)
+  Setting.save_default(:ds_digest_type, 2)
   Setting.save_default(:ds_data_allowed, false)
   Setting.save_default(:key_data_allowed, true)
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 937096ad6..07f4ebc0a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -443,7 +443,7 @@ en:
   ds_data_allowed: 'DS data allowed'
   ds_data_with_key_allowed: 'Allow DS data with key'
   key_data_allowed: 'Allow key data'
-  ds_algorithm: 'DS algorithm'
+  ds_digest_type: 'DS digest type'
   zonefile_settings: 'Zonefile settings'
   background_jobs: Background jobs
   domain_history: Domain history