diff --git a/ion/src/shared/keyboard.c b/ion/src/shared/keyboard.c
index 23490fd36..3af428949 100644
--- a/ion/src/shared/keyboard.c
+++ b/ion/src/shared/keyboard.c
@@ -1,7 +1,7 @@
 #include <ion.h>
 #include <string.h>
 
-static const char charForKey[ION_NUMBER_OF_KEYS] = {
+static const char kCharForKey[ION_NUMBER_OF_KEYS] = {
   'A', 'B', 'C', 'D', 'E',
   'F', 'G', 'H', 'I', 'J',
   'K', 'L', 'M', 'N', 'O',
@@ -32,7 +32,7 @@ char ion_getchar() {
     for (ion_key_t k=0; k<ION_NUMBER_OF_KEYS; k++) {
       if (ion_key_down(k)) {
         if (key_seen_up[k]) {
-          return charForKey[k];
+          return kCharForKey[k];
         }
       } else {
         key_seen_up[k] = 1;
diff --git a/ion/src/simulator/keyboard/fltkkbd.cpp b/ion/src/simulator/keyboard/fltkkbd.cpp
index d8eb2969f..3d8266376 100644
--- a/ion/src/simulator/keyboard/fltkkbd.cpp
+++ b/ion/src/simulator/keyboard/fltkkbd.cpp
@@ -4,9 +4,7 @@
 #define KEYBOARD_ROWS 7
 #define KEYBOARD_COLUMNS 5
 
-// TODO(raimundo): do this in a clean way with no duplication.
-// A bit ugly but we need a null terminated string from a single char.
-static const char* charForKey[KEYBOARD_ROWS * KEYBOARD_COLUMNS] = {
+static const char* kCharForKey[KEYBOARD_ROWS * KEYBOARD_COLUMNS] = {
   "A", "B", "C", "D", "E",
   "F", "G", "H", "I", "J",
   "K", "L", "M", "N", "O",
@@ -25,7 +23,7 @@ FltkKbd::FltkKbd(int x, int y, int w, int h) : Fl_Group(x, y, w, h) {
                                  y + (k/KEYBOARD_COLUMNS)*key_height,
                                  key_width,
                                  key_height,
-                                 charForKey[k]);
+                                 kCharForKey[k]);
   }
   end();
 }