diff --git a/app/controllers/workshop_invitation_controller.rb b/app/controllers/workshop_invitation_controller.rb
index 5bd1d28b3..62784339a 100644
--- a/app/controllers/workshop_invitation_controller.rb
+++ b/app/controllers/workshop_invitation_controller.rb
@@ -91,8 +91,8 @@ def invitation_params
   end
 
   def available_spaces?(workshop, invitation)
-    (invitation.role.eql?('Student') && workshop.student_spaces?) ||
-      (invitation.role.eql?('Coach') && workshop.coach_spaces?)
+    (invitation.role.eql?('Student') && workshop.event_student_spaces?) ||
+      (invitation.role.eql?('Coach') && workshop.event_coach_spaces?)
   end
 
   # Inline from InvitationControllerConcerns
diff --git a/app/views/workshop_invitation/show.html.haml b/app/views/workshop_invitation/show.html.haml
index dbba2f595..3b559abd2 100644
--- a/app/views/workshop_invitation/show.html.haml
+++ b/app/views/workshop_invitation/show.html.haml
@@ -80,7 +80,7 @@
                   = @invitation.member.bans.active.first.reason
             - else
               - if @invitation.for_coach?
-                - if @workshop.coach_spaces?
+                - if @workshop.event_coach_spaces?
                   = link_to 'Keep your skills up-to-date!', edit_member_path
                   %span.d-block
                     %small= I18n.t('workshop_invitation.coach_skills_tooltip')
@@ -91,7 +91,7 @@
                 - else
                   = render partial: 'workshop_invitation/waiting_list', locals: { invitation: @invitation }
               - else
-                - if @workshop.student_spaces?
+                - if @workshop.event_student_spaces?
                   = simple_form_for @invitation, url: :accept_invitation, method: :post do |f|
                     = f.input :tutorial, collection: @tutorial_titles, include_blank: true
                     = f.input :note, required: false, input_html: { rows: 3, maxlength: 100 }, hint: 'Anything else we should know?', placeholder: 'e.g. I need help understanding selectors'
diff --git a/spec/fabricators/workshop_fabricator.rb b/spec/fabricators/workshop_fabricator.rb
index 388d3dd6d..b0b83ec14 100644
--- a/spec/fabricators/workshop_fabricator.rb
+++ b/spec/fabricators/workshop_fabricator.rb
@@ -2,12 +2,14 @@
   date_and_time Time.zone.now + 2.days
   ends_at { |attrs| attrs[:date_and_time] + 2.hours }
   chapter
+  student_spaces { |transients| transients[:student_count] || 10 }
+  coach_spaces { |transients| transients[:coach_count] || 10 }
   after_build do |workshop, transients|
     Fabricate(:workshop_sponsor,
               workshop: workshop,
               sponsor: Fabricate(:sponsor,
                                  seats: transients[:student_count] || 10,
-                                 number_of_coaches: transients[:coach_count || 10]),
+                                 number_of_coaches: transients[:coach_count] || 10),
               host: true)
   end
 
diff --git a/spec/features/accepting_invitation_spec.rb b/spec/features/accepting_invitation_spec.rb
index 18a8cf406..3f0367111 100644
--- a/spec/features/accepting_invitation_spec.rb
+++ b/spec/features/accepting_invitation_spec.rb
@@ -5,7 +5,7 @@
     let(:invitation_route) { invitation_path(invitation) }
     let(:accept_invitation_route) { accept_invitation_path(invitation) }
     let(:reject_invitation_route) { reject_invitation_path(invitation) }
-    let(:set_no_available_slots) { invitation.workshop.host.update_attribute(:seats, 0) }
+    let(:set_no_available_slots) { invitation.workshop.update_attribute(:student_spaces, 0) }
     let!(:tutorial) { Fabricate(:tutorial) }
 
     it_behaves_like 'invitation route'
diff --git a/spec/features/coach_accepting_invitation_spec.rb b/spec/features/coach_accepting_invitation_spec.rb
index 3d6093ae7..8d3e90fe6 100644
--- a/spec/features/coach_accepting_invitation_spec.rb
+++ b/spec/features/coach_accepting_invitation_spec.rb
@@ -6,7 +6,7 @@
     let(:reject_invitation_route) { reject_invitation_path(invitation) }
     let(:accept_invitation_route) { accept_invitation_path(invitation) }
 
-    let(:set_no_available_slots) { invitation.workshop.host.update_attribute(:seats, 0) }
+    let(:set_no_available_slots) { invitation.workshop.update_attribute(:coach_spaces, 0) }
 
     before(:each) do
       login(member)