diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 0a4f139ef09..733c9c635ff 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -3,7 +3,7 @@
 - breadcrumb_title @issue.to_reference
 - page_title           "#{@issue.title} (#{@issue.to_reference})", "Issues"
 - page_description     @issue.description
-- page_card_attributes @issue.board-card_attributes
+- page_card_attributes @issue.card_attributes
 
 - can_update_issue = can?(current_user, :update_issue, @issue)
 - can_report_spam = @issue.submittable_as_spam_by?(current_user)
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index a3fa792a728..fb70edfca28 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -4,7 +4,7 @@
 - breadcrumb_title @merge_request.to_reference
 - page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
 - page_description @merge_request.description
-- page_card_attributes @merge_request.board-card_attributes
+- page_card_attributes @merge_request.card_attributes
 
 .merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } }
   = render "projects/merge_requests/mr_title"
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 02945fb843f..11154291368 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -70,7 +70,7 @@ describe Issue do
       allow(subject).to receive(:author).and_return(double(name: 'Robert'))
       allow(subject).to receive(:assignees).and_return([])
 
-      expect(subject.board-card_attributes)
+      expect(subject.card_attributes)
         .to eq({ 'Author' => 'Robert', 'Assignee' => '' })
     end
 
@@ -78,7 +78,7 @@ describe Issue do
       allow(subject).to receive(:author).and_return(double(name: 'Robert'))
       allow(subject).to receive(:assignees).and_return([double(name: 'Douwe')])
 
-      expect(subject.board-card_attributes)
+      expect(subject.card_attributes)
         .to eq({ 'Author' => 'Robert', 'Assignee' => 'Douwe' })
     end
   end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index b30b907d70f..f73f44ca0ad 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -191,7 +191,7 @@ describe MergeRequest do
       allow(subject).to receive(:author).and_return(double(name: 'Robert'))
       allow(subject).to receive(:assignee).and_return(nil)
 
-      expect(subject.board-card_attributes)
+      expect(subject.card_attributes)
         .to eq({ 'Author' => 'Robert', 'Assignee' => nil })
     end
 
@@ -199,7 +199,7 @@ describe MergeRequest do
       allow(subject).to receive(:author).and_return(double(name: 'Robert'))
       allow(subject).to receive(:assignee).and_return(double(name: 'Douwe'))
 
-      expect(subject.board-card_attributes)
+      expect(subject.card_attributes)
         .to eq({ 'Author' => 'Robert', 'Assignee' => 'Douwe' })
     end
   end
diff --git a/spec/presenters/conversational_development_index/metric_presenter_spec.rb b/spec/presenters/conversational_development_index/metric_presenter_spec.rb
index fb07ef814cd..81eb05a9a6b 100644
--- a/spec/presenters/conversational_development_index/metric_presenter_spec.rb
+++ b/spec/presenters/conversational_development_index/metric_presenter_spec.rb
@@ -6,7 +6,7 @@ describe ConversationalDevelopmentIndex::MetricPresenter do
 
   describe '#cards' do
     it 'includes instance score, leader score and percentage score' do
-      issues_card = subject.board-cards.first
+      issues_card = subject.cards.first
 
       expect(issues_card.instance_score).to eq(1.234)
       expect(issues_card.leader_score).to eq(9.256)