diff --git a/bloom/generators/rosdebian.py b/bloom/generators/rosdebian.py
index 2df405db..af03b161 100644
--- a/bloom/generators/rosdebian.py
+++ b/bloom/generators/rosdebian.py
@@ -37,7 +37,6 @@
 from bloom.generators.common import generate_substitutions_from_package
 from bloom.generators.common import sanitize_package_name
 
-
 from bloom.generators.debian import DebianGenerator
 from bloom.generators.debian import format_description
 from bloom.generators.debian import format_depends
@@ -81,7 +80,7 @@ def missing_dep_resolver(key, peer_packages, os_name, os_version, ros_distro):
 
     @staticmethod
     def get_subs_hook(subs, package, rosdistro, releaser_history=None):
-        subs = DebianGenerator.get_subs_hook(subs, package, releaser_history)
+        subs = DebianGenerator.get_subs_hook(subs, package, rosdistro, releaser_history=releaser_history)
         subs['Package'] = rosify_package_name(subs['Package'], rosdistro)
 
         # ROS 2 specific bloom extensions.
@@ -127,8 +126,7 @@ def generate_branching_arguments(self, package, branch):
         return args
 
     def get_release_tag(self, data):
-        return 'release/{0}/{1}/{2}-{3}'\
-            .format(self.rosdistro, data['Name'], data['Version'], self.inc)
+        return 'release/{0}/{1}/{2}-{3}'.format(self.rosdistro, data['Name'], data['Version'], self.inc)
 
 
 def rosify_package_name(name, rosdistro):
diff --git a/bloom/generators/rosrpm.py b/bloom/generators/rosrpm.py
index f672ff4c..3dc3b4fc 100644
--- a/bloom/generators/rosrpm.py
+++ b/bloom/generators/rosrpm.py
@@ -79,7 +79,7 @@ def missing_dep_resolver(key, peer_packages, os_name, os_version, ros_distro):
 
     @staticmethod
     def get_subs_hook(subs, package, rosdistro, releaser_history=None):
-        subs = RpmGenerator.get_subs_hook(subs, package, releaser_history)
+        subs = RpmGenerator.get_subs_hook(subs, package, rosdistro, releaser_history=releaser_history)
         subs['Package'] = rosify_package_name(subs['Package'], rosdistro)
         return subs
 
@@ -93,8 +93,7 @@ def generate_branching_arguments(self, package, branch):
         return args
 
     def get_release_tag(self, data):
-        return 'release/{0}/{1}/{2}-{3}'\
-            .format(self.rosdistro, data['Name'], data['Version'], self.inc)
+        return 'release/{0}/{1}/{2}-{3}'.format(self.rosdistro, data['Name'], data['Version'], self.inc)
 
 
 def rosify_package_name(name, rosdistro):
diff --git a/test/unit_tests/test_generators/test_common/test_generator.py b/test/unit_tests/test_generators/test_common/test_generator.py
index 5d866de3..92fc3b65 100644
--- a/test/unit_tests/test_generators/test_common/test_generator.py
+++ b/test/unit_tests/test_generators/test_common/test_generator.py
@@ -10,7 +10,7 @@
 from ....utils.common import temporary_directory
 from ....utils.common import user
 
-from bloom.generators.debian.generator import PackageManagerGenerator
+from bloom.generators.common import PackageManagerGenerator
 
 from bloom.util import code