diff --git a/Makefile b/Makefile
index de0951f..d9af847 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ##############################################################################
 #                                                                            #
-# FiveD on Arduino - alternative firmware for repraps                        #
+# Teacup - alternative firmware for repraps                                  #
 #                                                                            #
 # by Triffid Hunter, Traumflug, jakepoz                                      #
 #                                                                            #
diff --git a/README b/README
index 9479784..f2f2561 100644
--- a/README
+++ b/README
@@ -1,3 +1,9 @@
+##############################################################################
+#                                                                            #
+# Teacup (formely FiveD on Arduino) firmware                                 #
+#                                                                            #
+##############################################################################
+
 Rewrite of Reprap Mendel firmware:
 
 * 100% integer computations
diff --git a/config.h.dist b/config.h.dist
index 5c9f44a..3e6c3cd 100644
--- a/config.h.dist
+++ b/config.h.dist
@@ -397,7 +397,7 @@ DEFINE_HEATER(bed,			PORTB, PINB4, OCR0B)
 // #define	DC_EXTRUDER_PWM	180
 
 /*
-	FiveD on Arduino implements a watchdog, which has to be reset every 250ms or it will reboot the controller. As rebooting (and letting the GCode sending application trying to continue the build with a then different Home point) is probably even worse than just hanging, and there is no better restore code in place, this is disabled for now.
+	Teacup implements a watchdog, which has to be reset every 250ms or it will reboot the controller. As rebooting (and letting the GCode sending application trying to continue the build with a then different Home point) is probably even worse than just hanging, and there is no better restore code in place, this is disabled for now.
 */
 // #define USE_WATCHDOG
 
diff --git a/extruder/Makefile b/extruder/Makefile
index e2d7e5a..7dccd18 100644
--- a/extruder/Makefile
+++ b/extruder/Makefile
@@ -1,6 +1,6 @@
 ##############################################################################
 #                                                                            #
-# FiveD on Arduino - alternative firmware for repraps                        #
+# Teacup - alternative firmware for repraps                                  #
 #                                                                            #
 # by Triffid Hunter, Traumflug, jakepoz                                      #
 #                                                                            #
diff --git a/extruder/README b/extruder/README
index 3d313a2..1a116f4 100644
--- a/extruder/README
+++ b/extruder/README
@@ -1,2 +1,2 @@
-Reprap Gen3 extruder controller support for Triffid_Hunter's FiveD_on_Arduino firmware
+Reprap Gen3 extruder controller support for Triffid_Hunter's Teacup firmware
 by jakepoz