diff --git a/src/java/org/lwjgl/input/Keyboard.java b/src/java/org/lwjgl/input/Keyboard.java
index 11e78660..730f8390 100644
--- a/src/java/org/lwjgl/input/Keyboard.java
+++ b/src/java/org/lwjgl/input/Keyboard.java
@@ -475,7 +475,7 @@ public class Keyboard {
   /**
    * @return The character from the current event
    */
-  public static char getCharacter() {
+  public static char getEventCharacter() {
     return eventCharacter;
   }
 
diff --git a/src/java/org/lwjgl/test/input/KeyboardTest.java b/src/java/org/lwjgl/test/input/KeyboardTest.java
index 69512343..bf2efb67 100644
--- a/src/java/org/lwjgl/test/input/KeyboardTest.java
+++ b/src/java/org/lwjgl/test/input/KeyboardTest.java
@@ -133,7 +133,7 @@ public class KeyboardTest {
       int count = Keyboard.getNumKeyboardEvents();
       while (Keyboard.next()) {
         System.out.println("Checking key:" + Keyboard.getKeyName(Keyboard.getEventKey()));
-        System.out.println("Key character: " + Keyboard.getCharacter());
+        System.out.println("Key character: " + Keyboard.getEventCharacter());
         
         if (Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) {
           return;