diff --git a/src/olympia/abuse/tests/test_actions.py b/src/olympia/abuse/tests/test_actions.py
index 65c4437705bc..a5d28255a5cb 100644
--- a/src/olympia/abuse/tests/test_actions.py
+++ b/src/olympia/abuse/tests/test_actions.py
@@ -1574,7 +1574,7 @@ def test_execute_action_unlisted(self):
         assert len(mail.outbox) == 3
         self._test_reporter_takedown_email(subject)
 
-    def test_execute_action_both_channels(self):
+    def test_execute_action_listed_unlisted(self):
         # Only make one of the two versions targeted unlisted.
         self.version.update(channel=amo.CHANNEL_UNLISTED)
         subject = self._test_reject_version(content_review=False)
@@ -3188,7 +3188,7 @@ def test_execute_action_no_files_awaiting_review(self):
 
     def test_execute_action_unlisted(self):
         # testing the case of: unlisted versions; human review
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.addon.status == amo.STATUS_NULL
         ActivityLog.objects.all().delete()
         for version in (self.version, self.old_version):
diff --git a/src/olympia/abuse/tests/test_models.py b/src/olympia/abuse/tests/test_models.py
index 82995b567e8e..574d29d6183b 100644
--- a/src/olympia/abuse/tests/test_models.py
+++ b/src/olympia/abuse/tests/test_models.py
@@ -526,10 +526,13 @@ def test_is_individually_actionable(self):
         )
         assert report.is_individually_actionable is True
 
