diff --git a/app/models/repository.rb b/app/models/repository.rb
index 32cc3b13c2..a3d6a49639 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -433,7 +433,12 @@ class Repository < ApplicationRecord
   end
 
   def self.scm_available
-    scm_client_available && Redmine::Configuration["scm_#{scm_name.to_s.downcase}_path_regexp"].present?
+    scm_client_available && scm_path_regexp.present?
+  end
+
+  def self.scm_path_regexp
+    # Uses name.demodulize, not scm_name, which each adapter overrides as its display label.
+    Redmine::Configuration["scm_#{name.demodulize.downcase}_path_regexp"]
   end
 
   def set_as_default?
@@ -499,7 +504,7 @@ class Repository < ApplicationRecord
   # Validates repository url based against an optional regular expression
   # that can be set in the Redmine configuration file.
   def validate_repository_path(attribute=:url)
-    regexp = Redmine::Configuration["scm_#{scm_name.to_s.downcase}_path_regexp"]
+    regexp = self.class.scm_path_regexp
     if changes[attribute] && regexp.present?
       regexp = regexp.to_s.strip.gsub('%project%') {Regexp.escape(project.try(:identifier).to_s)}
       unless Regexp.new("\\A#{regexp}\\z").match?(send(attribute).to_s)
diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb
index 3b59459605..09250ddf92 100644
--- a/app/views/settings/_repositories.html.erb
+++ b/app/views/settings/_repositories.html.erb
@@ -15,7 +15,7 @@
     <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
     <% setting = :enabled_scm %>
     <% enabled = Setting.send(setting).include?(value) %>
-    <% path_regexp = Redmine::Configuration["scm_#{choice.to_s.downcase}_path_regexp"].presence %>
+    <% path_regexp = scm_class.scm_path_regexp.presence %>
     <tr>
       <td class="scm_name">
         <label>
diff --git a/lib/redmine/info.rb b/lib/redmine/info.rb
index 3f3ae338bd..789ff5350c 100644
--- a/lib/redmine/info.rb
+++ b/lib/redmine/info.rb
@@ -53,10 +53,9 @@ module Redmine
         s << "SCM:\n"
         Redmine::Scm::Base.all.each do |scm|
           scm_class = "Repository::#{scm}".constantize
-          config = "scm_#{scm.to_s.downcase}_path_regexp"
           if scm_class.scm_client_available
-            paths = if Redmine::Configuration[config].present?
-                      "Allowed Paths: #{Redmine::Configuration[config]}"
+            paths = if scm_class.scm_path_regexp.present?
+                      "Allowed Paths: #{scm_class.scm_path_regexp}"
                     else
                       "DISABLED: scm_#{scm.to_s.downcase}_path_regexp missing in configuration.yml"
                     end
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index a0f294faa0..141e9c38cc 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -561,4 +561,18 @@ class RepositoryTest < ActiveSupport::TestCase
     assert_nil Repository.factory('Serializer')
     assert_nil Repository.factory('Query')
   end
+
+  def test_scm_path_regexp_should_use_registered_scm_name
+    Redmine::Configuration.with 'scm_subversion_path_regexp' => '/svn/.*' do
+      assert_equal '/svn/.*', Repository::Subversion.scm_path_regexp
+    end
+  end
+
+  def test_scm_path_regexp_should_use_registered_scm_name_even_if_scm_name_is_overridden
+    Repository::Subversion.stubs(:scm_name).returns('Custom SCM Label')
+
+    Redmine::Configuration.with 'scm_subversion_path_regexp' => '/svn/.*' do
+      assert_equal '/svn/.*', Repository::Subversion.scm_path_regexp
+    end
+  end
 end