diff --git a/Form/Form.pde b/Form/Form.pde
index f3cee024..cceae209 100644
--- a/Form/Form.pde
+++ b/Form/Form.pde
@@ -1,12 +1,12 @@
 /*
 This example demonstrates how to use the Form and Field classes from the
-FreetronicsLCD library to provide a simple UI on the 16x2 LCD display.
+LCD library to provide a simple UI on the 16x2 LCD display.
 
 This example is placed into the public domain.
 */
 
 // include the library code:
-#include <FreetronicsLCD.h>
+#include <LCD.h>
 #include <Form.h>
 #include <TextField.h>
 #include <TimeField.h>
@@ -14,11 +14,11 @@ This example is placed into the public domain.
 #include <BoolField.h>
 
 // Initialize the LCD
-FreetronicsLCD lcd;
+LCD lcd;
 
 // Note: if you are using the USBDroid and have reassigned pin D9 on the LCD shield to some
 // other pin (e.g. A1), then you will need to initialize the shield with something like:
-// FreetronicsLCD lcd(A1);
+// LCD lcd(A1);
 // See also: http://www.freetronics.com/pages/combining-the-lcd-keypad-shield-and-the-usbdroid
 
 // Create the main form and its fields.
diff --git a/HelloWorld/HelloWorld.pde b/HelloWorld/HelloWorld.pde
index 74dd075e..2c346f50 100644
--- a/HelloWorld/HelloWorld.pde
+++ b/HelloWorld/HelloWorld.pde
@@ -1,5 +1,5 @@
 /*
-This example demonstrates how to use the FreetronicsLCD library, which extends the
+This example demonstrates how to use the LCD library, which extends the
 standard LiquidCrystal library to provide support for the Freetronics back light
 and Up/Down/Left/Right/Select buttons.  More information on the shield here:
 
@@ -9,14 +9,14 @@ This example is placed into the public domain.
 */
 
 // include the library code:
-#include <FreetronicsLCD.h>
+#include <LCD.h>
 
 // initialize the library
-FreetronicsLCD lcd;
+LCD lcd;
 
 // Note: if you are using the USBDroid and have reassigned pin D9 on the LCD shield to some
 // other pin (e.g. A1), then you will need to initialize the shield with something like:
-// FreetronicsLCD lcd(A1);
+// LCD lcd(A1);
 // See also: http://www.freetronics.com/pages/combining-the-lcd-keypad-shield-and-the-usbdroid
 
 void setup() {
diff --git a/doc/Doxyfile b/doc/Doxyfile
index fb06feee..0855d498 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -610,7 +610,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = ../libraries/FreetronicsLCD ../libraries/BlinkLED ../libraries/I2C ../libraries/RTC ../libraries/Melody ../libraries/PowerSave .
+INPUT                  = ../libraries/LCD ../libraries/BlinkLED ../libraries/I2C ../libraries/RTC ../libraries/Melody ../libraries/PowerSave .
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -688,7 +688,7 @@ EXAMPLE_RECURSIVE      = NO
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             = ../libraries/BlinkLED/examples/Cylon ../libraries/BlinkLED/examples/Cylon4 ../libraries/BlinkLED/examples/StarTrek ../libraries/FreetronicsLCD/examples/HelloWorld ../libraries/FreetronicsLCD/examples/Form ../libraries/RTC/examples/AlarmClock
+IMAGE_PATH             = ../libraries/BlinkLED/examples/Cylon ../libraries/BlinkLED/examples/Cylon4 ../libraries/BlinkLED/examples/StarTrek ../libraries/LCD/examples/HelloWorld ../libraries/LCD/examples/Form ../libraries/RTC/examples/AlarmClock
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
diff --git a/doc/alarm-clock.dox b/doc/alarm-clock.dox
index ddcfd92d..73a82195 100644
--- a/doc/alarm-clock.dox
+++ b/doc/alarm-clock.dox
@@ -27,7 +27,7 @@
 \section clock_features Features
 
 The alarm clock described on this page is a large example application that
-uses many of the classes in the provided libraries: FreetronicsLCD, Form,
+uses many of the classes in the provided libraries: LCD, Form,
 Field, SoftI2C, DS1307RTC, Melody and \ref power_save "PowerSave".
 The clock has the following features:
 
diff --git a/doc/lcd-form.dox b/doc/lcd-form.dox
index f9d1db5c..ce299778 100644
--- a/doc/lcd-form.dox
+++ b/doc/lcd-form.dox
@@ -37,14 +37,14 @@ buttons are used to modify the value of the currently-displayed field.
 
 We start by including the classes from the library that we will need:
 
-\dontinclude FreetronicsLCD/examples/Form/Form.pde
-\skip FreetronicsLCD.h
+\dontinclude LCD/examples/Form/Form.pde
+\skip LCD.h
 \until BoolField.h
 
 Next, we initialize the LCD display, create the main form, and populate
 it with fields:
 
-\dontinclude FreetronicsLCD/examples/Form/Form.pde
+\dontinclude LCD/examples/Form/Form.pde
 \skip lcd;
 \until lcd;
 \skip mainForm
@@ -77,7 +77,7 @@ duration between 0 and 24 hours.
 Now that we have defined our form, we need to initialize the program and
 show it for the first time:
 
-\dontinclude FreetronicsLCD/examples/Form/Form.pde
+\dontinclude LCD/examples/Form/Form.pde
 \skip STATUS_LED
 \until }
 
