diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb
index 86c296d88..204d924ba 100644
--- a/app/models/concerns/domain/deletable.rb
+++ b/app/models/concerns/domain/deletable.rb
@@ -1,10 +1,6 @@
 module Concerns::Domain::Deletable
   extend ActiveSupport::Concern
 
-  included do
-    alias_attribute :delete_time, :delete_at
-  end
-
   def discard
     statuses << DomainStatus::DELETE_CANDIDATE
     save
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 9eef0f30f..a9fec134e 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -684,7 +684,7 @@ class Domain < ActiveRecord::Base
   end
 
   def self.delete_candidates
-    where("#{attribute_alias(:delete_time)} < ?", Time.zone.now)
+    where('delete_at < ?', Time.zone.now)
   end
 
   def self.uses_zone?(zone)
diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb
index aac3c1527..2ecb82922 100644
--- a/app/presenters/domain_presenter.rb
+++ b/app/presenters/domain_presenter.rb
@@ -30,7 +30,7 @@ class DomainPresenter
   end
 
   def delete_date
-    view.l(domain.delete_time, format: :date) if domain.delete_time
+    view.l(domain.delete_at, format: :date) if domain.delete_at
   end
 
   def force_delete_date
diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb
index cc1fe52a2..6c09ef7ed 100644
--- a/spec/models/domain_spec.rb
+++ b/spec/models/domain_spec.rb
@@ -877,9 +877,9 @@ RSpec.describe Domain do
 
       create(:zone, origin: 'ee')
 
-      create(:domain, id: 1, delete_time: Time.zone.parse('04.07.2010 23:59'))
-      create(:domain, id: 2, delete_time: Time.zone.parse('05.07.2010 00:00'))
-      create(:domain, id: 3, delete_time: Time.zone.parse('05.07.2010 00:01'))
+      create(:domain, id: 1, delete_at: Time.zone.parse('04.07.2010 23:59'))
+      create(:domain, id: 2, delete_at: Time.zone.parse('05.07.2010 00:00'))
+      create(:domain, id: 3, delete_at: Time.zone.parse('05.07.2010 00:01'))
     end
 
     it 'returns domains with delete time in the past' do
diff --git a/spec/presenters/domain_presenter_spec.rb b/spec/presenters/domain_presenter_spec.rb
index 3726960b4..d0cef5e6d 100644
--- a/spec/presenters/domain_presenter_spec.rb
+++ b/spec/presenters/domain_presenter_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe DomainPresenter do
     subject(:delete_date) { presenter.delete_date }
 
     context 'when present' do
-      let(:domain) { instance_double(Domain, delete_time: '05.07.2010') }
+      let(:domain) { instance_double(Domain, delete_at: '05.07.2010') }
 
       it 'returns localized date' do
         expect(view).to receive(:l).with('05.07.2010', format: :date).and_return('delete date')
@@ -53,7 +53,7 @@ RSpec.describe DomainPresenter do
     end
 
     context 'when absent' do
-      let(:domain) { instance_double(Domain, delete_time: nil) }
+      let(:domain) { instance_double(Domain, delete_at: nil) }
 
       specify { expect(delete_date).to be_nil }
     end