diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index f26d4c48f512..cdadaffb9a46 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -861,7 +861,7 @@ pref("browser.preferences.animateFadeIn", false);
 #endif
 
 // Toggles between the two Preferences implementations, pop-up window and in-content
-#ifdef NIGHTLY_BUILD
+#ifndef RELEASE_BUILD
 pref("browser.preferences.inContent", true);
 pref("browser.preferences.instantApply", true);
 #else
@@ -1290,8 +1290,13 @@ pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
 #endif
 
 // Developer edition preferences
+#ifdef MOZ_DEV_EDITION
+pref("browser.devedition.theme.enabled", true);
+pref("browser.devedition.theme.showCustomizeButton", true);
+#else
 pref("browser.devedition.theme.enabled", false);
 pref("browser.devedition.theme.showCustomizeButton", false);
+#endif
 
 // Disable the error console
 pref("devtools.errorconsole.enabled", false);
@@ -1442,7 +1447,11 @@ pref("devtools.canvasdebugger.enabled", false);
 pref("devtools.webaudioeditor.enabled", false);
 
 // Default theme ("dark" or "light")
+#ifdef MOZ_DEV_EDITION
+pref("devtools.theme", "dark");
+#else
 pref("devtools.theme", "light");
+#endif
 
 // Display the introductory text
 pref("devtools.gcli.hideIntro", false);
@@ -1697,7 +1706,11 @@ pref("identity.fxaccounts.settings.uri", "https://accounts.firefox.com/settings"
 
 // Migrate any existing Firefox Account data from the default profile to the
 // Developer Edition profile.
+#ifdef MOZ_DEV_EDITION
+pref("identity.fxaccounts.migrateToDevEdition", true);
+#else
 pref("identity.fxaccounts.migrateToDevEdition", false);
+#endif
 
 // On GTK, we now default to showing the menubar only when alt is pressed:
 #ifdef MOZ_WIDGET_GTK
diff --git a/browser/branding/aurora/branding.nsi b/browser/branding/aurora/branding.nsi
index 2c780c6ca3e9..8ef4e0b28f1d 100644
--- a/browser/branding/aurora/branding.nsi
+++ b/browser/branding/aurora/branding.nsi
@@ -8,7 +8,7 @@
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Aurora"
+!define BrandFullNameInternal "Firefox Developer Edition"
 !define CompanyName           "mozilla.org"
 !define URLInfoAbout          "https://www.mozilla.org"
 !define HelpLink              "https://support.mozilla.org"
diff --git a/browser/branding/aurora/configure.sh b/browser/branding/aurora/configure.sh
index dfd50eda9ab0..cc60251cb7e5 100644
--- a/browser/branding/aurora/configure.sh
+++ b/browser/branding/aurora/configure.sh
@@ -2,4 +2,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MOZ_APP_DISPLAYNAME=Aurora
+MOZ_APP_DISPLAYNAME=FirefoxDevEdition
+MOZ_APP_REMOTINGNAME=firefox-dev
diff --git a/browser/branding/aurora/locales/en-US/brand.dtd b/browser/branding/aurora/locales/en-US/brand.dtd
index 6b1d88929f4b..8050f83e8004 100644
--- a/browser/branding/aurora/locales/en-US/brand.dtd
+++ b/browser/branding/aurora/locales/en-US/brand.dtd
@@ -2,7 +2,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Aurora">
-<!ENTITY  brandFullName         "Aurora">
+<!ENTITY  brandShortName        "FirefoxDevEdition">
+<!ENTITY  brandFullName         "Firefox Developer Edition">
 <!ENTITY  vendorShortName       "Mozilla">
 <!ENTITY  trademarkInfo.part1   " ">
diff --git a/browser/branding/aurora/locales/en-US/brand.properties b/browser/branding/aurora/locales/en-US/brand.properties
index 3d0b28c6edef..f3732b58ac30 100644
--- a/browser/branding/aurora/locales/en-US/brand.properties
+++ b/browser/branding/aurora/locales/en-US/brand.properties
@@ -2,8 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Aurora
-brandFullName=Aurora
+brandShortName=FirefoxDevEdition
+brandFullName=Firefox Developer Edition
 vendorShortName=Mozilla
 
 syncBrandShortName=Sync
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 1d5481e52fee..961f77e2c9dd 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -736,12 +736,20 @@ pref("toolkit.asyncshutdown.timeout.crash", 60000);
 pref("devtools.errorconsole.deprecation_warnings", true);
 
 // Disable debugging chrome
+#ifdef MOZ_DEV_EDITION
+pref("devtools.chrome.enabled", true);
+#else
 pref("devtools.chrome.enabled", false);
+#endif
 
 // Disable remote debugging protocol logging
 pref("devtools.debugger.log", false);
 // Disable remote debugging connections
+#ifdef MOZ_DEV_EDITION
+pref("devtools.debugger.remote-enabled", true);
+#else
 pref("devtools.debugger.remote-enabled", false);
+#endif
 pref("devtools.debugger.remote-port", 6000);
 // Force debugger server binding on the loopback interface
 pref("devtools.debugger.force-local", true);