@@ -86,10 +86,10 @@ given time.  To switch to another form, call Form::hide() on the old
 form and Form::show() on the new form.
 
 All that remains is to define our application's \c loop function which
-retrieves button events from FreetronicsLCD::getButton() and dispatches them
+retrieves button events from LCD::getButton() and dispatches them
 to the form:
 
-\dontinclude FreetronicsLCD/examples/Form/Form.pde
+\dontinclude LCD/examples/Form/Form.pde
 \skip loop()
 \until }
 \until }
@@ -97,5 +97,5 @@ to the form:
 
 The full source code for the example follows:
 
-\include FreetronicsLCD/examples/Form/Form.pde
+\include LCD/examples/Form/Form.pde
 */
diff --git a/doc/lcd-helloworld.dox b/doc/lcd-helloworld.dox
index fac92465..c24b6e50 100644
--- a/doc/lcd-helloworld.dox
+++ b/doc/lcd-helloworld.dox
@@ -24,20 +24,20 @@
 \file lcd-helloworld.dox
 \page lcd_hello_world Hello World for Freetronics LCD
 
-The FreetronicsLCD class provides an enhanced version of the standard
+The LCD class provides an enhanced version of the standard
 Arduino <a href="http://arduino.cc/en/Reference/LiquidCrystal">LiquidCrystal</a>
 library that supports the additional features of the
 <a href="http://www.freetronics.com/pages/16x2-lcd-shield-quickstart-guide">Freetronics LCD</a> shield;
 namely the back light and the Up, Down, Left, Right, and Select buttons.
-This tutorial explains how to use the FreetronicsLCD class to perform
+This tutorial explains how to use the LCD class to perform
 basic text output and to use the enhanced shield features.
 
 \image html HelloWorld.png
 
 We start by including the library and initializing it:
 
-\dontinclude FreetronicsLCD/examples/HelloWorld/HelloWorld.pde
-\skip FreetronicsLCD.h
+\dontinclude LCD/examples/HelloWorld/HelloWorld.pde
+\skip LCD.h
 \until lcd
 
 Unlike the LiquidCrystal library we don't normally need to specify the pin
@@ -47,39 +47,39 @@ with the USBDroid and the D9 pin is reassigned as described on
 would look something like this instead:
 
 \code
-FreetronicsLCD lcd(A1);
+LCD lcd(A1);
 \endcode
 
 The next step is to enable the screen saver and print some text
 in the \c setup function:
 
