diff --git a/escher/Makefile b/escher/Makefile
index 2882061a9..ef51a07c4 100644
--- a/escher/Makefile
+++ b/escher/Makefile
@@ -7,7 +7,7 @@ objs += $(addprefix escher/src/,\
   button.o\
   button_row_controller.o\
   chevron_view.o\
-  clipped_board.o\
+  clipboard.o\
   container.o\
   dynamic_view_controller.o\
   editable_text_cell.o\
diff --git a/escher/include/escher.h b/escher/include/escher.h
index 4893a7b06..fd2ae9428 100644
--- a/escher/include/escher.h
+++ b/escher/include/escher.h
@@ -8,7 +8,7 @@
 #include <escher/button.h>
 #include <escher/button_row_controller.h>
 #include <escher/chevron_view.h>
-#include <escher/clipped_board.h>
+#include <escher/clipboard.h>
 #include <escher/container.h>
 #include <escher/dynamic_view_controller.h>
 #include <escher/editable_text_cell.h>
diff --git a/escher/include/escher/clipped_board.h b/escher/include/escher/clipboard.h
similarity index 56%
rename from escher/include/escher/clipped_board.h
rename to escher/include/escher/clipboard.h
index d0bf7c680..94c433a5e 100644
--- a/escher/include/escher/clipped_board.h
+++ b/escher/include/escher/clipboard.h
@@ -1,12 +1,11 @@
-#ifndef ESCHER_CLIPPED_BOARD_H
-#define ESCHER_CLIPPED_BOARD_H
+#ifndef ESCHER_CLIPBOARD_H
+#define ESCHER_CLIPBOARD_H
 
 #include <escher/text_field.h>
 
-class ClippedBoard {
+class Clipboard {
 public:
-  ClippedBoard();
-  static ClippedBoard * sharedClippedBoard();
+  static Clipboard * sharedClipboard();
   void store(const char * storedText);
   const char * storedText();
   void reset();
diff --git a/escher/src/clipboard.cpp b/escher/src/clipboard.cpp
new file mode 100644
index 000000000..537076d6b
--- /dev/null
+++ b/escher/src/clipboard.cpp
@@ -0,0 +1,19 @@
+#include <escher/clipboard.h>
+
+static Clipboard s_clipboard;
+
+Clipboard * Clipboard::sharedClipboard() {
+  return &s_clipboard;
+}
+
+void Clipboard::store(const char * storedText) {
+  strlcpy(m_textBuffer, storedText, TextField::maxBufferSize());
+}
+
+const char * Clipboard::storedText() {
+  return m_textBuffer;
+}
+
+void Clipboard::reset() {
+  strlcpy(m_textBuffer, "", 1);
+}
diff --git a/escher/src/clipped_board.cpp b/escher/src/clipped_board.cpp
deleted file mode 100644
index d42b32b8d..000000000
--- a/escher/src/clipped_board.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <escher/clipped_board.h>
-
-static ClippedBoard s_clippedBoard;
-
-ClippedBoard::ClippedBoard()
-{
-}
-
-ClippedBoard * ClippedBoard::sharedClippedBoard() {
-  return &s_clippedBoard;
-}
-
-void ClippedBoard::store(const char * storedText) {
-  strlcpy(m_textBuffer, storedText, TextField::maxBufferSize());
-}
-
-const char * ClippedBoard::storedText() {
-  return m_textBuffer;
-}
-
-void ClippedBoard::reset() {
-  strlcpy(m_textBuffer, "", 1);
-}
diff --git a/escher/src/text_field.cpp b/escher/src/text_field.cpp
index 3c676a719..b439c003d 100644
--- a/escher/src/text_field.cpp
+++ b/escher/src/text_field.cpp
@@ -1,5 +1,5 @@
 #include <escher/text_field.h>
-#include <escher/clipped_board.h>
+#include <escher/clipboard.h>
 #include <assert.h>
 
 /* TextField::ContentView */
@@ -355,19 +355,19 @@ bool TextField::handleEvent(Ion::Events::Event event) {
     return true;
   }
   if (event == Ion::Events::Copy && !isEditing()) {
-    ClippedBoard::sharedClippedBoard()->store(text());
+    Clipboard::sharedClipboard()->store(text());
     return true;
   }
   if (event == Ion::Events::Cut && !isEditing()) {
-    ClippedBoard::sharedClippedBoard()->store(text());
+    Clipboard::sharedClipboard()->store(text());
     setEditing(true, true);
     return true;
   }
   if (event == Ion::Events::Paste) {
     setEditing(true);
     int nextCursorLocation = textLength();
-    if (insertTextAtLocation(ClippedBoard::sharedClippedBoard()->storedText(), cursorLocation())) {
-      nextCursorLocation = cursorLocation() + strlen(ClippedBoard::sharedClippedBoard()->storedText());
+    if (insertTextAtLocation(Clipboard::sharedClipboard()->storedText(), cursorLocation())) {
+      nextCursorLocation = cursorLocation() + strlen(Clipboard::sharedClipboard()->storedText());
     }
     setCursorLocation(nextCursorLocation);
     return true;