diff --git a/app/models/comment.rb b/app/models/comment.rb
index abbdc2a0..ceeb9c36 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -3,6 +3,6 @@ class Comment < ActiveRecord::Base
   include Creation
   attr_accessor :username
 
-  belongs_to :file, class: CodeOcean::File
+  belongs_to :file, class_name: 'CodeOcean::File'
   belongs_to :user, polymorphic: true
 end
diff --git a/app/models/concerns/context.rb b/app/models/concerns/context.rb
index 703da58c..18cadab7 100644
--- a/app/models/concerns/context.rb
+++ b/app/models/concerns/context.rb
@@ -2,7 +2,7 @@ module Context
   extend ActiveSupport::Concern
 
   included do
-    has_many :files, as: :context, class: CodeOcean::File
+    has_many :files, as: :context, class_name: 'CodeOcean::File'
     accepts_nested_attributes_for :files
   end
 
diff --git a/app/models/request_for_comment.rb b/app/models/request_for_comment.rb
index 3676550d..15d639bb 100644
--- a/app/models/request_for_comment.rb
+++ b/app/models/request_for_comment.rb
@@ -1,6 +1,6 @@
 class RequestForComment < ActiveRecord::Base
   belongs_to :exercise
-  belongs_to :file, class: CodeOcean::File
+  belongs_to :file, class_name: 'CodeOcean::File'
   belongs_to :user, polymorphic: true
 
   before_create :set_requested_timestamp