diff --git a/doc/ChangeLog b/doc/ChangeLog
index 2c44741..834dafd 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-22  Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
+
+	* Renames of Console and PyReadline complete.
+	
 2006-01-22  Jörgen Stenarson  <jorgen.stenarson -at- bostream.nu>
 
 	* This revision will not compile. Due to limitations in case 
diff --git a/pyreadline/__init__.py b/pyreadline/__init__.py
index f4e260b..bf51c49 100644
--- a/pyreadline/__init__.py
+++ b/pyreadline/__init__.py
@@ -1,4 +1,4 @@
-from PyReadline import *
+from pyreadline import *
 
 __all__ = [ 'parse_and_bind',
             'get_line_buffer',
diff --git a/pyreadline/xConsole.py b/pyreadline/console.py
similarity index 100%
rename from pyreadline/xConsole.py
rename to pyreadline/console.py
diff --git a/pyreadline/xPyReadline.py b/pyreadline/pyreadline.py
similarity index 99%
rename from pyreadline/xPyReadline.py
rename to pyreadline/pyreadline.py
index 49fd08f..ec2d4a8 100644
--- a/pyreadline/xPyReadline.py
+++ b/pyreadline/pyreadline.py
@@ -1,4 +1,3 @@
-# -*- coding: ISO-8859-1 -*-
 ''' an attempt to implement readline for Python in Python using ctypes'''
 
 import string
@@ -12,11 +11,11 @@ import operator
 
 import win32con as c32
 
-import Console
-from Console import log
+import console as console
+from console import log
 from keysyms import key_text_to_keyinfo,printable_chars_in_codepage
 
-import clipboard
+import clipboard as clipboard
 import ctypes
 
 enable_win32_clipboard=True
@@ -49,7 +48,7 @@ class Readline:
         self.undo_stack = [] # each entry is a tuple with cursor_position and line_text
         self.line_buffer = []
         self.line_cursor = 0
-        self.console = Console.Console()
+        self.console = console.Console()
         self.size = self.console.size()
         self.prompt_color = None
         self.command_color = None
@@ -1179,5 +1178,5 @@ if __name__ == '__main__':
     print res
 else:
     #import wingdbstub
-    Console.install_readline(rl.readline)
+    console.install_readline(rl.readline)