diff --git a/app/experimenter/experiments/constants.py b/app/experimenter/experiments/constants.py
index 353028ca40..e80c56362c 100644
--- a/app/experimenter/experiments/constants.py
+++ b/app/experimenter/experiments/constants.py
@@ -9,7 +9,7 @@ class ExperimentConstants(object):
 
     TYPE_CHOICES = (
         (TYPE_PREF, "Pref-Flip Study"),
-        (TYPE_ADDON, "Addon Study"),
+        (TYPE_ADDON, "Opt-Out Study"),
     )
 
     # Status stuff
@@ -137,7 +137,7 @@ class ExperimentConstants(object):
         for users that enroll into the experiment.
       </p>
       <p>
-        An <strong>Addon Study</strong> sends a Firefox addon which
+        An <strong>Opt-Out Study</strong> sends a Firefox addon which
         contains the code for the experimental feature to the users that
         enroll in the study.  After the experiment is complete, that addon
         is automatically removed.
@@ -636,7 +636,7 @@ class ExperimentConstants(object):
 
     BUGZILLA_ADDON_TEMPLATE = (
         """
-    Experiment Type: Addon Study
+    Experiment Type: Opt-Out Study
 
     What are the branches of the study:
 
diff --git a/app/experimenter/experiments/migrations/0020_auto_20180912_1838.py b/app/experimenter/experiments/migrations/0020_auto_20180912_1838.py
new file mode 100644
index 0000000000..ffbaf88b8e
--- /dev/null
+++ b/app/experimenter/experiments/migrations/0020_auto_20180912_1838.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2018-09-12 18:38
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("experiments", "0019_auto_20180912_1408")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="experiment",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("pref", "Pref-Flip Study"),
+                    ("addon", "Opt-Out Study"),
+                ],
+                default="pref",
+                max_length=255,
+            ),
+        )
+    ]