diff --git a/common/lib/dependabot/group_rule.rb b/common/lib/dependabot/group_rule.rb
new file mode 100644
index 00000000000..582f83b4d9e
--- /dev/null
+++ b/common/lib/dependabot/group_rule.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Dependabot
+  class GroupRule
+    attr_reader :name
+
+    def initialize(name)
+      @name = name
+    end
+  end
+end
diff --git a/common/lib/dependabot/pull_request_creator.rb b/common/lib/dependabot/pull_request_creator.rb
index a264b8b23dd..34fb0bf93c4 100644
--- a/common/lib/dependabot/pull_request_creator.rb
+++ b/common/lib/dependabot/pull_request_creator.rb
@@ -235,6 +235,7 @@ def branch_namer
           dependencies: dependencies,
           files: files,
           target_branch: source.branch,
+          group_rule: nil,
           separator: branch_name_separator,
           prefix: branch_name_prefix,
           max_length: branch_name_max_length
diff --git a/common/lib/dependabot/pull_request_creator/branch_namer.rb b/common/lib/dependabot/pull_request_creator/branch_namer.rb
index a494f1d56c3..3dbfef36365 100644
--- a/common/lib/dependabot/pull_request_creator/branch_namer.rb
+++ b/common/lib/dependabot/pull_request_creator/branch_namer.rb
@@ -4,203 +4,52 @@
 
 require "dependabot/metadata_finders"
 require "dependabot/pull_request_creator"
+require "dependabot/pull_request_creator/branch_namer/solo_strategy"
 
 module Dependabot
   class PullRequestCreator
     class BranchNamer
-      attr_reader :dependencies, :files, :target_branch, :separator, :prefix, :max_length
+      attr_reader :dependencies, :files, :target_branch, :separator, :prefix, :max_length, :group_rule
 
-      def initialize(dependencies:, files:, target_branch:, separator: "/",
-                     prefix: "dependabot", max_length: nil)
+      def initialize(dependencies:, files:, target_branch:, group_rule: nil,
+                     separator: "/", prefix: "dependabot", max_length: nil)
         @dependencies  = dependencies
         @files         = files
         @target_branch = target_branch
+        @group_rule    = group_rule
         @separator     = separator
         @prefix        = prefix
         @max_length    = max_length
       end
 
       def new_branch_name
-        @name ||=
-          begin
-            dependency_name_part =
-              if dependencies.count > 1 && updating_a_property?
-                property_name
-              elsif dependencies.count > 1 && updating_a_dependency_set?
-                dependency_set.fetch(:group)
-              else
-                dependencies.
-                  map(&:name).
-                  join("-and-").
-                  tr(":[]", "-").
-                  tr("@", "")
-              end
-
-            "#{dependency_name_part}-#{branch_version_suffix}"
-          end
-
-        # Some users need branch names without slashes
-        sanitized_name = sanitize_ref(File.join(prefixes, @name).gsub("/", separator))
-
-        # Shorten the ref in case users refs have length limits
-        if @max_length && (sanitized_name.length > @max_length)
-          sha = Digest::SHA1.hexdigest(sanitized_name)[0, @max_length]
-          sanitized_name[[@max_length - sha.size, 0].max..] = sha
-        end
-
-        sanitized_name
+        strategy.new_branch_name
       end
 
       private
 
