diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
index 72c81f0298d47cda325fbd47ab2906cb2ddfe289..637ea98a571297e8ecce685889911be0097d32c2 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@@ -58,7 +58,7 @@
     #define REPRAP_DISCOUNT_SMART_CONTROLLER
   #endif
 
-  #if defined(ULTIMAKERCONTROLLER) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL) || defined(RIGIDPANEL)
+  #if defined(ULTIMAKERCONTROLLER) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL) || defined(RIGIDBOT_PANEL)
     #define ULTIPANEL
     #define NEWPANEL
   #endif
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index 7589d0156d2bd112ca6b357946bfe9bb9c88406f..16d56ca3e8dd1b6080aad302b27131ae3d73e160 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -686,6 +686,9 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
+//
+// RigidBoard: To rewire this for a RigidBot see http://rigidtalk.com/wiki/index.php?title=LCD_Smart_Controller
+//
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 
 // The RepRapWorld REPRAPWORLD_KEYPAD v1.1
@@ -698,9 +701,9 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
 // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
 //#define RA_CONTROL_PANEL
 
-// The RigidPanel controller for RigidBot
-// http://rigidbot.com/
-#define RIGIDPANEL
+// RigidBot Panel V1.0
+// http://www.inventapart.com/
+#define RIGIDBOT_PANEL
 
 /**
  * I2C Panels
diff --git a/Marlin/pins_RIGIDBOARD.h b/Marlin/pins_RIGIDBOARD.h
index 494e6fcd41c6648ed27ee556ecee1490a053e874..2846e895eee7cf9b239458eb810f742c85564e26 100644
--- a/Marlin/pins_RIGIDBOARD.h
+++ b/Marlin/pins_RIGIDBOARD.h
@@ -20,7 +20,7 @@
 
 // LCD Panel options for the RigidBoard
 
-#ifdef RIGIDPANEL
+#ifdef RIGIDBOT_PANEL
 
   #undef BEEPER
   #define BEEPER -1