-\dontinclude FreetronicsLCD/examples/HelloWorld/HelloWorld.pde
+\dontinclude LCD/examples/HelloWorld/HelloWorld.pde
 \skip setup()
 \until }
 
-The screen saver is a built-in feature of the FreetronicsLCD class that
+The screen saver is a built-in feature of the LCD class that
 turns off the display and the back light after a specific timeout
 (the default is 10 seconds).  Pressing any of the keys on the shield
-or calling FreetronicsLCD::display() will wake up the screen again.
+or calling LCD::display() will wake up the screen again.
 
 In the program's \c loop function we print the number of seconds
 since startup to the second line of the LCD display:
 
-\dontinclude FreetronicsLCD/examples/HelloWorld/HelloWorld.pde
+\dontinclude LCD/examples/HelloWorld/HelloWorld.pde
 \skip loop()
 \until millis()
 
 We then print the name of the button that is currently pressed:
 
-\dontinclude FreetronicsLCD/examples/HelloWorld/HelloWorld.pde
+\dontinclude LCD/examples/HelloWorld/HelloWorld.pde
 \skip setCursor(8, 1)
 \until }
 
-The FreetronicsLCD::getButton() function returns the key that has
+The LCD::getButton() function returns the key that has
 been pressed or released, or LCD_BUTTON_NONE if no key has been
 pressed or released this time through the loop.
 
 The full source code for the example follows:
 
-\include FreetronicsLCD/examples/HelloWorld/HelloWorld.pde
+\include LCD/examples/HelloWorld/HelloWorld.pde
 */
diff --git a/doc/mainpage.dox b/doc/mainpage.dox
index f781490d..5d2d0040 100644
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -27,9 +27,9 @@
 Utility libraries for enhanced use of standard Arduino main boards
 and shields.
 
-\section main_FreeTronics Freetronics LCD Shield
+\section main_LCD Freetronics LCD Shield
 
-\li FreetronicsLCD class to manage the extended features of the Freetronics
+\li LCD class to manage the extended features of the Freetronics
 LCD shield.
 \li Form and Field classes to build simple property sheet UI's on LCD displays.
 \li \ref lcd_hello_world "Hello World" example for the Freetronics LCD shield.
@@ -67,7 +67,7 @@ The default implementation simulates the time and date based on the value of
 <tt>millis()</tt>.
 \li DS1307RTC class that talks to the DS1307 realtime clock chip via I2C.
 \li \ref alarm_clock "Alarm Clock" example that uses the DS1307
-realtime clock and the FreetronicsLCD library to implement an alarm clock.
+realtime clock and the LCD library to implement an alarm clock.
 
 \section main_other Other
 
diff --git a/gen/genlookup.c b/gen/genlookup.c
index b5bc9714..e0f8f163 100644
--- a/gen/genlookup.c
+++ b/gen/genlookup.c
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-// Utility for generating the button mapping table in FreetronicsLCD.cpp.
+// Utility for generating the button mapping table in LCD.cpp.
 
 #include <stdio.h>
 