-      def prefixes
-        [
-          prefix,
-          package_manager,
-          files.first.directory.tr(" ", "-"),
-          target_branch
-        ].compact
-      end
-
-      def package_manager
-        dependencies.first.package_manager
-      end
-
-      def updating_a_property?
-        dependencies.first.
-          requirements.
-          any? { |r| r.dig(:metadata, :property_name) }
-      end
-
-      def updating_a_dependency_set?
-        dependencies.first.
-          requirements.
-          any? { |r| r.dig(:metadata, :dependency_set) }
-      end
-
-      def property_name
-        @property_name ||= dependencies.first.requirements.
-                           find { |r| r.dig(:metadata, :property_name) }&.
-                           dig(:metadata, :property_name)
-
-        raise "No property name!" unless @property_name
-
-        @property_name
-      end
-
-      def dependency_set
-        @dependency_set ||= dependencies.first.requirements.
-                            find { |r| r.dig(:metadata, :dependency_set) }&.
-                            dig(:metadata, :dependency_set)
-
-        raise "No dependency set!" unless @dependency_set
-
-        @dependency_set
-      end
-
-      def branch_version_suffix
-        dep = dependencies.first
-
-        if dep.removed?
-          "-removed"
-        elsif library? && ref_changed?(dep) && new_ref(dep)
-          new_ref(dep)
-        elsif library?
-          sanitized_requirement(dep)
-        else
-          new_version(dep)
-        end
-      end
-
-      def sanitized_requirement(dependency)
-        new_library_requirement(dependency).
-          delete(" ").
-          gsub("!=", "neq-").
-          gsub(">=", "gte-").
-          gsub("<=", "lte-").
-          gsub("~>", "tw-").
-          gsub("^", "tw-").
-          gsub("||", "or-").
-          gsub("~", "approx-").
-          gsub("~=", "tw-").
-          gsub(/==*/, "eq-").
-          gsub(">", "gt-").
-          gsub("<", "lt-").
-          gsub("*", "star").
-          gsub(",", "-and-")
-      end
-
-      def new_version(dependency)
-        # Version looks like a git SHA and we could be updating to a specific
-        # ref in which case we return that otherwise we return a shorthand sha
-        if dependency.version.match?(/^[0-9a-f]{40}$/)
-          return new_ref(dependency) if ref_changed?(dependency) && new_ref(dependency)
-
-          dependency.version[0..6]
-        elsif dependency.version == dependency.previous_version &&
-              package_manager == "docker"
-          dependency.requirements.
-            filter_map { |r| r.dig(:source, "digest") || r.dig(:source, :digest) }.
-            first.split(":").last[0..6]
-        else
-          dependency.version
-        end
-      end
-
-      def previous_ref(dependency)
-        previous_refs = dependency.previous_requirements.filter_map do |r|
-          r.dig(:source, "ref") || r.dig(:source, :ref)
-        end.uniq
-        return previous_refs.first if previous_refs.count == 1
-      end
-
-      def new_ref(dependency)
-        new_refs = dependency.requirements.filter_map do |r|
-          r.dig(:source, "ref") || r.dig(:source, :ref)
-        end.uniq
-        return new_refs.first if new_refs.count == 1
-      end
-
-      def ref_changed?(dependency)
-        # We could go from multiple previous refs (nil) to a single new ref
-        previous_ref(dependency) != new_ref(dependency)
-      end
-
-      def new_library_requirement(dependency)
-        updated_reqs =
-          dependency.requirements - dependency.previous_requirements
-
-        gemspec =
-          updated_reqs.find { |r| r[:file].match?(%r{^[^/]*\.gemspec$}) }
-        return gemspec[:requirement] if gemspec
-
-        updated_reqs.first[:requirement]
-      end
-
-      # TODO: Bring this in line with existing library checks that we do in the
-      # update checkers, which are also overriden by passing an explicit
-      # `requirements_update_strategy`.
-      #
-      # TODO re-use in MessageBuilder
-      def library?
-        dependencies.any? { |d| !d.appears_in_lockfile? }
-      end
-
-      def requirements_changed?(dependency)
-        (dependency.requirements - dependency.previous_requirements).any?
-      end
-
-      def sanitize_ref(ref)
-        # This isn't a complete implementation of git's ref validation, but it
-        # covers most cases that crop up. Its list of allowed characters is a
-        # bit stricter than git's, but that's for cosmetic reasons.
-        ref.
-          # Remove forbidden characters (those not already replaced elsewhere)
-          gsub(%r{[^A-Za-z0-9/\-_.(){}]}, "").
-          # Slashes can't be followed by periods
-          gsub(%r{/\.}, "/dot-").squeeze(".").squeeze("/").
-          # Trailing periods are forbidden
-          sub(/\.$/, "")
+      def strategy
+        @strategy ||=
+          if group_rule.nil?
+            SoloStrategy.new(
+              dependencies: dependencies,
+              files: files,
+              target_branch: target_branch,
+              separator: separator,
+              prefix: prefix,
+              max_length: max_length
+            )
+          else
+            GroupRuleStrategy.new(
+              dependencies: dependencies,
+              files: files,
+              target_branch: target_branch,
+              group_rule: group_rule,
+              separator: separator,
+              prefix: prefix,
+              max_length: max_length
+            )
+          end
       end
     end
   end
