diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 0e1d169a9e0..3636607cfda 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -161,7 +161,7 @@ class WikiPage < ApplicationRecord
     content_to = journals.find_by(version: version_to)
     content_from = journals.find_by(version: version_from)
 
-    content_to && content_from ? Wikis::Diff.new(content_to, content_from) : nil
+    content_to && content_from ? WikiPage::Diff.new(content_to, content_from) : nil
   end
 
   def version
@@ -171,7 +171,7 @@ class WikiPage < ApplicationRecord
   def annotate(compare_version = nil)
     compare_version = compare_version ? compare_version.to_i : version
     c = journals.find_by(version: compare_version)
-    c ? Wikis::Annotate.new(c) : nil
+    c ? WikiPage::Annotate.new(c) : nil
   end
 
   # Returns true if usr is allowed to edit the page, otherwise false
diff --git a/app/models/wikis/annotate.rb b/app/models/wiki_page/annotate.rb
similarity index 98%
rename from app/models/wikis/annotate.rb
rename to app/models/wiki_page/annotate.rb
index 5a9ea79240f..49bb99494b5 100644
--- a/app/models/wikis/annotate.rb
+++ b/app/models/wiki_page/annotate.rb
@@ -28,7 +28,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-class Wikis::Annotate
+class WikiPage::Annotate
   attr_reader :lines, :content
 
   def initialize(content)
diff --git a/app/models/wikis/diff.rb b/app/models/wiki_page/diff.rb
similarity index 96%
rename from app/models/wikis/diff.rb
rename to app/models/wiki_page/diff.rb
index aa186cd88b5..b4f001e5ce7 100644
--- a/app/models/wikis/diff.rb
+++ b/app/models/wiki_page/diff.rb
@@ -28,7 +28,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-class Wikis::Diff < Redmine::Helpers::Diff
+class WikiPage::Diff < Redmine::Helpers::Diff
   attr_reader :content_to, :content_from
 
   def initialize(content_to, content_from)