-        self.make_addon_unlisted(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         assert report.is_individually_actionable is False
 
-        self.make_addon_listed(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_ENTERPRISE)
+        assert report.is_individually_actionable is False
+
+        self.change_channel_for_addon(addon, amo.CHANNEL_LISTED)
         Version.objects.get(version=report.addon_version).delete()
         assert report.is_individually_actionable is True
 
@@ -4352,7 +4355,7 @@ def test_requeue_held_action_existing_job(self):
 
     def test_requeue_held_action_existing_job_unlisted(self):
         addon = addon_factory()
-        self.make_addon_unlisted(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         user = user_factory()
         job = CinderJob.objects.create(target_addon=addon)
         decision = ContentDecision.objects.create(
diff --git a/src/olympia/abuse/tests/test_views.py b/src/olympia/abuse/tests/test_views.py
index fa8b7a1b62fa..9cc66653e753 100644
--- a/src/olympia/abuse/tests/test_views.py
+++ b/src/olympia/abuse/tests/test_views.py
@@ -571,7 +571,7 @@ def test_reportable_reason_does_call_if_version_listed(self, task_mock):
     def test_reportable_reason_does_not_call_if_version_unlisted(self, task_mock):
         addon = addon_factory(guid='@badman')
         version = addon.current_version
-        self.make_addon_unlisted(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         self._setup_reportable_reason(
             'hateful_violent_deceptive',
             addon=addon,
diff --git a/src/olympia/access/tests.py b/src/olympia/access/tests.py
index bccd3b13ad02..76a2999e1be6 100644
--- a/src/olympia/access/tests.py
+++ b/src/olympia/access/tests.py
@@ -267,8 +267,8 @@ def test_perm_reviewertools_view(self):
         assert not is_reviewer(self.user, self.addon, allow_content_reviewers=False)
 
     def test_perm_reviewertools_unlisted_view(self):
-        self.make_addon_unlisted(self.addon)
-        self.make_addon_unlisted(self.statictheme)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
+        self.change_channel_for_addon(self.statictheme, amo.CHANNEL_UNLISTED)
         self.grant_permission(self.user, amo.permissions.REVIEWER_TOOLS_UNLISTED_VIEW)
         assert is_user_any_kind_of_reviewer(self.user, allow_viewers=True)
         assert not is_user_any_kind_of_reviewer(self.user)
diff --git a/src/olympia/activity/models.py b/src/olympia/activity/models.py
index 72013908919c..3d0f7322ad4f 100644
--- a/src/olympia/activity/models.py
+++ b/src/olympia/activity/models.py
@@ -868,8 +868,8 @@ def get_absolute_url(obj):
                 amo.LOG.REJECT_LISTING_CONTENT.id,
             ):
                 reverse_args.insert(0, 'content')
-            elif channel and channel == amo.CHANNEL_UNLISTED:
-                reverse_args.insert(0, 'unlisted')
+            elif channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE):
+                reverse_args.insert(0, amo.CHANNEL_CHOICES_API[channel])
             addon = format_html(
                 '<a href="{0}">{1}</a>',
                 reverse('reviewers.review', args=reverse_args),
diff --git a/src/olympia/activity/tests/test_models.py b/src/olympia/activity/tests/test_models.py
index 5d0e48ca8a26..7c87f7478350 100644
--- a/src/olympia/activity/tests/test_models.py
+++ b/src/olympia/activity/tests/test_models.py
@@ -280,7 +280,7 @@ def test_addon_log_unlisted_addon(self):
         addon = Addon.objects.get()
         # Get the url before the addon is changed to unlisted.
         url_path = addon.get_url_path()
-        self.make_addon_unlisted(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         # Delete the status change log entry from making versions unlisted.
         ActivityLog.objects.for_addons(addon).delete()
         ActivityLog.objects.create(amo.LOG.CREATE_ADDON, (Addon, addon.id))
@@ -288,6 +288,17 @@ def test_addon_log_unlisted_addon(self):
         assert len(entries) == 1
         assert url_path not in str(entries[0])
 
+    def test_addon_log_enterprise_addon(self):
+        addon = Addon.objects.get()
+        url_path = addon.get_url_path()
+        self.change_channel_for_addon(addon, amo.CHANNEL_ENTERPRISE)
+        # Delete the status change log entry from making versions enterprise.
+        ActivityLog.objects.for_addons(addon).delete()
+        ActivityLog.objects.create(amo.LOG.CREATE_ADDON, (Addon, addon.id))
+        entries = ActivityLog.objects.for_addons(addon)
+        assert len(entries) == 1
+        assert url_path not in str(entries[0])
+
     def test_fancy_rendering(self):
         """HTML for Rating, and Collection."""
         user = UserProfile.objects.create()
@@ -559,7 +570,18 @@ def test_version_log_unlisted_addon(self):
         version = Version.objects.all()[0]
         # Get the url before the addon is changed to unlisted.
         url_path = version.get_url_path()
-        self.make_addon_unlisted(version.addon)
+        self.change_channel_for_addon(version.addon, amo.CHANNEL_UNLISTED)
+        ActivityLog.objects.create(
+            amo.LOG.REJECT_VERSION, version.addon, version, user=self.request.user
+        )
+        entries = ActivityLog.objects.for_versions(version)
+        assert len(entries) == 1
+        assert url_path not in str(entries[0])
+
+    def test_version_log_enterprise_addon(self):
+        version = Version.objects.all()[0]
+        url_path = version.get_url_path()
+        self.change_channel_for_addon(version.addon, amo.CHANNEL_ENTERPRISE)
         ActivityLog.objects.create(
             amo.LOG.REJECT_VERSION, version.addon, version, user=self.request.user
         )
diff --git a/src/olympia/activity/tests/test_views.py b/src/olympia/activity/tests/test_views.py
index 46a8e487c4d7..0e04fd3fc6e3 100644
--- a/src/olympia/activity/tests/test_views.py
+++ b/src/olympia/activity/tests/test_views.py
@@ -97,25 +97,25 @@ def test_get_not_public_developer(self):
         assert response.status_code == 200
 
     def test_get_not_listed_simple_reviewer(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self._login_reviewer()
         response = self.client.get(self.url)
         assert response.status_code == 403
 
     def test_get_not_listed_specific_reviewer(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self._login_reviewer(permission=amo.permissions.ADDONS_REVIEW_UNLISTED)
         response = self.client.get(self.url)
         assert response.status_code == 200
 
     def test_get_not_listed_unlisted_viewer(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self._login_reviewer(permission=amo.permissions.REVIEWER_TOOLS_UNLISTED_VIEW)
         response = self.client.get(self.url)
         assert response.status_code == 200
 
     def test_get_not_listed_author(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self._login_developer()
         response = self.client.get(self.url)
         assert response.status_code == 200
@@ -511,7 +511,7 @@ def test_developer_reply_listed(self):
         )
 
     def test_developer_reply_unlisted(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self._test_developer_reply()
         self.assertCloseToNow(
             self.version.due_date,
@@ -558,7 +558,7 @@ def test_reviewer_reply_listed(self):
         self._test_reviewer_reply(amo.permissions.ADDONS_REVIEW)
 
     def test_reviewer_reply_unlisted(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self._test_reviewer_reply(amo.permissions.ADDONS_REVIEW_UNLISTED)
 
     def test_reply_to_deleted_addon_is_404(self):
@@ -618,7 +618,7 @@ def test_reviewer_can_reply_to_disabled_version_listed(self):
         self._test_reviewer_reply(amo.permissions.ADDONS_REVIEW)
 
     def test_reviewer_can_reply_to_disabled_version_unlisted(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.version.file.update(status=amo.STATUS_DISABLED)
         self._test_reviewer_reply(amo.permissions.ADDONS_REVIEW_UNLISTED)
 
diff --git a/src/olympia/addons/admin.py b/src/olympia/addons/admin.py
index c074f9dfd135..d7a8af211c4d 100644
--- a/src/olympia/addons/admin.py
+++ b/src/olympia/addons/admin.py
@@ -377,8 +377,8 @@ class Media:
     )
 
     def get_queryset_annotations(self):
-        # Add annotation for _unlisted_versions_exists/_listed_versions_exists
-        # to avoid repeating those queries for each add-on in the list.
+        # Add annotation for _{channel}_versions_exists to avoid repeating
+        # those queries for each add-on in the list.
         sub_qs = Version.unfiltered.filter(addon=OuterRef('pk')).values_list('id')
         annotations = {
             '_unlisted_versions_exists': Exists(
@@ -448,8 +448,8 @@ def total_ratings_link(self, obj):
 
     def reviewer_links(self, obj):
         links = []
-        # _has_listed_versions_exists and _has_unlisted_versions_exists are
-        # provided by annotations made in get_queryset()
+        # _has_{channel}_versions_exists is provided by annotations
+        # made in get_queryset()
         if obj._listed_versions_exists:
             links.append(
                 (
diff --git a/src/olympia/addons/management/commands/process_addons.py b/src/olympia/addons/management/commands/process_addons.py
index b9a90d36dfa5..e911f42dda07 100644
--- a/src/olympia/addons/management/commands/process_addons.py
+++ b/src/olympia/addons/management/commands/process_addons.py
@@ -171,10 +171,10 @@ def add_arguments(self, parser):
             action='store',
             dest='channel',
             type=str,
-            choices=('listed', 'unlisted'),
+            choices=amo.CHANNEL_CHOICES_API.values(),
             help=(
-                'Only select add-ons who have either listed or unlisted '
-                'versions. Add-ons that have both will be returned too.'
+                'Only select add-ons who have versions in a specific channel.'
+                'Add-ons that have multiple will be returned too.'
             ),
         )
 
diff --git a/src/olympia/addons/tests/test_decorators.py b/src/olympia/addons/tests/test_decorators.py
index 30aa7df541af..4f3cc8f4504c 100644
--- a/src/olympia/addons/tests/test_decorators.py
+++ b/src/olympia/addons/tests/test_decorators.py
@@ -3,6 +3,7 @@
 
 from django import http
 
+from olympia import amo
 from olympia.addons import decorators as dec
 from olympia.addons.models import Addon
 from olympia.amo.tests import TestCase, addon_factory
@@ -152,7 +153,7 @@ def setUp(self):
     )
     def test_unlisted_addon(self):
         """Return a 404 for non authorized access."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         with self.assertRaises(http.Http404):
             self.view(self.request, self.addon.slug)
 
@@ -164,7 +165,7 @@ def test_unlisted_addon(self):
     )
     def test_unlisted_addon_owner(self):
         """Addon owners have access."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.view(self.request, self.addon.slug) == mock.sentinel.OK
         request, addon = self.func.call_args[0]
         assert addon == self.addon
@@ -177,7 +178,7 @@ def test_unlisted_addon_owner(self):
     )
     def test_unlisted_addon_unlisted_admin(self):
         """Unlisted addon reviewers have access."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.view(self.request, self.addon.slug) == mock.sentinel.OK
         request, addon = self.func.call_args[0]
         assert addon == self.addon
diff --git a/src/olympia/addons/tests/test_models.py b/src/olympia/addons/tests/test_models.py
index 6d45d401ad49..4ea4968bf97a 100644
--- a/src/olympia/addons/tests/test_models.py
+++ b/src/olympia/addons/tests/test_models.py
@@ -260,12 +260,12 @@ def test_managers_not_disabled_by_mozilla(self):
         assert self.addon not in Addon.unfiltered.not_disabled_by_mozilla()
 
     def test_managers_unlisted(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.addon in Addon.objects.all()
         assert self.addon in Addon.unfiltered.all()
 
     def test_managers_unlisted_deleted(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.addon.update(status=amo.STATUS_DELETED)
         assert self.addon not in Addon.objects.all()
         assert self.addon in Addon.unfiltered.all()
@@ -296,7 +296,7 @@ def test_filter_for_many_to_many(self):
         # Addon shouldn't be listed in collection.addons if it's deleted.
 
         # Unlisted.
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         collection = Collection.objects.get(pk=collection.pk)
         assert collection.addons.get() == self.addon
 
@@ -306,7 +306,7 @@ def test_filter_for_many_to_many(self):
         assert collection.addons.count() == 0
 
         # Only deleted.
-        self.make_addon_listed(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_LISTED)
         collection = Collection.objects.get(pk=collection.pk)
         assert collection.addons.count() == 0
 
@@ -318,7 +318,7 @@ def test_no_filter_for_relations(self):
         # Deleted or unlisted, version.addon should still work.
 
         # Unlisted.
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version = Version.objects.get(pk=version.pk)  # Reload from db.
         assert version.addon == self.addon
 
@@ -328,7 +328,7 @@ def test_no_filter_for_relations(self):
         assert version.addon == self.addon
 
         # Only deleted.
-        self.make_addon_listed(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_LISTED)
         version = Version.objects.get(pk=version.pk)  # Reload from db.
         assert version.addon == self.addon
 
@@ -1481,7 +1481,7 @@ def test_listed_has_complete_metadata_no_license(self):
 
     def test_unlisted_has_complete_metadata(self):
         addon = Addon.objects.get(id=3615)
-        self.make_addon_unlisted(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         assert addon.has_complete_metadata()  # Confirm complete already.
 
         # Clear everything
@@ -2161,7 +2161,7 @@ def get_rvs(channel):
         assert get_rvs(amo.CHANNEL_LISTED) == []
         assert get_rvs(amo.CHANNEL_UNLISTED) == []
 
-        self.make_addon_unlisted(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         File.objects.filter(version__addon=addon).update(status=amo.STATUS_APPROVED)
         assert addon.reload().current_version is None
         assert get_rvs(amo.CHANNEL_LISTED) == []
@@ -2367,7 +2367,7 @@ def test_dont_run_narc_first_author(self, run_narc_on_version_mock):
     def test_dont_run_narc_no_listed_version(self, run_narc_on_version_mock):
         self.create_switch('enable-narc', active=True)
         addon = addon_factory(users=[user_factory()])
-        self.make_addon_unlisted(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         addon.addonuser_set.create(user=user_factory())
         assert run_narc_on_version_mock.delay.call_count == 0
 
@@ -3129,7 +3129,7 @@ def test_find_latest_non_rejected_listed_version_no_deleted(self):
         assert self.addon.find_latest_non_rejected_listed_version() is None
 
     def test_find_latest_non_rejected_listed_version_no_listed(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.addon.find_latest_non_rejected_listed_version() is None
 
 
diff --git a/src/olympia/addons/tests/test_views.py b/src/olympia/addons/tests/test_views.py
index 825391e207cd..c57e508bd3cf 100644
--- a/src/olympia/addons/tests/test_views.py
+++ b/src/olympia/addons/tests/test_views.py
@@ -319,7 +319,7 @@ def test_disabled_by_admin_no_rights(self):
         assert data['is_disabled_by_mozilla'] is True
 
     def test_get_not_listed(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         response = self.client.get(self.url)
         assert response.status_code == 401
         data = json.loads(force_str(response.content))
@@ -341,7 +341,7 @@ def test_get_not_listed(self):
 
     def test_get_not_listed_no_rights(self):
         user = UserProfile.objects.create(username='simpleuser')
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.client.login_api(user)
         response = self.client.get(self.url)
         assert response.status_code == 403
@@ -365,7 +365,7 @@ def test_get_not_listed_no_rights(self):
     def test_get_unlisted_addons_api_view(self):
         user = UserProfile.objects.create(username='user')
         self.grant_permission(user, amo.permissions.ADDONS_API_VIEW)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.client.login_api(user)
         response = self.client.get(self.url)
         assert response.status_code == 403
@@ -378,7 +378,7 @@ def test_get_unlisted_addons_api_view_unlisted(self):
         user = UserProfile.objects.create(username='user')
         self.grant_permission(user, amo.permissions.ADDONS_API_VIEW)
         self.grant_permission(user, amo.permissions.ADDONS_API_VIEW_UNLISTED)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.client.login_api(user)
         response = self.client.get(self.url)
         assert response.status_code == 200
@@ -386,7 +386,7 @@ def test_get_unlisted_addons_api_view_unlisted(self):
     def test_get_not_listed_author(self):
         user = UserProfile.objects.create(username='author')
         AddonUser.objects.create(user=user, addon=self.addon)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.client.login_api(user)
         response = self.client.get(self.url)
         assert response.status_code == 200
@@ -2550,7 +2550,7 @@ def _test_metadata_content_review(self):
 
     @patch('olympia.addons.serializers.fetch_translations_from_instance')
     def test_metadata_content_review_unlisted(self, fetch_mock):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         AddonApprovalsCounter.approve_content_for_addon(addon=self.addon)
         old_content_review = AddonApprovalsCounter.objects.get(
             addon=self.addon
@@ -2648,7 +2648,7 @@ def test_dont_trigger_narc_on_metadata_change_if_no_listed_versions(
         self, run_narc_on_version_mock
     ):
         self.create_switch('enable-narc', active=True)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self._test_metadata_content_review()
         assert run_narc_on_version_mock.delay.call_count == 0
 
@@ -5008,7 +5008,7 @@ def test_cannot_rollback_from_unapproved_version(self):
             ]
         }
 
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         response = self.client.post(self.url, data={'new_version_string': '0.0.0.994'})
         assert response.status_code == 400
         assert response.data == {
@@ -5067,7 +5067,7 @@ def test_clean_new_version_string_for_listed_greater_than_existing(self):
         }
 
         # There are no restrictions on greater/less than for unlisted though.
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         with patch(
             'olympia.addons.views.duplicate_addon_version_for_rollback.delay'
         ) as mock_rollback_task:
diff --git a/src/olympia/amo/tests/__init__.py b/src/olympia/amo/tests/__init__.py
index 14039afe424c..8d8e641bc137 100644
--- a/src/olympia/amo/tests/__init__.py
+++ b/src/olympia/amo/tests/__init__.py
@@ -592,12 +592,6 @@ def enable_messages_and_session(self, request):
         request.session.save()
         return request
 
-    def make_addon_unlisted(self, addon):
-        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
-
-    def make_addon_listed(self, addon):
-        self.change_channel_for_addon(addon, amo.CHANNEL_LISTED)
-
     def change_channel_for_addon(self, addon, channel):
         for version in addon.versions(manager='unfiltered_for_relations').all():
             version.update(channel=channel)
diff --git a/src/olympia/devhub/tasks.py b/src/olympia/devhub/tasks.py
index 4f950faaaf78..8733e4383102 100644
--- a/src/olympia/devhub/tasks.py
+++ b/src/olympia/devhub/tasks.py
@@ -540,6 +540,7 @@ def track_validation_stats(results):
     statsd.incr(f'devhub.linter.results.all.{result_kind}')
 
     listed_tag = 'listed' if results['metadata']['listed'] else 'unlisted'
+    # TODO; 'listed' booleans may need to become just the channel
 
     # Track listed/unlisted success/fail.
     statsd.incr(f'devhub.linter.results.{listed_tag}.{result_kind}')
diff --git a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
index 084db1c70fab..b08da3fecaae 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
@@ -4,7 +4,7 @@
 {{ dev_page_title(_('Theme generate'), addon) }}
 {% endblock %}
 
-{% set channel_param = 'listed' if channel == amo.CHANNEL_LISTED else 'unlisted' %}
+{% set channel_param = amo.CHANNEL_CHOICES_API[channel] %}
 
 {% block primary %}
   <h3>{{ _('Theme generator') }}</h3>
diff --git a/src/olympia/devhub/templates/devhub/new-landing/components/my-addons.html b/src/olympia/devhub/templates/devhub/new-landing/components/my-addons.html
index a4c7ba21bfc5..6ab546e6a897 100644
--- a/src/olympia/devhub/templates/devhub/new-landing/components/my-addons.html
+++ b/src/olympia/devhub/templates/devhub/new-landing/components/my-addons.html
@@ -42,7 +42,7 @@ <h2>{{ _('My Add-ons') }}</h2>
                 {% if addon.has_listed_versions() %}
                   {% if addon.current_version %}
                     <div class="DevHub-MyAddons-item-version-details">
-                      {% if addon.has_unlisted_versions() %}
+                      {% if addon.has_multiple_channels() %}
                         <span class="DevHub-MyAddons-item-channel-listed tooltip"
                               title="{{ _('Listed on this site after passing code review. Automatic updates are handled by this site.') }}"
                         >AMO</span>
@@ -56,12 +56,12 @@ <h2>{{ _('My Add-ons') }}</h2>
                     </div>
                   {% endif %}
                 {% endif %}
-
+                
                 {% set latest_unlisted_version=addon.find_latest_version(channel=amo.CHANNEL_UNLISTED) %}
 
                 {% if latest_unlisted_version %}
                   <div class="DevHub-MyAddons-item-version-details">
-                    {% if addon.has_listed_versions() %}
+                    {% if addon.has_multiple_channels() %}
                       <span class="DevHub-MyAddons-item-channel-unlisted tooltip"
                             title="{{ _('Signed for self-distribution. Updates are handled by you.') }}"
                       >Self</span>
@@ -72,6 +72,23 @@ <h2>{{ _('My Add-ons') }}</h2>
                     </span>
                   </div>
                 {% endif %}
+
+                {% set latest_enterprise_version=addon.find_latest_version(channel=amo.CHANNEL_ENTERPRISE) %}
+
+                {% if latest_enterprise_version and waffle.switch('enterprise-channel') %}
+                  <div class="DevHub-MyAddons-item-version-details">
+                    {% if addon.has_multiple_channels() %}
+                      <span class="DevHub-MyAddons-item-channel-enterprise tooltip"
+                            title="{{ _('Signed for enterprise.') }}"
+                      >Enterprise</span>
+                    {% endif %}
+
+                    <span class="DevHub-MyAddons-item-version">
+                      {{ latest_enterprise_version.version }}
+                    </span>
+                  </div>
+                {% endif %}
+
               </div>
             </div>
             <span class="DevHub-MyAddons-item-modified">
diff --git a/src/olympia/devhub/tests/test_feeds.py b/src/olympia/devhub/tests/test_feeds.py
index e531931119dd..355c50c87d4c 100644
--- a/src/olympia/devhub/tests/test_feeds.py
+++ b/src/olympia/devhub/tests/test_feeds.py
@@ -212,7 +212,7 @@ def test_rss_single(self):
 
     def test_rss_unlisted_addon(self):
         """Unlisted addon logs appear in the rss feed."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.log_creates(5)
 
         # This will give us a new RssKey
@@ -238,7 +238,7 @@ def test_xss_addon(self):
     def test_xss_unlisted_addon(self):
         self.addon.name = "<script>alert('Buy more Diet Mountain Dew.')</script>"
         self.addon.save()
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.log_creates(1)
         doc = self.get_pq()
         assert len(doc('.item')) == 2
@@ -253,7 +253,7 @@ def test_xss_collections(self):
         assert '&lt;script&gt;' in str(doc), 'XSS FTL'
 
     def test_xss_collections_unlisted_addon(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.log_collection(1, "<script>alert('v1@gra for u')</script>")
         doc = self.get_pq()
         assert len(doc('.item')) == 2
@@ -268,7 +268,7 @@ def test_xss_tags(self):
         assert '&lt;script' in str(doc('.item')), 'XSS FTL'
 
     def test_xss_tags_unlisted_addon(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.log_tag(1, "<script src='x.js'>")
         doc = self.get_pq()
         assert len(doc('.item')) == 2
@@ -283,7 +283,7 @@ def test_xss_versions(self):
         assert '&lt;script' in str(doc('.item')), 'XSS FTL'
 
     def test_xss_versions_unlisted_addon(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.log_updates(1, "<script src='x.js'>")
         doc = self.get_pq()
         assert len(doc('.item')) == 2
diff --git a/src/olympia/devhub/tests/test_views.py b/src/olympia/devhub/tests/test_views.py
index 5f76c44cee13..935d7d4f5523 100644
--- a/src/olympia/devhub/tests/test_views.py
+++ b/src/olympia/devhub/tests/test_views.py
@@ -243,7 +243,7 @@ def test_sort_updated_filter(self):
         )
 
     def test_purely_unlisted_addon_are_not_shown_as_incomplete(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.addon.has_complete_metadata()
 
         response = self.client.get(self.url)
@@ -257,7 +257,7 @@ def test_purely_unlisted_addon_are_not_shown_as_incomplete(self):
         assert doc('.item-details')
 
     def test_mixed_versions_addon_with_incomplete_metadata(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version = version_factory(addon=self.addon, channel=amo.CHANNEL_LISTED)
         version.update(license=None)
         self.addon.update(status=amo.STATUS_NULL)
@@ -695,7 +695,7 @@ def test_addons_hidden(self):
 
     def test_unlisted_addons_dashboard(self):
         """Unlisted addons are displayed in the feed on the dashboard page."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.add_log()
         res = self.client.get(reverse('devhub.addons'))
         doc = pq(res.content)
@@ -703,7 +703,7 @@ def test_unlisted_addons_dashboard(self):
 
     def test_unlisted_addons_feed_sidebar(self):
         """Unlisted addons are displayed in the left side in the feed page."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.add_log()
         res = self.client.get(reverse('devhub.feed_all'))
         doc = pq(res.content)
@@ -712,7 +712,7 @@ def test_unlisted_addons_feed_sidebar(self):
 
     def test_unlisted_addons_feed(self):
         """Unlisted addons are displayed in the feed page."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.add_log()
         res = self.client.get(reverse('devhub.feed_all'))
         doc = pq(res.content)
@@ -720,7 +720,7 @@ def test_unlisted_addons_feed(self):
 
     def test_unlisted_addons_feed_filter(self):
         """Feed page can be filtered on unlisted addon."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.add_log()
         res = self.client.get(reverse('devhub.feed', args=[self.addon.slug]))
         doc = pq(res.content)
@@ -2392,7 +2392,7 @@ def test_link_to_stats_for_addon_disabled_by_user(self):
         )
 
     def test_link_to_stats_for_unlisted_addon(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
 
         response = self.client.get(self.url)
 
@@ -2403,7 +2403,7 @@ def test_link_to_stats_for_unlisted_addon(self):
     def test_no_link_for_addon_disabled_by_mozilla(self):
         self.addon.update(status=amo.STATUS_DISABLED)
 
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
 
         response = self.client.get(self.url)
 
diff --git a/src/olympia/devhub/tests/test_views_edit.py b/src/olympia/devhub/tests/test_views_edit.py
index e65d9d58f16d..a384824cee3d 100644
--- a/src/olympia/devhub/tests/test_views_edit.py
+++ b/src/olympia/devhub/tests/test_views_edit.py
@@ -55,12 +55,12 @@ def setUp(self):
         for t in self.tags:
             Tag.objects.get_or_create(tag_text=t)[0].add_tag(addon)
         if self.listed:
-            self.make_addon_listed(addon)
+            self.change_channel_for_addon(addon, amo.CHANNEL_LISTED)
             ac = AddonCategory.objects.filter(addon=addon, category_id=22)[0]
             ac.save()
             AddonCategory.objects.filter(addon=addon, category_id__in=[1, 71]).delete()
         else:
-            self.make_addon_unlisted(addon)
+            self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
             addon.save()
 
         self.user = UserProfile.objects.get(pk=55021)
diff --git a/src/olympia/devhub/tests/test_views_ownership.py b/src/olympia/devhub/tests/test_views_ownership.py
index 781678c8a926..ab57981a5148 100644
--- a/src/olympia/devhub/tests/test_views_ownership.py
+++ b/src/olympia/devhub/tests/test_views_ownership.py
@@ -164,7 +164,7 @@ def test_no_license(self):
         assert license_form.errors == {'builtin': ['This field is required.']}
 
     def test_no_license_required_for_unlisted(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         data = self.build_form_data({'builtin': ''})
         response = self.client.post(self.url, data)
         assert response.status_code == 302
@@ -1067,6 +1067,6 @@ def test_post_refuse(self):
         ).exists()
 
     def test_invitation_unlisted(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.test_invited()
         self.test_post_accept()
diff --git a/src/olympia/devhub/tests/test_views_submit.py b/src/olympia/devhub/tests/test_views_submit.py
index 994d4f54ff5c..ec46ce2edbaa 100644
--- a/src/olympia/devhub/tests/test_views_submit.py
+++ b/src/olympia/devhub/tests/test_views_submit.py
@@ -1930,7 +1930,7 @@ def test_finish_submitting_listed_addon(self):
         assert links[3].attrib['href'] == reverse('devhub.addons')
 
     def test_finish_submitting_unlisted_addon(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
 
         self.addon.find_latest_version(channel=amo.CHANNEL_UNLISTED)
         response = self.client.get(self.url)
@@ -1990,7 +1990,7 @@ def test_finish_submitting_listed_static_theme(self):
 
     def test_finish_submitting_unlisted_static_theme(self):
         self.addon.update(type=amo.ADDON_STATICTHEME)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
 
         self.addon.find_latest_version(channel=amo.CHANNEL_UNLISTED)
         response = self.client.get(self.url)
diff --git a/src/olympia/devhub/tests/test_views_versions.py b/src/olympia/devhub/tests/test_views_versions.py
index 15a650b43263..0b56eb85795e 100644
--- a/src/olympia/devhub/tests/test_views_versions.py
+++ b/src/olympia/devhub/tests/test_views_versions.py
@@ -1000,7 +1000,7 @@ def test_version_rollback_form_listed_only(self):
     def test_version_rollback_form_unlisted_only(self):
         first_version = self.addon.current_version
         second_version = version_factory(addon=self.addon)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
 
         response = self.client.get(self.url)
         doc = pq(response.content)
diff --git a/src/olympia/devhub/views.py b/src/olympia/devhub/views.py
index a6ab9f547343..5bf4bbc5339f 100644
--- a/src/olympia/devhub/views.py
+++ b/src/olympia/devhub/views.py
@@ -1652,7 +1652,8 @@ def _submit_upload(
         if (
             channel == amo.CHANNEL_LISTED and any(promoted_group.listed_pre_review)
         ) or (
-            channel == amo.CHANNEL_UNLISTED and any(promoted_group.unlisted_pre_review)
+            channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE)
+            and any(promoted_group.unlisted_pre_review)
         ):
             submit_notification_warning = get_config(
                 amo.config_keys.SUBMIT_NOTIFICATION_WARNING_PRE_REVIEW
diff --git a/src/olympia/ratings/models.py b/src/olympia/ratings/models.py
index 368e55a45628..0d2b851ffd46 100644
--- a/src/olympia/ratings/models.py
+++ b/src/olympia/ratings/models.py
@@ -33,7 +33,7 @@ def to_moderate(self):
         """
         return self.exclude(
             Q(addon__isnull=True)
-            | Q(version__channel=amo.CHANNEL_UNLISTED)
+            | Q(version__channel__in=(amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE))
             | Q(ratingflag__isnull=True)
         ).filter(editorreview=True, addon__status__in=amo.VALID_ADDON_STATUSES)
 
diff --git a/src/olympia/ratings/tests/test_tasks.py b/src/olympia/ratings/tests/test_tasks.py
index a7c834c8c350..24256df46e75 100644
--- a/src/olympia/ratings/tests/test_tasks.py
+++ b/src/olympia/ratings/tests/test_tasks.py
@@ -38,7 +38,7 @@ def get_grouped_counts(addon):
         # Add a purely unlisted add-on. It should not be considered when
         # calculating bayesian rating for the other add-ons.
         addon3 = addon_factory(total_ratings=3, average_rating=4)
-        self.make_addon_unlisted(addon3)
+        self.change_channel_for_addon(addon3, amo.CHANNEL_UNLISTED)
 
         # Create a few ratings with various scores.
         user = user_factory()
diff --git a/src/olympia/ratings/tests/test_views.py b/src/olympia/ratings/tests/test_views.py
index 62c003b2b5a1..8f4afcda5999 100644
--- a/src/olympia/ratings/tests/test_views.py
+++ b/src/olympia/ratings/tests/test_views.py
@@ -2853,7 +2853,7 @@ def test_flag_logged_in_flag_already_exists(self):
         assert self.rating.reload().editorreview is True
 
     def test_flag_logged_in_addon_denied(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.user = user_factory()
         self.client.login_api(self.user)
         response = self.client.post(self.url, data={'flag': 'review_flag_reason_spam'})
diff --git a/src/olympia/reviewers/admin.py b/src/olympia/reviewers/admin.py
index 2a7fcb1ffcc7..f1c629e17541 100644
--- a/src/olympia/reviewers/admin.py
+++ b/src/olympia/reviewers/admin.py
@@ -245,9 +245,7 @@ def review_link(self, obj):
                 reverse(
                     'reviewers.review',
                     args=[
-                        'unlisted'
-                        if version.channel == amo.CHANNEL_UNLISTED
-                        else 'listed',
+                        amo.CHANNEL_CHOICES_API[version.channel],
                         version.addon_id,
                     ],
                 ),
diff --git a/src/olympia/reviewers/models.py b/src/olympia/reviewers/models.py
index ed3a92ac9e56..f679b36921e5 100644
--- a/src/olympia/reviewers/models.py
+++ b/src/olympia/reviewers/models.py
@@ -623,7 +623,7 @@ def check_is_promoted_prereview(cls, version):
                     and any(promotions.listed_pre_review)
                 )
                 or (
-                    version.channel == amo.CHANNEL_UNLISTED
+                    version.channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE)
                     and any(promotions.unlisted_pre_review)
                 )
             )
diff --git a/src/olympia/reviewers/templates/reviewers/addon_details_box.html b/src/olympia/reviewers/templates/reviewers/addon_details_box.html
index 08d845004d1e..999d1837a349 100644
--- a/src/olympia/reviewers/templates/reviewers/addon_details_box.html
+++ b/src/olympia/reviewers/templates/reviewers/addon_details_box.html
@@ -40,8 +40,8 @@ <h2>{{ addon_name }}</h2>
             <th>Add-on(s) sharing same ID</th>
             <td>
                 {% for addon_sharing_same_guid in addons_sharing_same_guid %}
-                  {% set review_url = url('reviewers.review', 'unlisted', addon_sharing_same_guid.pk)
-                                      if channel == amo.CHANNEL_UNLISTED else url('reviewers.review', addon_sharing_same_guid.pk) %}
+                  {% set review_url = url('reviewers.review', amo.CHANNEL_CHOICES_API[channel], addon_sharing_same_guid.pk)
+                                      if channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE) else url('reviewers.review', addon_sharing_same_guid.pk) %}
                   <a href="{{ review_url }}">{{ addon_sharing_same_guid }}</a>&nbsp;
                 {% endfor %}
               </td>
@@ -147,7 +147,7 @@ <h2>{{ addon_name }}</h2>
           <tr class="meta-abuse">
             <th>Abuse Reports</th>
             <td>
-                <a href="{{ url('reviewers.abuse_reports', addon.pk)|absolutify }}{{ '?channel=unlisted' if channel == amo.CHANNEL_UNLISTED else '' }}">
+                  <a href="{{ url('reviewers.abuse_reports', addon.pk)|absolutify }}{% if channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE) %}?channel={{amo.CHANNEL_CHOICES_API[channel]}}{% endif %}">
                   <strong>{{ reports.paginator.count|numberfmt }}</strong>
                 </a>
             </td>
@@ -157,7 +157,7 @@ <h2>{{ addon_name }}</h2>
             <tr>
               <th>Privacy Policy</th>
               <td>
-                <a href="{{ url('reviewers.privacy', addon.pk)|absolutify }}{{ '?channel=unlisted' if channel == amo.CHANNEL_UNLISTED else '' }}">
+                <a href="{{ url('reviewers.privacy', addon.pk)|absolutify }}{% if channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE) %}?channel={{amo.CHANNEL_CHOICES_API[channel]}}{% endif %}">
                   View Privacy Policy</a>
               </td>
             </tr>
@@ -172,7 +172,7 @@ <h2>{{ addon_name }}</h2>
             <tr>
               <th>EULA</th>
               <td>
-                <a href="{{ url('reviewers.eula', addon.pk)|absolutify }}{{ '?channel=unlisted' if channel == amo.CHANNEL_UNLISTED else '' }}">View End-User License Agreement</a>
+                <a href="{{ url('reviewers.eula', addon.pk)|absolutify }}{% if channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE) %}?channel={{amo.CHANNEL_CHOICES_API[channel]}}{% endif %}">View End-User License Agreement</a>
               </td>
             </tr>
           {% endif %}
diff --git a/src/olympia/reviewers/templates/reviewers/developer_profile.html b/src/olympia/reviewers/templates/reviewers/developer_profile.html
index ec1a7d68fbc4..0e668940035a 100644
--- a/src/olympia/reviewers/templates/reviewers/developer_profile.html
+++ b/src/olympia/reviewers/templates/reviewers/developer_profile.html
@@ -43,6 +43,11 @@ <h3>
               <a href="{{ url('reviewers.review', 'unlisted', addon.id)}}">Unlisted Review</a>
             {% endif %}
           </td>
+          <td>
+            {% if addon._enterprise_versions_exists %}
+              <a href="{{ url('reviewers.review', 'enterprise', addon.id)}}">Enterprise Review</a>
+            {% endif %}
+          </td>
           {% endwith %}
         </tr>
         {% endfor %}
diff --git a/src/olympia/reviewers/tests/test_commands.py b/src/olympia/reviewers/tests/test_commands.py
index 8a89ad161ceb..762f26c491ad 100644
--- a/src/olympia/reviewers/tests/test_commands.py
+++ b/src/olympia/reviewers/tests/test_commands.py
@@ -1764,7 +1764,7 @@ def test_deleted_version(self):
         ).exists()
 
     def test_unlisted_version(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         call_command('auto_reject')
 
         # Version stays unlisted, is disabled (even if that doesn't make much
diff --git a/src/olympia/reviewers/tests/test_forms.py b/src/olympia/reviewers/tests/test_forms.py
index 62c350746ec7..293e9f7432a0 100644
--- a/src/olympia/reviewers/tests/test_forms.py
+++ b/src/olympia/reviewers/tests/test_forms.py
@@ -115,7 +115,7 @@ def test_actions_addon_status_null(self):
         ]
 
     def test_actions_addon_status_null_unlisted(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.version.reload()
         self.version.update(human_review_date=datetime.now())
         self.grant_permission(self.request.user, amo.permissions.ADDONS_REVIEW)
diff --git a/src/olympia/reviewers/tests/test_utils.py b/src/olympia/reviewers/tests/test_utils.py
index c2ff640197f9..019d0e9b3b5c 100644
--- a/src/olympia/reviewers/tests/test_utils.py
+++ b/src/olympia/reviewers/tests/test_utils.py
@@ -110,7 +110,7 @@ def setup_data(
         mail.outbox = []
         self.file.update(status=file_status)
         if channel == amo.CHANNEL_UNLISTED:
-            self.make_addon_unlisted(self.addon)
+            self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
             if self.review_version:
                 self.review_version.reload()
             self.file.reload()
@@ -988,14 +988,14 @@ def test_actions_auto_approval_disabled(self):
         )
         assert expected == actions
 
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.review_version.reload()
 
     def test_actions_auto_approval_disabled_unlisted(self):
         self.grant_permission(self.user, amo.permissions.ADDONS_REVIEW)
         self.grant_permission(self.user, amo.permissions.ADDONS_REVIEW_UNLISTED)
         self.grant_permission(self.user, amo.permissions.REVIEWS_ADMIN)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.review_version.reload()
 
         # This doesn't affect unlisted.
@@ -2524,7 +2524,7 @@ def test_nominated_approval_date_set_file_reject_latest_version(self):
         assert not File.objects.get(pk=self.file.pk).approval_date
 
     def test_review_unlisted_while_a_listed_version_is_awaiting_review(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.review_version.reload()
         version_factory(
             addon=self.addon,
@@ -3031,7 +3031,7 @@ def test_unreject_latest_version_incomplete_addon(self):
         assert self.check_log_count(amo.LOG.UNREJECT_VERSION.id) == 1
 
     def _approve_multiple_versions_unlisted(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         old_version = self.review_version.reload()
         version_pending_rejection = version_factory(
             addon=self.addon,
@@ -3146,7 +3146,7 @@ def test_approve_multiple_versions_unlisted_flags_activity_logs_and_emails(self)
 
     def test_reject_multiple_versions_unlisted(self):
         old_version = self.review_version
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.review_version = version_factory(
             addon=self.addon,
             version='3.0',
diff --git a/src/olympia/reviewers/tests/test_views.py b/src/olympia/reviewers/tests/test_views.py
index f8a2d26d3109..adf687020cbe 100644
--- a/src/olympia/reviewers/tests/test_views.py
+++ b/src/olympia/reviewers/tests/test_views.py
@@ -229,7 +229,7 @@ def test_basic(self):
         assert rows.filter('.hide').eq(0).text() == 'youwin'
         # Should have none showing if the addons are unlisted.
         for addon in Addon.objects.all():
-            self.make_addon_unlisted(addon)
+            self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         response = self.client.get(self.url)
         assert response.status_code == 200
         doc = pq(response.content)
@@ -468,7 +468,7 @@ def test_content_approval(self):
 
     def test_approval_multiple_versions(self):
         addon = Addon.objects.get(pk=3615)
-        self.make_addon_unlisted(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         self.grant_permission(self.user, amo.permissions.ADDONS_REVIEW_UNLISTED)
         version_factory(addon=addon, channel=amo.CHANNEL_UNLISTED, version='3.0')
         ActivityLog.objects.create(
@@ -2153,7 +2153,7 @@ def test_do_not_show_reviews_for_non_public_addons(self):
 
     def test_do_not_show_reviews_for_unlisted_addons(self):
         for addon in Addon.objects.all():
-            self.make_addon_unlisted(addon)
+            self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
 
         response = self.client.get(self.url)
         assert response.status_code == 200
@@ -2463,7 +2463,7 @@ def test_not_author(self):
         assert self.client.head(self.url).status_code == 302
 
     def test_review_unlisted_while_a_listed_version_is_awaiting_review(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version_factory(
             addon=self.addon,
             channel=amo.CHANNEL_LISTED,
@@ -2475,7 +2475,7 @@ def test_review_unlisted_while_a_listed_version_is_awaiting_review(self):
         assert self.client.get(self.url).status_code == 200
 
     def test_review_unlisted_while_a_listed_version_is_awaiting_review_viewer(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version_factory(
             addon=self.addon,
             channel=amo.CHANNEL_LISTED,
@@ -3503,7 +3503,7 @@ def test_action_links_as_admin(self):
     def test_unlisted_addon_action_links_as_admin(self):
         """No "View Product Page" link for unlisted addons, "edit"/"manage" links
         for the admins."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.login_as_admin()
         response = self.client.get(self.url)
         assert response.status_code == 200
@@ -3525,7 +3525,7 @@ def test_unlisted_addon_action_links_as_admin(self):
         check_links(expected, doc('#actions-addon a'))
 
     def test_mixed_channels_action_links_as_admin(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version_factory(
             addon=self.addon,
             channel=amo.CHANNEL_LISTED,
@@ -3558,7 +3558,7 @@ def test_mixed_channels_action_links_as_admin(self):
         check_links(expected, doc('#actions-addon a'))
 
     def test_mixed_channels_action_links_as_admin_on_unlisted_review(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version_factory(
             addon=self.addon,
             channel=amo.CHANNEL_LISTED,
@@ -3589,7 +3589,7 @@ def test_mixed_channels_action_links_as_admin_on_unlisted_review(self):
         check_links(expected, doc('#actions-addon a'))
 
     def test_mixed_channels_action_links_as_admin_on_content_review(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version_factory(
             addon=self.addon,
             channel=amo.CHANNEL_LISTED,
@@ -3620,7 +3620,7 @@ def test_mixed_channels_action_links_as_admin_on_content_review(self):
         check_links(expected, doc('#actions-addon a'))
 
     def test_mixed_channels_action_links_as_admin_deleted_addon(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version_factory(
             addon=self.addon,
             channel=amo.CHANNEL_LISTED,
@@ -3653,7 +3653,7 @@ def test_mixed_channels_action_links_as_admin_deleted_addon(self):
         check_links(expected, doc('#actions-addon a'))
 
     def test_mixed_channels_action_links_as_admin_unlisted_deleted_addon(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version_factory(
             addon=self.addon,
             channel=amo.CHANNEL_LISTED,
@@ -3683,7 +3683,7 @@ def test_mixed_channels_action_links_as_admin_unlisted_deleted_addon(self):
         check_links(expected, doc('#actions-addon a'))
 
     def test_mixed_channels_action_links_as_regular_reviewer(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version_factory(
             addon=self.addon,
             channel=amo.CHANNEL_LISTED,
@@ -4147,7 +4147,7 @@ def test_eula_displayed(self):
         self.assertContains(response, eula_url + '"')
 
         # The url should pass on the channel param so the backlink works
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.login_as_admin()
         unlisted_url = reverse('reviewers.review', args=['unlisted', self.addon.pk])
         response = self.client.get(unlisted_url)
@@ -4169,7 +4169,7 @@ def test_privacy_policy_displayed(self):
         privacy_url = reverse('reviewers.privacy', args=(self.addon.pk,))
         self.assertContains(response, privacy_url + '"')
 
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.login_as_admin()
         unlisted_url = reverse('reviewers.review', args=['unlisted', self.addon.pk])
         response = self.client.get(unlisted_url)
@@ -4436,7 +4436,7 @@ def test_approve_addon_for_unlisted_pre_review_promoted_groups(
         self.make_addon_promoted(
             self.addon, api_name='notable', unlisted_pre_review=True
         )
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.grant_permission(self.reviewer, amo.permissions.ADDONS_REVIEW)
         self.grant_permission(self.reviewer, amo.permissions.ADDONS_REVIEW_UNLISTED)
         unlisted_url = reverse('reviewers.review', args=['unlisted', self.addon.pk])
@@ -5159,7 +5159,7 @@ def test_unreject_multiple_versions_with_unlisted(self):
         self.version = version_factory(
             addon=self.addon, version='3.0', file_kw={'status': amo.STATUS_DISABLED}
         )
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         GroupUser.objects.filter(user=self.reviewer).all().delete()
         self.grant_permission(self.reviewer, amo.permissions.ADDONS_REVIEW)
         self.grant_permission(self.reviewer, amo.permissions.REVIEWS_ADMIN)
@@ -5186,7 +5186,7 @@ def test_block_multiple_versions(self):
         old_version = self.version
         NeedsHumanReview.objects.create(version=old_version)
         self.version = version_factory(addon=self.addon, version='3.0')
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.grant_permission(self.reviewer, amo.permissions.ADDONS_REVIEW_UNLISTED)
         self.grant_permission(self.reviewer, amo.permissions.REVIEWS_ADMIN)
         self.grant_permission(self.reviewer, amo.permissions.BLOCKLIST_CREATE)
@@ -5753,14 +5753,14 @@ def test_abuse_reports_unlisted_addon(self):
         user = UserProfile.objects.get(email='reviewer@mozilla.com')
         self.grant_permission(user, amo.permissions.ADDONS_REVIEW_UNLISTED)
         self.login_as_reviewer()
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.test_abuse_reports()
 
     def test_abuse_reports_unlisted_addon_viewer(self):
         user = UserProfile.objects.get(email='reviewer@mozilla.com')
         self.grant_permission(user, amo.permissions.REVIEWER_TOOLS_UNLISTED_VIEW)
         self.login_as_reviewer()
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.test_abuse_reports()
 
     def test_abuse_reports_developers(self):
@@ -5794,14 +5794,14 @@ def test_abuse_reports_developers_unlisted_addon(self):
         user = UserProfile.objects.get(email='reviewer@mozilla.com')
         self.grant_permission(user, amo.permissions.ADDONS_REVIEW_UNLISTED)
         self.login_as_reviewer()
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.test_abuse_reports_developers()
 
     def test_abuse_reports_developers_unlisted_addon_viewer(self):
         user = UserProfile.objects.get(email='reviewer@mozilla.com')
         self.grant_permission(user, amo.permissions.REVIEWER_TOOLS_UNLISTED_VIEW)
         self.login_as_reviewer()
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.test_abuse_reports_developers()
 
     def test_user_ratings(self):
@@ -5874,14 +5874,14 @@ def test_user_ratings_unlisted_addon(self):
         user = UserProfile.objects.get(email='reviewer@mozilla.com')
         self.grant_permission(user, amo.permissions.ADDONS_REVIEW_UNLISTED)
         self.login_as_reviewer()
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.test_user_ratings()
 
     def test_user_ratings_unlisted_addon_viewer(self):
         user = UserProfile.objects.get(email='reviewer@mozilla.com')
         self.grant_permission(user, amo.permissions.REVIEWER_TOOLS_UNLISTED_VIEW)
         self.login_as_reviewer()
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.test_user_ratings()
 
     def test_data_value_attributes(self):
@@ -6253,7 +6253,7 @@ def test_addons_sharing_guid_shown(self):
         assert doc('.addon-original-guid td').text() == self.addon.addonguid.guid
 
         # Test unlisted review pages link to unlisted review pages.
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.login_as_admin()
         response = self.client.get(
             reverse('reviewers.review', args=['unlisted', self.addon.pk])
@@ -6409,7 +6409,7 @@ def test_blocked_versions(self):
     def test_redirect_after_review_unlisted(self):
         self.url = reverse('reviewers.review', args=('unlisted', self.addon.pk))
         self.version = version_factory(addon=self.addon, version='3.0')
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.grant_permission(self.reviewer, amo.permissions.ADDONS_REVIEW_UNLISTED)
 
         response = self.client.post(
@@ -7275,7 +7275,7 @@ def test_whiteboard_addition_content_review(self):
         assert whiteboard.private == private_whiteboard_info
 
     def test_whiteboard_addition_unlisted_addon(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         public_whiteboard_info = 'Public whiteboard info unlisted.'
         private_whiteboard_info = 'Private whiteboard info unlisted.'
         url = reverse('reviewers.whiteboard', args=['unlisted', self.addon.pk])
@@ -7419,7 +7419,7 @@ def test_eula(self):
         self.assertContains(response, str(self.review_url))
 
     def test_eula_with_channel(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         unlisted_review_url = reverse(
             'reviewers.review',
             args=(
@@ -7457,7 +7457,7 @@ def test_privacy(self):
         self.assertContains(response, str(self.review_url))
 
     def test_privacy_with_channel(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         unlisted_review_url = reverse(
             'reviewers.review',
             args=(
@@ -7515,7 +7515,7 @@ def test_basic(self):
         self.assertContains(response, self.addon.average_daily_users)
 
     def test_link_unlisted_review_page(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         unlisted_review_url = reverse(
             'reviewers.review', args=('unlisted', self.addon.id)
         )
@@ -7539,7 +7539,7 @@ def test_link_both_channels_review_page(self):
     def test_queries(self):
         addon_factory(users=(self.developer,))
         unlisted_addon = addon_factory(users=(self.developer,))
-        self.make_addon_unlisted(unlisted_addon)
+        self.change_channel_for_addon(unlisted_addon, amo.CHANNEL_UNLISTED)
         with self.assertNumQueries(10):
             # 2 savepoints (tests)
             # - site notice config
@@ -8073,13 +8073,13 @@ def test_deleted_addon(self):
     def test_unlisted_reviewer_can_see_results_for_unlisted(self):
         self.grant_permission(self.user, amo.permissions.ADDONS_REVIEW_UNLISTED)
         self.client.login_api(self.user)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.client.get(self.url).status_code == 200
 
     def test_unlisted_viewer_can_see_results_for_unlisted(self):
         self.grant_permission(self.user, amo.permissions.REVIEWER_TOOLS_UNLISTED_VIEW)
         self.client.login_api(self.user)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.client.get(self.url).status_code == 200
 
     def test_non_reviewer_cannot_see_json_results(self):
@@ -8101,7 +8101,7 @@ def test_wrong_type_of_reviewer_cannot_see_json_results(self):
     def test_non_unlisted_reviewer_cannot_see_results_for_unlisted(self):
         self.grant_permission(self.user, amo.permissions.ADDONS_REVIEW)
         self.client.login_api(self.user)
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.client.get(self.url).status_code in [
             401,
             403,
diff --git a/src/olympia/reviewers/utils.py b/src/olympia/reviewers/utils.py
index c4d41b400de7..314cef0ea810 100644
--- a/src/olympia/reviewers/utils.py
+++ b/src/olympia/reviewers/utils.py
@@ -95,8 +95,11 @@ def render_flags(self, record):
 
     def _get_addon_name_url(self, record):
         args = [record.id]
-        if self.get_version(record).channel == amo.CHANNEL_UNLISTED:
-            args.insert(0, 'unlisted')
+        if (channel := self.get_version(record).channel) in (
+            amo.CHANNEL_UNLISTED,
+            amo.CHANNEL_ENTERPRISE,
+        ):
+            args.insert(0, amo.CHANNEL_CHOICES_API[channel])
         return reverse('reviewers.review', args=args)
 
     def render_addon_name(self, record):
diff --git a/src/olympia/reviewers/views.py b/src/olympia/reviewers/views.py
index e4b6e4bfbe6f..f63842995d5a 100644
--- a/src/olympia/reviewers/views.py
+++ b/src/olympia/reviewers/views.py
@@ -872,7 +872,12 @@ def reviewlog(request):
     if not acl.is_unlisted_addons_viewer_or_reviewer(request.user):
         # Only display logs related to unlisted versions to users with the
         # right permission.
-        qs = qs.exclude(versionlog__version__channel=amo.CHANNEL_UNLISTED)
+        qs = qs.exclude(
+            versionlog__version__channel__in=(
+                amo.CHANNEL_UNLISTED,
+                amo.CHANNEL_ENTERPRISE,
+            )
+        )
     if not acl.is_listed_addons_reviewer(request.user):
         qs = qs.exclude(versionlog__version__addon__type__in=amo.GROUP_TYPE_ADDON)
     if not acl.is_static_theme_reviewer(request.user):
@@ -913,7 +918,7 @@ def whiteboard(request, addon, channel):
     channel, content_review = determine_channel(channel)
 
     unlisted_only = (
-        channel == amo.CHANNEL_UNLISTED
+        channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE)
         or channel == amo.CHANNEL_LISTED
         and not addon.has_listed_versions(include_deleted=True)
     )
@@ -1006,6 +1011,9 @@ def developer_profile(request, user_id):
         '_listed_versions_exists': Exists(
             sub_versions_qs.filter(channel=amo.CHANNEL_LISTED)
         ),
+        '_enterprise_versions_exists': Exists(
+            sub_versions_qs.filter(channel=amo.CHANNEL_ENTERPRISE)
+        ),
     }
     qs = (
         Addon.unfiltered.filter(authors=developer)
@@ -1146,7 +1154,7 @@ def allow_resubmission(self, request, **kwargs):
     def json_file_validation(self, request, **kwargs):
         addon = get_object_or_404(Addon.unfiltered.id_or_slug(kwargs['pk']))
         file = get_object_or_404(File, version__addon=addon, id=kwargs['file_id'])
-        if file.version.channel == amo.CHANNEL_UNLISTED:
+        if file.version.channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE):
             if not acl.is_unlisted_addons_viewer_or_reviewer(request.user):
                 raise PermissionDenied
         elif not acl.is_reviewer(request.user, addon):
diff --git a/src/olympia/scanners/admin.py b/src/olympia/scanners/admin.py
index 48b3dc42a263..db0c88081993 100644
--- a/src/olympia/scanners/admin.py
+++ b/src/olympia/scanners/admin.py
@@ -431,13 +431,7 @@ def formatted_addon(self, obj):
                     reverse(
                         'reviewers.review',
                         args=[
-                            (
-                                'listed'
-                                if obj.version.channel == amo.CHANNEL_LISTED
-                                else 'unlisted'
-                                if obj.version.channel == amo.CHANNEL_UNLISTED
-                                else 'enterprise'
-                            ),
+                            amo.CHANNEL_CHOICES_API[obj.version.channel],
                             obj.version.addon.id,
                         ],
                     ),
@@ -727,11 +721,7 @@ def formatted_channel(self, obj):
                     reverse(
                         'reviewers.review',
                         args=[
-                            (
-                                'listed'
-                                if obj.version.channel == amo.CHANNEL_LISTED
-                                else 'unlisted'
-                            ),
+                            (amo.CHANNEL_CHOICES_API[obj.version.channel]),
                             obj.version.addon.id,
                         ],
                     ),
diff --git a/src/olympia/signing/serializers.py b/src/olympia/signing/serializers.py
index fc574058f392..4ef5868575cc 100644
--- a/src/olympia/signing/serializers.py
+++ b/src/olympia/signing/serializers.py
@@ -102,4 +102,4 @@ def get_passed_review(self, instance):
         return self.get_active(instance)
 
     def get_automated_signing(self, instance):
-        return instance.channel == amo.CHANNEL_UNLISTED
+        return instance.channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE)
diff --git a/src/olympia/stats/tests/test_views.py b/src/olympia/stats/tests/test_views.py
index 872194173537..7cb865247f85 100644
--- a/src/olympia/stats/tests/test_views.py
+++ b/src/olympia/stats/tests/test_views.py
@@ -121,7 +121,7 @@ def setUp(self):
             'start': '20090601',
             'end': '20090930',
         }
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
 
     def test_no_public_stats_for_unlisted_addon(self):
         """All the views for the stats return 404 for unlisted addons."""
@@ -1171,7 +1171,7 @@ def test_links_for_deleted_addon(self):
         )
 
     def test_no_download_stats_for_purely_unlisted_addons(self):
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert not self.addon.has_listed_versions()
 
         url = reverse('stats.overview', args=[self.addon.slug])
diff --git a/src/olympia/users/tests/test_models.py b/src/olympia/users/tests/test_models.py
index b0a8733b82e7..7eb0096d8aaa 100644
--- a/src/olympia/users/tests/test_models.py
+++ b/src/olympia/users/tests/test_models.py
@@ -1222,7 +1222,7 @@ def test_num_addons_listed(self):
         AddonUser.objects.create(addon=extra_addon, user=user, listed=True)
         extra_addon2 = addon_factory()
         AddonUser.objects.create(addon=extra_addon2, user=user, listed=True)
-        self.make_addon_unlisted(extra_addon2)
+        self.change_channel_for_addon(extra_addon2, amo.CHANNEL_UNLISTED)
         assert user.num_addons_listed == 1
 
         AddonUser.objects.filter(addon=addon, user=user).update(listed=False)
@@ -1317,9 +1317,11 @@ def test_has_full_profile(self):
         assert user.has_full_profile
 
         # The add-on needs to be public.
-        self.make_addon_unlisted(addon)  # Easy way to toggle status
+        self.change_channel_for_addon(
+            addon, amo.CHANNEL_UNLISTED
+        )  # Easy way to toggle status
         assert not user.reload().has_full_profile
-        self.make_addon_listed(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_LISTED)
         addon.update(status=amo.STATUS_APPROVED)
         assert user.reload().has_full_profile
 
@@ -2085,7 +2087,9 @@ def test_change_display_name_only_non_mozilla_disabled_addons_current_version(
 
         # Add some extra add-ons that are going to be ignored.
         addon_factory(name='Force disabled', users=[user]).force_disable()
-        self.make_addon_unlisted(addon_factory(name='Pure unlisted', users=[user]))
+        self.change_channel_for_addon(
+            addon_factory(name='Pure unlisted', users=[user]), amo.CHANNEL_UNLISTED
+        )
 
         user.update(display_name='Flôp')
 
diff --git a/src/olympia/versions/models.py b/src/olympia/versions/models.py
index 21a864b9cfb3..f4baa1da9457 100644
--- a/src/olympia/versions/models.py
+++ b/src/olympia/versions/models.py
@@ -663,7 +663,7 @@ def from_upload(
         return version
 
     def get_url_path(self):
-        if self.channel == amo.CHANNEL_UNLISTED:
+        if self.channel in (amo.CHANNEL_UNLISTED, amo.CHANNEL_ENTERPRISE):
             return ''
         return reverse('addons.versions', args=[self.addon.slug])
 
diff --git a/src/olympia/versions/tests/test_models.py b/src/olympia/versions/tests/test_models.py
index 80dd7f3fcb3f..9d5d0bb90ed1 100644
--- a/src/olympia/versions/tests/test_models.py
+++ b/src/olympia/versions/tests/test_models.py
@@ -884,7 +884,7 @@ def test_approved_versions(self):
         assert list(Version.objects.approved()) == [self.version]
 
     def test_unlisted_addon_get_url_path(self):
-        self.make_addon_unlisted(self.version.addon)
+        self.change_channel_for_addon(self.version.addon, amo.CHANNEL_UNLISTED)
         self.version.reload()
         assert self.version.get_url_path() == ''
 
@@ -1255,7 +1255,7 @@ def test_should_have_due_date_disabled_unlisted(self):
 
     def test_should_have_due_date_unlisted(self):
         addon = Addon.objects.get(id=3615)
-        self.make_addon_unlisted(addon)
+        self.change_channel_for_addon(addon, amo.CHANNEL_UNLISTED)
         version = addon.versions.first()
 
         assert not version.should_have_due_date
@@ -2441,7 +2441,7 @@ def test_dont_inherit_due_date_if_one_already_exists(self):
 
     def test_dont_inherit_needs_human_review_from_different_channel(self):
         old_version = self.addon.current_version
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         NeedsHumanReview.objects.create(version=old_version)
         assert old_version.due_date
 
@@ -2934,7 +2934,7 @@ def test_set_in_future_overwrite_existing_lower_delay(self):
     def test_second_unlisted_version(self):
         set_config('INITIAL_DELAY_FOR_UNLISTED', '3600')
         self.addon.update(created=datetime.now() - timedelta(seconds=600))
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         Version.from_upload(
             self.upload,
             self.addon,
@@ -2949,7 +2949,7 @@ def test_second_unlisted_version_deleted(self):
         set_config('INITIAL_DELAY_FOR_UNLISTED', '3600')
         self.addon.update(created=datetime.now() - timedelta(seconds=600))
         version = self.addon.current_version
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         version.delete()
         Version.from_upload(
             self.upload,
diff --git a/src/olympia/versions/tests/test_views.py b/src/olympia/versions/tests/test_views.py
index 16ca3d32a6e2..d0ec0656ec61 100644
--- a/src/olympia/versions/tests/test_views.py
+++ b/src/olympia/versions/tests/test_views.py
@@ -209,7 +209,7 @@ def login(self, user):
 class TestDownloadsUnlistedVersions(TestDownloadsBase):
     def setUp(self):
         super().setUp()
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
 
     @mock.patch.object(acl, 'is_listed_addons_viewer_or_reviewer', lambda user: False)
     @mock.patch.object(acl, 'is_unlisted_addons_viewer_or_reviewer', lambda user: False)
@@ -577,7 +577,7 @@ class TestUnlistedFileDownloads(
 ):
     def setUp(self):
         super().setUp()
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         self.grant_permission(
             UserProfile.objects.get(email='reviewer@mozilla.com'),
             amo.permissions.ADDONS_REVIEW_UNLISTED,
@@ -903,7 +903,7 @@ def test_no_source_should_go_in_404(self):
     @mock.patch.object(acl, 'check_addon_ownership', lambda *args, **kwargs: False)
     def test_download_for_unlisted_addon_returns_404(self):
         """File downloading isn't allowed for unlisted addons."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.client.get(self.url).status_code == 404
 
     @mock.patch.object(acl, 'is_listed_addons_viewer_or_reviewer', lambda user: False)
@@ -911,7 +911,7 @@ def test_download_for_unlisted_addon_returns_404(self):
     @mock.patch.object(acl, 'check_addon_ownership', lambda *args, **kwargs: True)
     def test_download_for_unlisted_addon_owner(self):
         """File downloading is allowed for addon owners."""
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.client.get(self.url).status_code == 200
 
     @mock.patch.object(acl, 'is_listed_addons_viewer_or_reviewer', lambda user: False)
@@ -920,7 +920,7 @@ def test_download_for_unlisted_addon_owner(self):
     def test_download_for_addon_owner_deleted(self):
         self.addon.delete()
         assert self.client.get(self.url).status_code == 404
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.client.get(self.url).status_code == 404
 
     @mock.patch.object(acl, 'is_listed_addons_viewer_or_reviewer', lambda user: True)
@@ -931,7 +931,7 @@ def test_download_for_unlisted_addon_reviewer(self):
         admin."""
         assert self.client.get(self.url).status_code == 404
 
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.client.get(self.url).status_code == 404
 
     def test_download_for_source_download_permission(self):
@@ -942,7 +942,7 @@ def test_download_for_source_download_permission(self):
         assert self.client.get(self.url).status_code == 200
 
         # Even unlisted.
-        self.make_addon_unlisted(self.addon)
+        self.change_channel_for_addon(self.addon, amo.CHANNEL_UNLISTED)
         assert self.client.get(self.url).status_code == 200
 
         # Even disabled.
diff --git a/static/css/devhub/new-landing/base.less b/static/css/devhub/new-landing/base.less
index 4d082226affa..092480bf4bc9 100644
--- a/static/css/devhub/new-landing/base.less
+++ b/static/css/devhub/new-landing/base.less
@@ -41,6 +41,7 @@
 
 @color-publish-channel-listed: #01bdad;
 @color-publish-channel-unlisted: #7a2f7a;
+@color-publish-channel-enterprise: #ff9216;
 
 // Common styles
 * {
diff --git a/static/css/devhub/new-landing/sections/my-addons.less b/static/css/devhub/new-landing/sections/my-addons.less
index bd7faea1d957..c73ff8591cc2 100644
--- a/static/css/devhub/new-landing/sections/my-addons.less
+++ b/static/css/devhub/new-landing/sections/my-addons.less
@@ -71,7 +71,8 @@
 }
 
 .DevHub-MyAddons-item-channel-listed,
-.DevHub-MyAddons-item-channel-unlisted {
+.DevHub-MyAddons-item-channel-unlisted,
+.DevHub-MyAddons-item-channel-enterprise {
   border-radius: 4px;
   padding: 2px 5px;
   font-size: 13px;
@@ -88,6 +89,10 @@
   background-color: @color-publish-channel-unlisted;
 }
 
+.DevHub-MyAddons-item-channel-unlisted {
+  background-color: @color-publish-channel-enterprise;
+}
+
 .DevHub-MyAddons-item-icon {
   max-width: 128px;
   height: 64px;