diff --git a/elements/enable-serial-console/README.md b/elements/enable-serial-console/README.md
new file mode 100644
index 00000000..f753b160
--- /dev/null
+++ b/elements/enable-serial-console/README.md
@@ -0,0 +1,10 @@
+Start getty on active serial consoles.
+
+With ILO and other remote admin environments, having a serial console can be
+useful for debugging and troubleshooting.
+
+For upstart:
+  If ttyS1 exists, getty will run on that, otherwise on ttyS0.
+
+For systemd:
+  We dynamically start a getty on any active serial port via udev rules.
diff --git a/elements/serial-console/cleanup.d/99-fix-grub b/elements/enable-serial-console/cleanup.d/99-fix-grub
similarity index 100%
rename from elements/serial-console/cleanup.d/99-fix-grub
rename to elements/enable-serial-console/cleanup.d/99-fix-grub
diff --git a/elements/serial-console/install.d/20-stty b/elements/enable-serial-console/install.d/20-stty
similarity index 100%
rename from elements/serial-console/install.d/20-stty
rename to elements/enable-serial-console/install.d/20-stty
diff --git a/elements/serial-console/install.d/serial-console-udev.rules b/elements/enable-serial-console/install.d/serial-console-udev.rules
similarity index 100%
rename from elements/serial-console/install.d/serial-console-udev.rules
rename to elements/enable-serial-console/install.d/serial-console-udev.rules
diff --git a/elements/serial-console/install.d/ttySx.conf b/elements/enable-serial-console/install.d/ttySx.conf
similarity index 100%
rename from elements/serial-console/install.d/ttySx.conf
rename to elements/enable-serial-console/install.d/ttySx.conf
diff --git a/elements/serial-console/README.md b/elements/serial-console/README.md
index f753b160..b7f0812f 100644
--- a/elements/serial-console/README.md
+++ b/elements/serial-console/README.md
@@ -1,10 +1 @@
-Start getty on active serial consoles.
-
-With ILO and other remote admin environments, having a serial console can be
-useful for debugging and troubleshooting.
-
-For upstart:
-  If ttyS1 exists, getty will run on that, otherwise on ttyS0.
-
-For systemd:
-  We dynamically start a getty on any active serial port via udev rules.
+**This element is now deprecated please use enable-serial-console instead**
diff --git a/elements/serial-console/element-deps b/elements/serial-console/element-deps
new file mode 100644
index 00000000..b91d8569
--- /dev/null
+++ b/elements/serial-console/element-deps
@@ -0,0 +1 @@
+enable-serial-console
diff --git a/elements/serial-console/extra-data.d/20-stty b/elements/serial-console/extra-data.d/20-stty
new file mode 100755
index 00000000..9eee4748
--- /dev/null
+++ b/elements/serial-console/extra-data.d/20-stty
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -uex
+set -o pipefail
+
+echo "Use of serial-console element is deprecated, please use enable-serial-console instead."