diff --git a/VERSION b/VERSION
index 25910d92..cd153d7c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.1 (2012-08-29 18:27:27) rc4
+Version 2.00.1 (2012-08-29 18:31:20) rc4
diff --git a/gluon/contrib/webclient.py b/gluon/contrib/webclient.py
index 50224ab1..c742669c 100644
--- a/gluon/contrib/webclient.py
+++ b/gluon/contrib/webclient.py
@@ -83,9 +83,9 @@ class WebClient(object):
         self.history.append((self.method,self.url,self.status,self.time))
 
 def test_web2py_registration_and_login():
-    session = WebClient('http://127.0.0.1:8000/welcome/default/')
-    session.get('index')
-    session_id_welcome = session.cookies['session_id_welcome']
+    client = WebClient('http://127.0.0.1:8000/welcome/default/')
+    client.get('index')
+    session_id_welcome = client.cookies['session_id_welcome']
 
     data = dict(first_name = 'Homer',
                 last_name = 'Simpson',
@@ -93,22 +93,22 @@ def test_web2py_registration_and_login():
                 password = 'test',
                 password_two = 'test',
                 _formname = 'register')
-    session.post('user/register',data = data)
+    client.post('user/register',data = data)
 
     data = dict(email='homer@web2py.com',
                 password='test',
                 _formname = 'login')
-    session.post('user/login',data = data)
+    client.post('user/login',data = data)
     
-    session.get('index')
+    client.get('index')
 
     # check registration and login were successful
-    assert 'Welcome Homer' in session.text
+    assert 'Welcome Homer' in client.text
 
     # check we are always in the same session
-    assert session_id_welcome == session.cookies['session_id_welcome']
+    assert session_id_welcome == client.cookies['session_id_welcome']
 
-    for method, url, status, t in session.history:
+    for method, url, status, t in client.history:
         print method, url, status, t
 
 if __name__ == '__main__':
diff --git a/gluon/tests/test_web.py b/gluon/tests/test_web.py
index 82b1e01e..65b0a5b5 100644
--- a/gluon/tests/test_web.py
+++ b/gluon/tests/test_web.py
@@ -15,9 +15,10 @@ from gluon.contrib.webclient import WebClient
 
 class TestWeb(unittest.TestCase):
     def testWebClient(self):
-        session = WebClient('http://127.0.0.1:8000/welcome/default/')
-        session.get('index')
-        session_id_welcome = session.cookies['session_id_welcome']
+        client = WebClient('http://127.0.0.1:8000/welcome/default/')
+
+        client.get('index')
+        session_id_welcome = client.cookies['session_id_welcome']
 
         data = dict(first_name = 'Homer',
                     last_name = 'Simpson',
@@ -25,20 +26,22 @@ class TestWeb(unittest.TestCase):
                     password = 'test',
                     password_two = 'test',
                     _formname = 'register')
-        session.post('user/register',data = data)
+        client.post('user/register',data = data)
 
         
         data = dict(email='homer@web2py.com',
                     password='test',
                     _formname = 'login')
-        session.post('user/login',data = data)
+        client.post('user/login',data = data)
         
-        session.get('index')
+        client.get('index')
+
         # check registration and login were successful
-        self.assertTrue('Welcome Homer' in session.text)   
+        self.assertTrue('Welcome Homer' in client.text)   
+
         # check we are always in the same session
         self.assertEqual(session_id_welcome,
-                         session.cookies['session_id_welcome'])
+                         client.cookies['session_id_welcome'])
 
 if __name__ == '__main__':
     unittest.main()