diff --git a/common/lib/dependabot/pull_request_creator/branch_namer/group_rule_strategy.rb b/common/lib/dependabot/pull_request_creator/branch_namer/group_rule_strategy.rb
new file mode 100644
index 00000000000..65b6f4d46ba
--- /dev/null
+++ b/common/lib/dependabot/pull_request_creator/branch_namer/group_rule_strategy.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Dependabot
+  class PullRequestCreator
+    class BranchNamer
+      class GroupRuleStrategy
+        def initialize(dependencies:, files:, target_branch:, group_rule:,
+                       separator: "/", prefix: "dependabot", max_length: nil)
+          @dependencies  = dependencies
+          @files         = files
+          @target_branch = target_branch
+          @group_rule    = group_rule
+          @separator     = separator
+          @prefix        = prefix
+          @max_length    = max_length
+        end
+
+        def new_branch_name
+          group_rule.name
+        end
+
+        private
+
+        attr_reader :group_rule
+      end
+    end
+  end
+end
diff --git a/common/lib/dependabot/pull_request_creator/branch_namer/solo_strategy.rb b/common/lib/dependabot/pull_request_creator/branch_namer/solo_strategy.rb
new file mode 100644
index 00000000000..5db9bd89229
--- /dev/null
+++ b/common/lib/dependabot/pull_request_creator/branch_namer/solo_strategy.rb
@@ -0,0 +1,208 @@
+# frozen_string_literal: true
+
+require "digest"
+
+require "dependabot/metadata_finders"
+
+module Dependabot
+  class PullRequestCreator
+    class BranchNamer
+      class SoloStrategy
+        attr_reader :dependencies, :files, :target_branch, :separator, :prefix, :max_length
+
+        def initialize(dependencies:, files:, target_branch:, separator: "/",
+                       prefix: "dependabot", max_length: nil)
+          @dependencies  = dependencies
+          @files         = files
+          @target_branch = target_branch
+          @separator     = separator
+          @prefix        = prefix
+          @max_length    = max_length
+        end
+
+        def new_branch_name
+          @name ||=
+            begin
+              dependency_name_part =
+                if dependencies.count > 1 && updating_a_property?
+                  property_name
+                elsif dependencies.count > 1 && updating_a_dependency_set?
+                  dependency_set.fetch(:group)
+                else
+                  dependencies.
+                    map(&:name).
+                    join("-and-").
+                    tr(":[]", "-").
+                    tr("@", "")
+                end
+
+              "#{dependency_name_part}-#{branch_version_suffix}"
+            end
+
+          # Some users need branch names without slashes
+          sanitized_name = sanitize_ref(File.join(prefixes, @name).gsub("/", separator))
+
+          # Shorten the ref in case users refs have length limits
+          if @max_length && (sanitized_name.length > @max_length)
+            sha = Digest::SHA1.hexdigest(sanitized_name)[0, @max_length]
+            sanitized_name[[@max_length - sha.size, 0].max..] = sha
+          end
+
+          sanitized_name
+        end
+
+        private
+
+        def prefixes
+          [
+            prefix,
+            package_manager,
+            files.first.directory.tr(" ", "-"),
+            target_branch
+          ].compact
+        end
+
+        def package_manager
+          dependencies.first.package_manager
+        end
+
+        def updating_a_property?
+          dependencies.first.
+            requirements.
+            any? { |r| r.dig(:metadata, :property_name) }
+        end
+
+        def updating_a_dependency_set?
+          dependencies.first.
+            requirements.
+            any? { |r| r.dig(:metadata, :dependency_set) }
+        end
+
+        def property_name
+          @property_name ||= dependencies.first.requirements.
+                             find { |r| r.dig(:metadata, :property_name) }&.
+                             dig(:metadata, :property_name)
+
+          raise "No property name!" unless @property_name
+
+          @property_name
+        end
+
+        def dependency_set
+          @dependency_set ||= dependencies.first.requirements.
+                              find { |r| r.dig(:metadata, :dependency_set) }&.
+                              dig(:metadata, :dependency_set)
+
+          raise "No dependency set!" unless @dependency_set
+
+          @dependency_set
+        end
+
+        def branch_version_suffix
+          dep = dependencies.first
+
+          if dep.removed?
+            "-removed"
+          elsif library? && ref_changed?(dep) && new_ref(dep)
+            new_ref(dep)
+          elsif library?
+            sanitized_requirement(dep)
+          else
+            new_version(dep)
+          end
+        end
+
+        def sanitized_requirement(dependency)
+          new_library_requirement(dependency).
+            delete(" ").
+            gsub("!=", "neq-").
+            gsub(">=", "gte-").
+            gsub("<=", "lte-").
+            gsub("~>", "tw-").
+            gsub("^", "tw-").
+            gsub("||", "or-").
+            gsub("~", "approx-").
+            gsub("~=", "tw-").
+            gsub(/==*/, "eq-").
+            gsub(">", "gt-").
+            gsub("<", "lt-").
+            gsub("*", "star").
+            gsub(",", "-and-")
+        end
+
+        def new_version(dependency)
+          # Version looks like a git SHA and we could be updating to a specific
+          # ref in which case we return that otherwise we return a shorthand sha
+          if dependency.version.match?(/^[0-9a-f]{40}$/)
+            return new_ref(dependency) if ref_changed?(dependency) && new_ref(dependency)
+
+            dependency.version[0..6]
+          elsif dependency.version == dependency.previous_version &&
+                package_manager == "docker"
+            dependency.requirements.
+              filter_map { |r| r.dig(:source, "digest") || r.dig(:source, :digest) }.
+              first.split(":").last[0..6]
+          else
+            dependency.version
+          end
+        end
+
+        def previous_ref(dependency)
+          previous_refs = dependency.previous_requirements.filter_map do |r|
+            r.dig(:source, "ref") || r.dig(:source, :ref)
+          end.uniq
+          return previous_refs.first if previous_refs.count == 1
+        end
+
+        def new_ref(dependency)
+          new_refs = dependency.requirements.filter_map do |r|
+            r.dig(:source, "ref") || r.dig(:source, :ref)
+          end.uniq
+          return new_refs.first if new_refs.count == 1
+        end
+
+        def ref_changed?(dependency)
+          # We could go from multiple previous refs (nil) to a single new ref
+          previous_ref(dependency) != new_ref(dependency)
+        end
+
+        def new_library_requirement(dependency)
+          updated_reqs =
+            dependency.requirements - dependency.previous_requirements
+
+          gemspec =
+            updated_reqs.find { |r| r[:file].match?(%r{^[^/]*\.gemspec$}) }
+          return gemspec[:requirement] if gemspec
+
+          updated_reqs.first[:requirement]
+        end
+
+        # TODO: Bring this in line with existing library checks that we do in the
+        # update checkers, which are also overriden by passing an explicit
+        # `requirements_update_strategy`.
+        #
+        # TODO re-use in MessageBuilder
+        def library?
+          dependencies.any? { |d| !d.appears_in_lockfile? }
+        end
+
+        def requirements_changed?(dependency)
+          (dependency.requirements - dependency.previous_requirements).any?
+        end
+
+        def sanitize_ref(ref)
+          # This isn't a complete implementation of git's ref validation, but it
+          # covers most cases that crop up. Its list of allowed characters is a
+          # bit stricter than git's, but that's for cosmetic reasons.
+          ref.
+            # Remove forbidden characters (those not already replaced elsewhere)
+            gsub(%r{[^A-Za-z0-9/\-_.(){}]}, "").
+            # Slashes can't be followed by periods
+            gsub(%r{/\.}, "/dot-").squeeze(".").squeeze("/").
+            # Trailing periods are forbidden
+            sub(/\.$/, "")
+        end
+      end
+    end
+  end
+end
diff --git a/common/spec/dependabot/group_rule_spec.rb b/common/spec/dependabot/group_rule_spec.rb
new file mode 100644
index 00000000000..e2443c38890
--- /dev/null
+++ b/common/spec/dependabot/group_rule_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "dependabot/group_rule"
+
+RSpec.describe Dependabot::GroupRule do
+  describe "#name" do
+    it "returns the name" do
+      my_group_rule_name = "Darren from work"
+      group_rule = described_class.new(my_group_rule_name)
+
+      expect(group_rule.name).to eq(my_group_rule_name)
+    end
+  end
+end
diff --git a/common/spec/dependabot/pull_request_creator/branch_namer/group_rule_strategy_spec.rb b/common/spec/dependabot/pull_request_creator/branch_namer/group_rule_strategy_spec.rb
new file mode 100644
index 00000000000..7e201659261
--- /dev/null
+++ b/common/spec/dependabot/pull_request_creator/branch_namer/group_rule_strategy_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "dependabot/pull_request_creator/branch_namer/group_rule_strategy"
+
+RSpec.describe Dependabot::PullRequestCreator::BranchNamer::GroupRuleStrategy do
+  describe "#new_branch_name" do
+    it "returns the name of the group rule" do
+      group_rule = double("GroupRule", name: "my_group_rule")
+      strategy = described_class.new(
+        dependencies: [],
+        files: [],
+        target_branch: "main",
+        group_rule: group_rule
+      )
+
+      expect(strategy.new_branch_name).to eq(group_rule.name)
+    end
+  end
+end
diff --git a/common/spec/dependabot/pull_request_creator/branch_namer/solo_strategy_spec.rb b/common/spec/dependabot/pull_request_creator/branch_namer/solo_strategy_spec.rb
new file mode 100644
index 00000000000..ba0fa4ba44e
--- /dev/null
+++ b/common/spec/dependabot/pull_request_creator/branch_namer/solo_strategy_spec.rb
@@ -0,0 +1,658 @@
+# frozen_string_literal: true
+
+require "octokit"
+require "spec_helper"
+require "dependabot/dependency"
+require "dependabot/dependency_file"
+require "dependabot/pull_request_creator/branch_namer/solo_strategy"
+
+RSpec.describe Dependabot::PullRequestCreator::BranchNamer::SoloStrategy do
+  subject(:namer) do
+    described_class.new(
+      dependencies: dependencies,
+      files: files,
+      target_branch: target_branch
+    )
+  end
+
+  let(:dependencies) { [dependency] }
+  let(:dependency) do
+    Dependabot::Dependency.new(
+      name: dependency_name,
+      version: dependency_version,
+      previous_version: previous_version,
+      package_manager: "dummy",
+      requirements: requirements,
+      previous_requirements: previous_requirements
+    )
+  end
+  let(:dependency_name) { "business" }
+  let(:dependency_version) { "1.5.0" }
+  let(:requirements) do
+    [{ file: "Gemfile", requirement: "~> 1.5.0", groups: [], source: nil }]
+  end
+  let(:previous_requirements) do
+    [{ file: "Gemfile", requirement: "~> 1.4.0", groups: [], source: nil }]
+  end
+  let(:previous_version) { "1.4.0" }
+  let(:files) { [gemfile] }
+  let(:target_branch) { nil }
+
+  let(:gemfile) do
+    Dependabot::DependencyFile.new(
+      name: "Gemfile",
+      content: fixture("ruby", "gemfiles", "Gemfile")
+    )
+  end
+
+  describe "#new_branch_name" do
+    subject(:new_branch_name) { namer.new_branch_name }
+    it { is_expected.to eq("dependabot/dummy/business-1.5.0") }
+
+    context "with directory" do
+      let(:gemfile) do
+        Dependabot::DependencyFile.new(
+          name: "Gemfile",
+          content: fixture("ruby", "gemfiles", "Gemfile"),
+          directory: directory
+        )
+      end
+      let(:directory) { "directory" }
+
+      it { is_expected.to eq("dependabot/dummy/directory/business-1.5.0") }
+
+      context "that starts with a dot" do
+        let(:directory) { ".directory" }
+
+        it "santizes the dot" do
+          expect(new_branch_name).
+            to eq("dependabot/dummy/dot-directory/business-1.5.0")
+        end
+      end
+    end
+
+    context "with a custom prefix" do
+      let(:namer) do
+        described_class.new(
+          dependencies: dependencies,
+          files: files,
+          target_branch: target_branch,
+          prefix: prefix
+        )
+      end
+      let(:prefix) { "myapp" }
+
+      it { is_expected.to eq("myapp/dummy/business-1.5.0") }
+    end
+
+    context "with a target branch" do
+      let(:target_branch) { "my-branch" }
+
+      it { is_expected.to eq("dependabot/dummy/my-branch/business-1.5.0") }
+    end
+
+    context "with a custom branch name separator" do
+      let(:namer) do
+        described_class.new(
+          dependencies: dependencies,
+          files: files,
+          target_branch: target_branch,
+          separator: "-"
+        )
+      end
+
+      it { is_expected.to eq("dependabot-dummy-business-1.5.0") }
+    end
+
+    context "with a maximum length" do
+      let(:namer) do
+        described_class.new(
+          dependencies: dependencies,
+          files: files,
+          target_branch: target_branch,
+          max_length: max_length
+        )
+      end
+
+      context "with a maximum length longer than branch name" do
+        let(:max_length) { 35 }
+
+        it { is_expected.to eq("dependabot/dummy/business-1.5.0") }
+        its(:length) { is_expected.to eq(31) }
+      end
+
+      context "with a maximum length shorter than branch name" do
+        let(:dependency_name) { "business-and-work-and-desks-and-tables-and-chairs-and-lunch" }
+
+        context "with a maximum length longer than sha1 length" do
+          let(:max_length) { 50 }
+
+          it { is_expected.to eq("dependabot#{Digest::SHA1.hexdigest("dependabot/dummy/#{dependency_name}-1.5.0")}") }
+          its(:length) { is_expected.to eq(50) }
+        end
+
+        context "with a maximum length equal than sha1 length" do
+          let(:max_length) { 40 }
+
+          it { is_expected.to eq(Digest::SHA1.hexdigest("dependabot/dummy/#{dependency_name}-1.5.0")) }
+          its(:length) { is_expected.to eq(40) }
+        end
+
+        context "with a maximum length shorter than sha1 length" do
+          let(:max_length) { 20 }
+
+          it { is_expected.to eq(Digest::SHA1.hexdigest("dependabot/dummy/#{dependency_name}-1.5.0")[0...20]) }
+          its(:length) { is_expected.to eq(20) }
+        end
+      end
+    end
+
+    context "with multiple dependencies" do
+      let(:dependencies) { [dependency, dep2] }
+      let(:dep2) do
+        Dependabot::Dependency.new(
+          name: "statesman",
+          version: "1.5.0",
+          previous_version: "1.4.0",
+          package_manager: "dummy",
+          requirements: [{
+            file: "Gemfile",
+            requirement: "~> 1.5.0",
+            groups: [],
+            source: nil
+          }],
+          previous_requirements: [{
+            file: "Gemfile",
+            requirement: "~> 1.4.0",
+            groups: [],
+            source: nil
+          }]
+        )
+      end
+
+      it { is_expected.to eq("dependabot/dummy/business-and-statesman-1.5.0") }
+
+      context "for a java property update" do
+        let(:files) { [pom] }
+        let(:pom) do
+          Dependabot::DependencyFile.new(name: "pom.xml", content: pom_content)
+        end
+        let(:pom_content) do
+          fixture("java", "poms", "property_pom.xml").
+            gsub("4.3.12.RELEASE", "23.6-jre")
+        end
+        let(:dependencies) do
+          [
+            Dependabot::Dependency.new(
+              name: "org.springframework:spring-beans",
+              version: "23.6-jre",
+              previous_version: "4.3.12.RELEASE",
+              requirements: [{
+                file: "pom.xml",
+                requirement: "23.6-jre",
+                groups: [],
+                source: nil,
+                metadata: { property_name: "springframework.version" }
+              }],
+              previous_requirements: [{
+                file: "pom.xml",
+                requirement: "4.3.12.RELEASE",
+                groups: [],
+                source: nil,
+                metadata: { property_name: "springframework.version" }
+              }],
+              package_manager: "maven"
+            ),
+            Dependabot::Dependency.new(
+              name: "org.springframework:spring-context",
+              version: "23.6-jre",
+              previous_version: "4.3.12.RELEASE",
+              requirements: [{
+                file: "pom.xml",
+                requirement: "23.6-jre",
+                groups: [],
+                source: nil,
+                metadata: { property_name: "springframework.version" }
+              }],
+              previous_requirements: [{
+                file: "pom.xml",
+                requirement: "4.3.12.RELEASE",
+                groups: [],
+                source: nil,
+                metadata: { property_name: "springframework.version" }
+              }],
+              package_manager: "maven"
+            )
+          ]
+        end
+
+        it do
+          is_expected.to eq("dependabot/maven/springframework.version-23.6-jre")
+        end
+      end
+
+      context "for a dependency set update" do
+        let(:dependencies) { [dependency, dep2] }
+        let(:dependency) do
+          Dependabot::Dependency.new(
+            name: "my.group:business",
+            version: "1.5.0",
+            previous_version: "1.4.0",
+            package_manager: "gradle",
+            requirements: [{
+              file: "Gemfile",
+              requirement: "~> 1.5.0",
+              groups: [],
+              source: nil,
+              metadata: {
+                dependency_set: { group: "my.group", version: "1.4.0" }
+              }
+            }],
+            previous_requirements: [{
+              file: "Gemfile",
+              requirement: "~> 1.4.0",
+              groups: [],
+              source: nil,
+              metadata: {
+                dependency_set: { group: "my.group", version: "1.4.0" }
+              }
+            }]
+          )
+        end
+        let(:dep2) do
+          Dependabot::Dependency.new(
+            name: "my.group:statesman",
+            version: "1.5.0",
+            previous_version: "1.4.0",
+            package_manager: "gradle",
+            requirements: [{
+              file: "Gemfile",
+              requirement: "~> 1.5.0",
+              groups: [],
+              source: nil,
+              metadata: {
+                dependency_set: { group: "my.group", version: "1.4.0" }
+              }
+            }],
+            previous_requirements: [{
+              file: "Gemfile",
+              requirement: "~> 1.4.0",
+              groups: [],
+              source: nil,
+              metadata: {
+                dependency_set: { group: "my.group", version: "1.4.0" }
+              }
+            }]
+          )
+        end
+
+        it { is_expected.to eq("dependabot/gradle/my.group-1.5.0") }
+      end
+    end
+
+    context "with a removed transitive dependency" do
+      let(:dependencies) { [removed_dep, parent_dep] }
+      let(:removed_dep) do
+        Dependabot::Dependency.new(
+          name: "business",
+          version: nil,
+          previous_version: "1.4.0",
+          package_manager: "dummy",
+          requirements: [],
+          previous_requirements: [],
+          removed: true
+        )
+      end
+      let(:parent_dep) do
+        Dependabot::Dependency.new(
+          name: "statesman",
+          version: "1.5.0",
+          previous_version: "1.4.0",
+          package_manager: "dummy",
+          requirements: [{
+            file: "Gemfile",
+            requirement: "~> 1.5.0",
+            groups: [],
+            source: nil
+          }],
+          previous_requirements: [{
+            file: "Gemfile",
+            requirement: "~> 1.4.0",
+            groups: [],
+            source: nil
+          }]
+        )
+      end
+
+      it { is_expected.to eq("dependabot/dummy/business-and-statesman--removed") }
+    end
+
+    context "with a : in the name" do
+      let(:dependency) do
+        Dependabot::Dependency.new(
+          name: "com.google.guava:guava",
+          version: "23.6-jre",
+          previous_version: "23.3-jre",
+          package_manager: "java",
+          requirements: [{
+            file: "pom.xml",
+            requirement: "23.6-jre",
+            groups: [],
+            source: nil
+          }],
+          previous_requirements: [{
+            file: "pom.xml",
+            requirement: "23.3-jre",
+            groups: [],
+            source: nil
+          }]
+        )
+      end
+
+      it "replaces the colon with a hyphen" do
+        expect(new_branch_name).
+          to eq("dependabot/java/com.google.guava-guava-23.6-jre")
+      end
+    end
+
+    context "with an @ in the name" do
+      let(:dependency) do
+        Dependabot::Dependency.new(
+          name: "@storybook/addon-knobs",
+          version: "5.1.9",
+          previous_version: "5.0.11",
+          package_manager: "npm_and_yarn",
+          requirements: []
+        )
+      end
+
+      it "strips @ character" do
+        expect(new_branch_name).
+          to eq("dependabot/npm_and_yarn/storybook/addon-knobs-5.1.9")
+      end
+    end
+
+    context "with square brackets in the name" do
+      let(:dependency) do
+        Dependabot::Dependency.new(
+          name: "werkzeug[watchdog]",
+          version: "0.16.0",
+          previous_version: "0.15.0",
+          package_manager: "pip",
+          requirements: []
+        )
+      end
+
+      it "replaces the brackets with hyphens" do
+        expect(new_branch_name).
+          to eq("dependabot/pip/werkzeug-watchdog--0.16.0")
+      end
+    end
+
+    context "with an invalid control character name" do
+      let(:dependency) do
+        Dependabot::Dependency.new(
+          name: "werk\1zeug",
+          version: "0.16.0",
+          previous_version: "0.15.0",
+          package_manager: "pip",
+          requirements: []
+        )
+      end
+
+      it "strips the invalid character" do
+        expect(new_branch_name).
+          to eq("dependabot/pip/werkzeug-0.16.0")
+      end
+    end
+
+    context "with a requirement only" do
+      let(:previous_version) { nil }
+      let(:requirements) do
+        [{
+          file: "Gemfile",
+          requirement: requirement_string,
+          groups: [],
+          source: nil
+        }]
+      end
+      let(:requirement_string) { "~> 1.5.0" }
+
+      it { is_expected.to eq("dependabot/dummy/business-tw-1.5.0") }
+
+      context "that has a trailing dot" do
+        let(:requirement_string) { "^7." }
+        it { is_expected.to eq("dependabot/dummy/business-tw-7") }
+      end
+    end
+
+    context "with SHA-1 versions" do
+      let(:dependency) do
+        Dependabot::Dependency.new(
+          name: "business",
+          version: new_version,
+          previous_version: previous_version,
+          package_manager: "dummy",
+          requirements: [{
+            file: "Gemfile",
+            requirement: nil,
+            groups: [],
+            source: {
+              type: "git",
+              url: "https://github.com/gocardless/business",
+              ref: new_ref
+            }
+          }],
+          previous_requirements: [{
+            file: "Gemfile",
+            requirement: nil,
+            groups: [],
+            source: {
+              type: "git",
+              url: "https://github.com/gocardless/business",
+              ref: old_ref
+            }
+          }]
+        )
+      end
+      let(:new_version) { "cff701b3bfb182afc99a85657d7c9f3d6c1ccce2" }
+      let(:previous_version) { "2468a02a6230e59ed1232d95d1ad3ef157195b03" }
+      let(:new_ref) { nil }
+      let(:old_ref) { nil }
+
+      it "truncates the version" do
+        expect(new_branch_name).to eq("dependabot/dummy/business-cff701b")
+      end
+
+      context "due to a ref change" do
+        let(:new_ref) { "v1.1.0" }
+        let(:old_ref) { "v1.0.0" }
+
+        it "includes the ref rather than the commit" do
+          expect(new_branch_name).to eq("dependabot/dummy/business-v1.1.0")
+        end
+
+        context "for a library" do
+          let(:new_version) { nil }
+          let(:previous_version) { nil }
+
+          it "includes the ref rather than the commit" do
+            expect(new_branch_name).to eq("dependabot/dummy/business-v1.1.0")
+          end
+        end
+      end
+    end
+
+    context "with a Docker digest update" do
+      let(:dependency) do
+        Dependabot::Dependency.new(
+          name: "ubuntu",
+          version: "17.10",
+          previous_version: previous_version,
+          package_manager: "docker",
+          requirements: [{
+            file: "Dockerfile",
+            requirement: nil,
+            groups: [],
+            source: {
+              type: "digest",
+              digest: "sha256:18305429afa14ea462f810146ba44d4363ae76e4c8d" \
+                      "fc38288cf73aa07485005"
+            }
+          }],
+          previous_requirements: [{
+            file: "Dockerfile",
+            requirement: nil,
+            groups: [],
+            source: {
+              type: "digest",
+              digest: "sha256:2167a21baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \
+                      "aaaaaaaaaaaaaaaaaaaaa"
+            }
+          }]
+        )
+      end
+      let(:previous_version) { "17.10" }
+
+      it "truncates the version" do
+        expect(new_branch_name).to eq("dependabot/docker/ubuntu-1830542")
+      end
+
+      context "due to a tag change" do
+        let(:previous_version) { "17.04" }
+
+        it "includes the tag rather than the SHA" do
+          expect(new_branch_name).to eq("dependabot/docker/ubuntu-17.10")
+        end
+      end
+    end
+
+    context "with multiple previous source refs" do
+      let(:dependency_name) { "actions/checkout" }
+      let(:dependency_version) { "aabbfeb2ce60b5bd82389903509092c4648a9713" }
+      let(:previous_version) { nil }
+      let(:requirements) do
+        [{
+          requirement: nil,
+          groups: [],
+          file: ".github/workflows/workflow.yml",
+          metadata: { declaration_string: "actions/checkout@v2.1.0" },
+          source: {
+            type: "git",
+            url: "https://github.com/actions/checkout",
+            ref: "v2.2.0",
+            branch: nil
+          }
+        }, {
+          requirement: nil,
+          groups: [],
+          file: ".github/workflows/workflow.yml",
+          metadata: { declaration_string: "actions/checkout@master" },
+          source: {
+            type: "git",
+            url: "https://github.com/actions/checkout",
+            ref: "v2.2.0",
+            branch: nil
+          }
+        }]
+      end
+      let(:previous_requirements) do
+        [{
+          requirement: nil,
+          groups: [],
+          file: ".github/workflows/workflow.yml",
+          metadata: { declaration_string: "actions/checkout@v2.1.0" },
+          source: {
+            type: "git",
+            url: "https://github.com/actions/checkout",
+            ref: "v2.1.0",
+            branch: nil
+          }
+        }, {
+          requirement: nil,
+          groups: [],
+          file: ".github/workflows/workflow.yml",
+          metadata: { declaration_string: "actions/checkout@master" },
+          source: {
+            type: "git",
+            url: "https://github.com/actions/checkout",
+            ref: "master",
+            branch: nil
+          }
+        }]
+      end
+
+      it "includes the new ref" do
+        expect(new_branch_name).to eq(
+          "dependabot/dummy/actions/checkout-v2.2.0"
+        )
+      end
+    end
+
+    context "when going from a git ref to a version requirement" do
+      let(:dependency_name) { "business" }
+      let(:dependency_version) { "v2.0.0" }
+      let(:previous_version) { nil }
+      let(:requirements) do
+        [{
+          requirement: "~> 2.0.0",
+          groups: [],
+          file: "Gemfile",
+          source: nil
+        }]
+      end
+      let(:previous_requirements) do
+        [{
+          requirement: nil,
+          groups: [],
+          file: "Gemfile",
+          source: {
+            type: "git",
+            url: "https://github.com/gocardless/business",
+            ref: "v1.2.0",
+            branch: nil
+          }
+        }]
+      end
+
+      it "includes the new version" do
+        expect(new_branch_name).to eq(
+          "dependabot/dummy/business-tw-2.0.0"
+        )
+      end
+    end
+
+    context "when going from a version requirement to a git ref" do
+      let(:dependency_name) { "business" }
+      let(:dependency_version) { "aabbfeb2ce60b5bd82389903509092c4648a9713" }
+      let(:previous_version) { "v2.0.0" }
+      let(:requirements) do
+        [{
+          requirement: nil,
+          groups: [],
+          file: "Gemfile",
+          source: {
+            type: "git",
+            url: "https://github.com/gocardless/business",
+            ref: "v2.2.0",
+            branch: nil
+          }
+        }]
+      end
+      let(:previous_requirements) do
+        [{
+          requirement: "~> 2.0.0",
+          groups: [],
+          file: "Gemfile",
+          source: nil
+        }]
+      end
+
+      it "includes the new ref" do
+        expect(new_branch_name).to eq(
+          "dependabot/dummy/business-v2.2.0"
+        )
+      end
+    end
+  end
+end
diff --git a/common/spec/dependabot/pull_request_creator/branch_namer_spec.rb b/common/spec/dependabot/pull_request_creator/branch_namer_spec.rb
index 3b6d8b1170c..9a52e690ccd 100644
--- a/common/spec/dependabot/pull_request_creator/branch_namer_spec.rb
+++ b/common/spec/dependabot/pull_request_creator/branch_namer_spec.rb
@@ -5,6 +5,8 @@
 require "dependabot/dependency"
 require "dependabot/dependency_file"
 require "dependabot/pull_request_creator/branch_namer"
+require "dependabot/pull_request_creator/branch_namer/solo_strategy"
+require "dependabot/pull_request_creator/branch_namer/group_rule_strategy"
 
 RSpec.describe Dependabot::PullRequestCreator::BranchNamer do
   subject(:namer) do
@@ -654,5 +656,44 @@
         )
       end
     end
+
+    context "when no group rule is present" do
+      it "delegates to a solo strategy" do
+        strategy = instance_double(described_class::SoloStrategy)
+        allow(described_class::SoloStrategy).to receive(:new).and_return(strategy)
+
+        branch_namer =
+          described_class.new(
+            dependencies: dependencies,
+            files: files,
+            target_branch: target_branch,
+            group_rule: nil
+          )
+
+        expect(strategy).to receive(:new_branch_name)
+
+        branch_namer.new_branch_name
+      end
+    end
+
+    context "when a group rule is present" do
+      it "delegates to a group rule strategy" do
+        strategy = instance_double(described_class::GroupRuleStrategy)
+        allow(described_class::GroupRuleStrategy).to receive(:new).and_return(strategy)
+
+        group_rule = double("GroupRule", name: "my_group_rule")
+        branch_namer =
+          described_class.new(
+            dependencies: dependencies,
+            files: files,
+            target_branch: target_branch,
+            group_rule: group_rule
+          )
+
+        expect(strategy).to receive(:new_branch_name)
+
+        branch_namer.new_branch_name
+      end
+    end
   end
 end