diff --git a/experimental/examples/wheel/wheel_test.py b/experimental/examples/wheel/wheel_test.py
index f5d9b19897..318367bda6 100644
--- a/experimental/examples/wheel/wheel_test.py
+++ b/experimental/examples/wheel/wheel_test.py
@@ -75,7 +75,7 @@ def test_customized_wheel(self):
             self.assertEquals(record_contents, b"""\
 example_customized-0.0.1.dist-info/METADATA,sha256=TeeEmokHE2NWjkaMcVJuSAq4_AXUoIad2-SLuquRmbg,372
 example_customized-0.0.1.dist-info/RECORD,,
-example_customized-0.0.1.dist-info/WHEEL,sha256=F01lGfVCzcXUzzQHzUkBmXAcu_TXd5zqMLrvrspncJo,85
+example_customized-0.0.1.dist-info/WHEEL,sha256=sobxWSyDDkdg_rinUth-jxhXHqoNqlmNMJY3aTZn2Us,91
 example_customized-0.0.1.dist-info/entry_points.txt,sha256=mEWsq4sMoyqR807QV8Z3KPocGfKvtgTo1lBFTRb6b78,150
 experimental/examples/wheel/lib/data.txt,sha256=9vJKEdfLu8bZRArKLroPZJh1XKkK3qFMXiM79MBL2Sg,12
 experimental/examples/wheel/lib/module_with_data.py,sha256=K_IGAq_CHcZX0HUyINpD1hqSKIEdCn58d9E9nhWF2EA,636
@@ -84,7 +84,7 @@ def test_customized_wheel(self):
 """)
             self.assertEquals(wheel_contents, b"""\
 Wheel-Version: 1.0
-Generator: wheelmaker 1.0
+Generator: bazel-wheelmaker 1.0
 Root-Is-Purelib: true
 Tag: py3-none-any
 """)
diff --git a/experimental/python/wheel.bzl b/experimental/python/wheel.bzl
index d1c46d65c0..79cbc97e0d 100644
--- a/experimental/python/wheel.bzl
+++ b/experimental/python/wheel.bzl
@@ -318,7 +318,7 @@ tries to locate `.runfiles` directory which is not packaged in the wheel.
             "_wheelmaker": attr.label(
                 executable = True,
                 cfg = "host",
-                default = "//experimental/rules_python:wheelmaker",
+                default = "//experimental/tools:wheelmaker",
             ),
         },
         _distribution_attrs,
diff --git a/experimental/rules_python/BUILD b/experimental/tools/BUILD
similarity index 100%
rename from experimental/rules_python/BUILD
rename to experimental/tools/BUILD
diff --git a/experimental/rules_python/wheelmaker.py b/experimental/tools/wheelmaker.py
similarity index 99%
rename from experimental/rules_python/wheelmaker.py
rename to experimental/tools/wheelmaker.py
index 4f69b62f4d..38fb1228f5 100644
--- a/experimental/rules_python/wheelmaker.py
+++ b/experimental/tools/wheelmaker.py
@@ -122,7 +122,7 @@ def add_wheelfile(self):
         # TODO(pstradomski): Support non-purelib wheels.
         wheel_contents = """\
 Wheel-Version: 1.0
-Generator: wheelmaker 1.0
+Generator: bazel-wheelmaker 1.0
 Root-Is-Purelib: true
 """
         for tag in self.disttags():