diff --git a/direct/src/showutil/dist.py b/direct/src/showutil/dist.py
index 6879f59717..63badf8fd9 100644
--- a/direct/src/showutil/dist.py
+++ b/direct/src/showutil/dist.py
@@ -35,7 +35,7 @@ def find_packages(whlfile):
     ]
 
 
-class build_p3d(distutils.core.Command):
+class build_apps(distutils.core.Command):
     user_options = [] # TODO
 
     def initialize_options(self):
@@ -255,7 +255,7 @@ class build_p3d(distutils.core.Command):
                 distutils.file_util.copy_file(src, dst)
 
 
-class bdist_p3d_archive(distutils.core.Command):
+class bdist_apps(distutils.core.Command):
     user_options = []
 
     def initialize_options(self):
@@ -265,14 +265,14 @@ class bdist_p3d_archive(distutils.core.Command):
         pass
 
     def run(self):
-        build_cmd = self.get_finalized_command('build_p3d')
+        build_cmd = self.get_finalized_command('build_apps')
         if not build_cmd.deploy_platforms:
             platforms = [p3d.PandaSystem.get_platform()]
         else:
             platforms = build_cmd.deploy_platforms
         build_base = build_cmd.build_base
 
-        self.run_command('build_p3d')
+        self.run_command('build_apps')
         os.chdir(build_base)
 
         for platform in platforms:
@@ -292,6 +292,6 @@ class bdist_p3d_archive(distutils.core.Command):
 
 def setup(**attrs):
     commandClasses = attrs.setdefault("cmdclass", {})
-    commandClasses['build_p3d'] = build_p3d
-    commandClasses['bdist_p3d_archive'] = bdist_p3d_archive
+    commandClasses['build_apps'] = build_apps
+    commandClasses['bdist_apps'] = bdist_apps
     distutils.core.setup(**attrs)
diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py
index ce4a55227f..2fd7efea02 100644
--- a/makepanda/makewheel.py
+++ b/makepanda/makewheel.py
@@ -578,8 +578,8 @@ def makewheel(version, output_dir, platform=default_platform):
             entry_points += '{0} = panda3d_tools:{1}\n'.format(basename, funcname)
             tools_init += '{0} = lambda: _exec_tool({1!r})\n'.format(funcname, file)
     entry_points += '[distutils.commands]\n'
-    entry_points += 'build_p3d = direct.showutil.dist:build_p3d\n'
-    entry_points += 'bdist_p3d_archive = direct.showutil.dist:bdist_p3d_archive\n'
+    entry_points += 'build_apps = direct.showutil.dist:build_apps\n'
+    entry_points += 'bdist_apps = direct.showutil.dist:bdist_apps\n'
 
     whl.write_file_data('panda3d_tools/__init__.py', PANDA3D_TOOLS_INIT.format(tools_init))
 
diff --git a/samples/asteroids/setup.py b/samples/asteroids/setup.py
index e29f0ed104..c54f43a071 100644
--- a/samples/asteroids/setup.py
+++ b/samples/asteroids/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
 setup(
     name="asteroids",
     options = {
-        'build_p3d': {
+        'build_apps': {
             'directories': ['.'],
             'exclude_paths': ['build', 'setup.py', 'requirements.txt', 'wheels'],
             'gui_apps': {