diff --git a/libraries/FreetronicsLCD/BoolField.cpp b/libraries/LCD/BoolField.cpp
similarity index 100%
rename from libraries/FreetronicsLCD/BoolField.cpp
rename to libraries/LCD/BoolField.cpp
diff --git a/libraries/FreetronicsLCD/BoolField.h b/libraries/LCD/BoolField.h
similarity index 100%
rename from libraries/FreetronicsLCD/BoolField.h
rename to libraries/LCD/BoolField.h
diff --git a/libraries/FreetronicsLCD/Field.cpp b/libraries/LCD/Field.cpp
similarity index 97%
rename from libraries/FreetronicsLCD/Field.cpp
rename to libraries/LCD/Field.cpp
index c28878c5..edfa7715 100644
--- a/libraries/FreetronicsLCD/Field.cpp
+++ b/libraries/LCD/Field.cpp
@@ -78,7 +78,7 @@ Field::~Field()
 /**
  * \brief Dispatches \a event via this field.
  *
- * The \a event is usually obtained from FreetronicsLCD::getButton().
+ * The \a event is usually obtained from LCD::getButton().
  *
  * Returns zero if the \a event has been handled and no further action
  * is required.
@@ -91,7 +91,7 @@ Field::~Field()
  * be handled by the Form itself (particularly for Left and Right buttons).
  * The default implementation returns -1 for all events.
  *
- * \sa Form::dispatch(), FreetronicsLCD::getButton()
+ * \sa Form::dispatch(), LCD::getButton()
  */
 int Field::dispatch(int event)
 {
diff --git a/libraries/FreetronicsLCD/Field.h b/libraries/LCD/Field.h
similarity index 100%
rename from libraries/FreetronicsLCD/Field.h
rename to libraries/LCD/Field.h
diff --git a/libraries/FreetronicsLCD/Form.cpp b/libraries/LCD/Form.cpp
similarity index 98%
rename from libraries/FreetronicsLCD/Form.cpp
rename to libraries/LCD/Form.cpp
index 6523bc11..b957f1a8 100644
--- a/libraries/FreetronicsLCD/Form.cpp
+++ b/libraries/LCD/Form.cpp
@@ -72,7 +72,7 @@ Form::~Form()
  * \brief Dispatches \a event to the currently active field using
  * Field::dispatch().
  *
- * The \a event is usually obtained from FreetronicsLCD::getButton().
+ * The \a event is usually obtained from LCD::getButton().
  *
  * Returns zero if the \a event has been handled and no further action
  * is required.
@@ -94,7 +94,7 @@ Form::~Form()
  *
  * This function handles the Left and Right buttons to navigate between fields.
  *
- * \sa Field::dispatch(), FreetronicsLCD::getButton(), currentField(), isCurrent()
+ * \sa Field::dispatch(), LCD::getButton(), currentField(), isCurrent()
  */
 int Form::dispatch(int event)
 {
diff --git a/libraries/FreetronicsLCD/Form.h b/libraries/LCD/Form.h
similarity index 98%
rename from libraries/FreetronicsLCD/Form.h
rename to libraries/LCD/Form.h
index 313911c0..607b87cb 100644
--- a/libraries/FreetronicsLCD/Form.h
+++ b/libraries/LCD/Form.h
@@ -23,7 +23,7 @@
 #ifndef Form_h
 #define Form_h
 
-#include "FreetronicsLCD.h"
+#include "LCD.h"
 
 class Field;
 
diff --git a/libraries/FreetronicsLCD/IntField.cpp b/libraries/LCD/IntField.cpp
similarity index 100%
rename from libraries/FreetronicsLCD/IntField.cpp
rename to libraries/LCD/IntField.cpp
diff --git a/libraries/FreetronicsLCD/IntField.h b/libraries/LCD/IntField.h
similarity index 100%
rename from libraries/FreetronicsLCD/IntField.h
rename to libraries/LCD/IntField.h
diff --git a/libraries/FreetronicsLCD/FreetronicsLCD.cpp b/libraries/LCD/LCD.cpp
similarity index 92%
rename from libraries/FreetronicsLCD/FreetronicsLCD.cpp
rename to libraries/LCD/LCD.cpp
index d5dbfac1..802fe88a 100644
--- a/libraries/FreetronicsLCD/FreetronicsLCD.cpp
+++ b/libraries/LCD/LCD.cpp
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "FreetronicsLCD.h"
+#include "LCD.h"
 #include <avr/pgmspace.h>
 #include <WProgram.h>
 
@@ -30,7 +30,7 @@
 #define DEBOUNCE_DELAY          10      // Delay in ms to debounce buttons
 
 /**
- * \class FreetronicsLCD FreetronicsLCD.h <FreetronicsLCD.h>
+ * \class LCD LCD.h <LCD.h>
  * \brief Enhanced library for Freetronics 16x2 LCD shields
  *
  * This class extends the standard Arduino LiquidCrystal library with
@@ -70,13 +70,13 @@
  * generic button has been released with <tt>button &lt; 0</tt>.
  *
  * See the \ref lcd_hello_world "Hello World" example for more
- * information on using the FreetronicsLCD class.
+ * information on using the LCD class.
  *
  * \sa Form
  */
 
 /**
- * \fn FreetronicsLCD::FreetronicsLCD()
+ * \fn LCD::LCD()
  * \brief Initialize the Freetronics LCD display with the default
  * pin assignment.
  *
@@ -84,12 +84,12 @@
  * LCD shield:
  *
  * \code
- * FreetronicsLCD lcd;
+ * LCD lcd;
  * \endcode
  */
 
 /**
- * \fn FreetronicsLCD::FreetronicsLCD(uint8_t pin9)
+ * \fn LCD::LCD(uint8_t pin9)
  * \brief Initialize the Freetronics LCD display for USBDroid.
  *
  * On the USBDroid, the D9 pin is used for USB Host functionality.
@@ -104,11 +104,11 @@
  * Web page of A1, you would initialize the LCD as follows:
  *
  * \code
- * FreetronicsLCD lcd(A1);
+ * LCD lcd(A1);
  * \endcode
  */
 
-void FreetronicsLCD::init()
+void LCD::init()
 {
     // The Freetronics display is 16x2.
     begin(16, 2);
@@ -141,7 +141,7 @@ void FreetronicsLCD::init()
  *
  * \sa noDisplay(), enableScreenSaver(), setScreenSaverMode()
  */
-void FreetronicsLCD::display()
+void LCD::display()
 {
     LiquidCrystal::display();
     digitalWrite(LCD_BACK_LIGHT, HIGH);
@@ -156,7 +156,7 @@ void FreetronicsLCD::display()
  *
  * \sa display(), enableScreenSaver(), setScreenSaverMode()
  */
-void FreetronicsLCD::noDisplay()
+void LCD::noDisplay()
 {
     if (mode == DisplayOff)
         LiquidCrystal::noDisplay();
@@ -165,30 +165,30 @@ void FreetronicsLCD::noDisplay()
 }
 
 /**
- * \enum FreetronicsLCD::ScreenSaverMode
+ * \enum LCD::ScreenSaverMode
  * \brief Screen saver mode that controls the display and back light.
  */
 
 /**
- * \var FreetronicsLCD::DisplayOff
+ * \var LCD::DisplayOff
  * \brief Turn off both the display and the backlight when the screen saver
  * is activated.
  */
 
 /**
- * \var FreetronicsLCD::BacklightOff
+ * \var LCD::BacklightOff
  * \brief Turn off the back light but leave the display on when the screen
  * saver is activated.
  */
 
 /**
- * \var FreetronicsLCD::BacklightOnSelect
+ * \var LCD::BacklightOnSelect
  * \brief Same as BacklightOff but the screen saver is only deactivated when
  * Select is pressed; other buttons have no effect.
  */
 
 /**
- * \fn ScreenSaverMode FreetronicsLCD::screenSaverMode() const
+ * \fn ScreenSaverMode LCD::screenSaverMode() const
  * \brief Returns the current screen saver mode; default is DisplayOff.
  *
  * \sa setScreenSaverMode(), enableScreenSaver()
@@ -199,7 +199,7 @@ void FreetronicsLCD::noDisplay()
  *
  * \sa screenSaverMode(), enableScreenSaver()
  */
-void FreetronicsLCD::setScreenSaverMode(ScreenSaverMode mode)
+void LCD::setScreenSaverMode(ScreenSaverMode mode)
 {
     if (this->mode != mode) {
         this->mode = mode;
@@ -225,7 +225,7 @@ void FreetronicsLCD::setScreenSaverMode(ScreenSaverMode mode)
  *
  * \sa disableScreenSaver(), display(), getButton(), isScreenSaved()
  */
-void FreetronicsLCD::enableScreenSaver(int timeoutSecs)
+void LCD::enableScreenSaver(int timeoutSecs)
 {
     if (timeoutSecs < 0)
         timeout = 0;
@@ -239,14 +239,14 @@ void FreetronicsLCD::enableScreenSaver(int timeoutSecs)
  *
  * \sa enableScreenSaver(), display(), isScreenSaved()
  */
-void FreetronicsLCD::disableScreenSaver()
+void LCD::disableScreenSaver()
 {
     timeout = 0;
     display();
 }
 
 /**
- * \fn bool FreetronicsLCD::isScreenSaved() const
+ * \fn bool LCD::isScreenSaved() const
  * \brief Returns true if the screen has been saved; false otherwise.
  *
  * \sa enableScreenSaver()
@@ -284,7 +284,7 @@ static prog_uint8_t const buttonMappings[] PROGMEM = {
  *
  * \sa enableScreenSaver(), display(), Form::dispatch()
  */
-int FreetronicsLCD::getButton()
+int LCD::getButton()
 {
     // Read the currently pressed button.
     int button = mapButton(analogRead(LCD_BUTTON_PIN));
diff --git a/libraries/FreetronicsLCD/FreetronicsLCD.h b/libraries/LCD/LCD.h
similarity index 91%
rename from libraries/FreetronicsLCD/FreetronicsLCD.h
rename to libraries/LCD/LCD.h
index 22ad2774..7d02c312 100644
--- a/libraries/FreetronicsLCD/FreetronicsLCD.h
+++ b/libraries/LCD/LCD.h
@@ -20,8 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef FreetronicsLCD_h
-#define FreetronicsLCD_h
+#ifndef LCD_h
+#define LCD_h
 
 // Extended version of the LiquidCrystal library that works specifically
 // with Freetronics' 16x2 LCD display, including support for the back
@@ -45,10 +45,10 @@
 #define LCD_BUTTON_DOWN_RELEASED    -4
 #define LCD_BUTTON_SELECT_RELEASED  -5
 
-class FreetronicsLCD : public LiquidCrystal {
+class LCD : public LiquidCrystal {
 public:
-    FreetronicsLCD() : LiquidCrystal(8, 9, 4, 5, 6, 7) { init(); }
-    FreetronicsLCD(uint8_t pin9) : LiquidCrystal(8, pin9, 4, 5, 6, 7) { init(); }
+    LCD() : LiquidCrystal(8, 9, 4, 5, 6, 7) { init(); }
+    LCD(uint8_t pin9) : LiquidCrystal(8, pin9, 4, 5, 6, 7) { init(); }
 
     void display();
     void noDisplay();
diff --git a/libraries/FreetronicsLCD/ListField.cpp b/libraries/LCD/ListField.cpp
similarity index 100%
rename from libraries/FreetronicsLCD/ListField.cpp
rename to libraries/LCD/ListField.cpp
diff --git a/libraries/FreetronicsLCD/ListField.h b/libraries/LCD/ListField.h
similarity index 100%
rename from libraries/FreetronicsLCD/ListField.h
rename to libraries/LCD/ListField.h
diff --git a/libraries/FreetronicsLCD/TextField.cpp b/libraries/LCD/TextField.cpp
similarity index 100%
rename from libraries/FreetronicsLCD/TextField.cpp
rename to libraries/LCD/TextField.cpp
diff --git a/libraries/FreetronicsLCD/TextField.h b/libraries/LCD/TextField.h
similarity index 100%
rename from libraries/FreetronicsLCD/TextField.h
rename to libraries/LCD/TextField.h
diff --git a/libraries/FreetronicsLCD/TimeField.cpp b/libraries/LCD/TimeField.cpp
similarity index 100%
rename from libraries/FreetronicsLCD/TimeField.cpp
rename to libraries/LCD/TimeField.cpp
diff --git a/libraries/FreetronicsLCD/TimeField.h b/libraries/LCD/TimeField.h
similarity index 100%
rename from libraries/FreetronicsLCD/TimeField.h
rename to libraries/LCD/TimeField.h
diff --git a/libraries/FreetronicsLCD/examples/Form/Form.pde b/libraries/LCD/examples/Form/Form.pde
similarity index 92%
rename from libraries/FreetronicsLCD/examples/Form/Form.pde
rename to libraries/LCD/examples/Form/Form.pde
index f3cee024..cceae209 100644
--- a/libraries/FreetronicsLCD/examples/Form/Form.pde
+++ b/libraries/LCD/examples/Form/Form.pde
@@ -1,12 +1,12 @@
 /*
 This example demonstrates how to use the Form and Field classes from the
-FreetronicsLCD library to provide a simple UI on the 16x2 LCD display.
+LCD library to provide a simple UI on the 16x2 LCD display.
 
 This example is placed into the public domain.
 */
 
 // include the library code:
-#include <FreetronicsLCD.h>
+#include <LCD.h>
 #include <Form.h>
 #include <TextField.h>
 #include <TimeField.h>
@@ -14,11 +14,11 @@ This example is placed into the public domain.
 #include <BoolField.h>
 
 // Initialize the LCD
-FreetronicsLCD lcd;
+LCD lcd;
 
 // Note: if you are using the USBDroid and have reassigned pin D9 on the LCD shield to some
 // other pin (e.g. A1), then you will need to initialize the shield with something like:
-// FreetronicsLCD lcd(A1);
+// LCD lcd(A1);
 // See also: http://www.freetronics.com/pages/combining-the-lcd-keypad-shield-and-the-usbdroid
 
 // Create the main form and its fields.
diff --git a/libraries/FreetronicsLCD/examples/Form/FormBool.png b/libraries/LCD/examples/Form/FormBool.png
similarity index 100%
rename from libraries/FreetronicsLCD/examples/Form/FormBool.png
rename to libraries/LCD/examples/Form/FormBool.png
diff --git a/libraries/FreetronicsLCD/examples/Form/FormInt.png b/libraries/LCD/examples/Form/FormInt.png
similarity index 100%
rename from libraries/FreetronicsLCD/examples/Form/FormInt.png
rename to libraries/LCD/examples/Form/FormInt.png
diff --git a/libraries/FreetronicsLCD/examples/Form/FormText.png b/libraries/LCD/examples/Form/FormText.png
similarity index 100%
rename from libraries/FreetronicsLCD/examples/Form/FormText.png
rename to libraries/LCD/examples/Form/FormText.png
diff --git a/libraries/FreetronicsLCD/examples/Form/FormTimeRO.png b/libraries/LCD/examples/Form/FormTimeRO.png
similarity index 100%
rename from libraries/FreetronicsLCD/examples/Form/FormTimeRO.png
rename to libraries/LCD/examples/Form/FormTimeRO.png
diff --git a/libraries/FreetronicsLCD/examples/Form/FormTimeRW.png b/libraries/LCD/examples/Form/FormTimeRW.png
similarity index 100%
rename from libraries/FreetronicsLCD/examples/Form/FormTimeRW.png
rename to libraries/LCD/examples/Form/FormTimeRW.png
diff --git a/libraries/FreetronicsLCD/examples/HelloWorld/HelloWorld.pde b/libraries/LCD/examples/HelloWorld/HelloWorld.pde
similarity index 87%
rename from libraries/FreetronicsLCD/examples/HelloWorld/HelloWorld.pde
rename to libraries/LCD/examples/HelloWorld/HelloWorld.pde
index ddc63b01..7aec8994 100644
--- a/libraries/FreetronicsLCD/examples/HelloWorld/HelloWorld.pde
+++ b/libraries/LCD/examples/HelloWorld/HelloWorld.pde
@@ -1,5 +1,5 @@
 /*
-This example demonstrates how to use the FreetronicsLCD library, which extends the
+This example demonstrates how to use the LCD library, which extends the
 standard LiquidCrystal library to provide support for the Freetronics back light
 and Up/Down/Left/Right/Select buttons.  More information on the shield here:
 
@@ -8,12 +8,12 @@ http://www.freetronics.com/pages/16x2-lcd-shield-quickstart-guide
 This example is placed into the public domain.
 */
 
-#include <FreetronicsLCD.h>
-FreetronicsLCD lcd;
+#include <LCD.h>
+LCD lcd;
 
 // Note: if you are using the USBDroid and have reassigned pin D9 on the LCD shield to some
 // other pin (e.g. A1), then you will need to initialize the shield with something like:
-// FreetronicsLCD lcd(A1);
+// LCD lcd(A1);
 // See also: http://www.freetronics.com/pages/combining-the-lcd-keypad-shield-and-the-usbdroid
 
 void setup() {
diff --git a/libraries/FreetronicsLCD/examples/HelloWorld/HelloWorld.png b/libraries/LCD/examples/HelloWorld/HelloWorld.png
similarity index 100%
rename from libraries/FreetronicsLCD/examples/HelloWorld/HelloWorld.png
rename to libraries/LCD/examples/HelloWorld/HelloWorld.png
diff --git a/libraries/FreetronicsLCD/keywords.txt b/libraries/LCD/keywords.txt
similarity index 93%
rename from libraries/FreetronicsLCD/keywords.txt
rename to libraries/LCD/keywords.txt
index 5b761ffd..9d7fedb9 100644
--- a/libraries/FreetronicsLCD/keywords.txt
+++ b/libraries/LCD/keywords.txt
@@ -1,4 +1,4 @@
-FreetronicsLCD	KEYWORD1
+LCD	KEYWORD1
 Form	KEYWORD1
 Field	KEYWORD1
 BoolField	KEYWORD1
diff --git a/libraries/FreetronicsLCD/utility/LiquidCrystal.cpp b/libraries/LCD/utility/LiquidCrystal.cpp
similarity index 100%
rename from libraries/FreetronicsLCD/utility/LiquidCrystal.cpp
rename to libraries/LCD/utility/LiquidCrystal.cpp
diff --git a/libraries/FreetronicsLCD/utility/LiquidCrystal.h b/libraries/LCD/utility/LiquidCrystal.h
similarity index 100%
rename from libraries/FreetronicsLCD/utility/LiquidCrystal.h
rename to libraries/LCD/utility/LiquidCrystal.h
diff --git a/libraries/RTC/examples/AlarmClock/AlarmClock.pde b/libraries/RTC/examples/AlarmClock/AlarmClock.pde
index 3bc68dd1..35a4e2c0 100644
--- a/libraries/RTC/examples/AlarmClock/AlarmClock.pde
+++ b/libraries/RTC/examples/AlarmClock/AlarmClock.pde
@@ -21,7 +21,7 @@
  */
 
 // include the library code:
-#include <FreetronicsLCD.h>
+#include <LCD.h>
 #include <Form.h>
 #include <Field.h>
 #include <BoolField.h>
@@ -55,7 +55,7 @@
 #define SETTING_MELODY          3   // Melody to play for the alarm
 
 // Initialize the LCD
-FreetronicsLCD lcd;
+LCD lcd;
 
 // Activate the realtime clock chip.
 SoftI2C bus(RTC_DATA, RTC_CLOCK);
@@ -104,7 +104,7 @@ void setup() {
     power_timer1_disable();
 
     // Enable the screen saver.
-    lcd.setScreenSaverMode(FreetronicsLCD::BacklightOnSelect);
+    lcd.setScreenSaverMode(LCD::BacklightOnSelect);
     lcd.enableScreenSaver(3);
 
     // Initialize the alarm melody.