diff --git a/README.md b/README.md
index d073c9a..7aa6cf3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-teeth-agent images
+ironic-python-agent images
 ==================
 
-coreos - Builds a CoreOS Ramdisk and Kernel suitable for running teeth-agent
+coreos - Builds a CoreOS Ramdisk and Kernel suitable for running ironic-python-agent
diff --git a/coreos/Makefile b/coreos/Makefile
index 26a1cc2..25f9e3f 100644
--- a/coreos/Makefile
+++ b/coreos/Makefile
@@ -8,7 +8,7 @@ coreos:
 	./coreos-oem-inject.py oem UPLOAD
 
 clean:
-	rm -rf teeth-agent
+	rm -rf ironic-python-agent
 	rm -f oem/container.tar.gz
 	rm -f UPLOAD/coreos_production_pxe_image-oem.cpio.gz
 	rm -f UPLOAD/coreos_production_pxe.vmlinuz
diff --git a/coreos/README.md b/coreos/README.md
index 4798fe8..60f6f1d 100644
--- a/coreos/README.md
+++ b/coreos/README.md
@@ -1,6 +1,6 @@
-# teeth-agent CoreOS Image builder.
+# ironic-python-agent CoreOS Image builder.
 
-Builds a CoreOS image suitable for running the teeth-agent on a server.
+Builds a CoreOS image suitable for running the ironic-python-agent on a server.
 
 # Requirements
 
diff --git a/coreos/docker_build.bash b/coreos/docker_build.bash
index d8b6715..8b28f3e 100755
--- a/coreos/docker_build.bash
+++ b/coreos/docker_build.bash
@@ -15,7 +15,7 @@ if [[ -e "${OUTPUT_FILE}" ]]; then
 fi
 
 # Build the docker image
-cd ../../teeth-agent
+cd ../../ironic-python-agent
 docker build -t oemdocker .
 cd -
 
diff --git a/coreos/oem/run.sh b/coreos/oem/run.sh
index ff09be4..e4d5730 100755
--- a/coreos/oem/run.sh
+++ b/coreos/oem/run.sh
@@ -28,4 +28,4 @@ done
 docker load < container.tar.gz
 
 systemctl enable --runtime /usr/share/oem/system/*
-systemctl start teeth-agent.service
+systemctl start ironic-python-agent.service
diff --git a/coreos/oem/system/ironic-python-agent.service b/coreos/oem/system/ironic-python-agent.service
new file mode 100644
index 0000000..c15b9e6
--- /dev/null
+++ b/coreos/oem/system/ironic-python-agent.service
@@ -0,0 +1,6 @@
+[Service]
+ExecStart=/usr/bin/docker run -p 9999:9999 -privileged=true -v=/sys:/mnt/sys oemdocker /usr/local/bin/ironic-python-agent --ipaddr="`ip a | grep '10\.' | sed -e 's/inet \(10\.[0-9\.]\+\).*/\1/'`"
+Restart=always
+
+[Install]
+WantedBy=oem.target
diff --git a/coreos/oem/system/teeth-agent.service b/coreos/oem/system/teeth-agent.service
deleted file mode 100644
index a25c2ba..0000000
--- a/coreos/oem/system/teeth-agent.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Service]
-ExecStart=/usr/bin/docker run -p 9999:9999 -privileged=true -v=/sys:/mnt/sys oemdocker /usr/local/bin/teeth-agent --ipaddr="`ip a | grep '10\.' | sed -e 's/inet \(10\.[0-9\.]\+\).*/\1/'`"
-Restart=always
-
-[Install]
-WantedBy=oem.target