diff --git a/CHANGES.current b/CHANGES.current
index 188e7a7ca..5f5dba766 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -112,8 +112,13 @@ Version 1.3.20 (In progress)
 
 	    So, all the language maintainers, please check the
 	    keywords list, and remember that you can also add bad
-	    member names too, like *::clone or *::cget (see an example
-	    in the tcl8/tclkw.swg file).
+	    members names too, like *::clone or *::cget (see an
+	    example in the tcl8/tclkw.swg file).
+
+	    Just to be consistent:
+
+	    - Use code 314 for keyword and/or fatal bad names.
+	    - Use code 315 for bad names, but not fatal ones.
 
 	    **** And don't add any new test file without checking it
 	    with the -Wallkw option!! (that includes me) *****.
diff --git a/Lib/java/javakw.swg b/Lib/java/javakw.swg
index 02121d7fb..0dfd44353 100644
--- a/Lib/java/javakw.swg
+++ b/Lib/java/javakw.swg
@@ -62,7 +62,7 @@ JAVAKW(while);
 /* others bad names */
 
 /* Not really sure about this, but sometimes it produce problems */
-// %namewarn("314:clone is a java reserved method name") *::clone;
+// %namewarn("315:clone is a java bad method name") *::clone;
 
 
 #undef JAVAKW
diff --git a/Lib/python/pythonkw.swg b/Lib/python/pythonkw.swg
index c327b028d..14480bfda 100644
--- a/Lib/python/pythonkw.swg
+++ b/Lib/python/pythonkw.swg
@@ -36,19 +36,9 @@ PYTHONKW(yield);
 
 #undef PYTHONKW
 
-/*
- bad names
- http://users.ox.ac.uk/~sann1276/python/handbook/node52.html
-*/
+#define PYTHONBN(x) %namewarn("315:" #x " is a bad name in python")  #x
 
-#define PYTHONBN(x) %namewarn("314:" #x " is a bad name in python")  #x
-
-PYTHONBN(Data);
-PYTHONBN(Float);
-PYTHONBN(Int);
-PYTHONBN(Numeric);
-PYTHONBN(Oxphys);
-PYTHONBN(array);
+/* recurrent built-in functions */
 PYTHONBN(close);
 PYTHONBN(float);
 PYTHONBN(int);
@@ -56,10 +46,8 @@ PYTHONBN(input);
 PYTHONBN(open);
 PYTHONBN(range);
 PYTHONBN(type);
-PYTHONBN(write);
-PYTHONBN(zeros);
-
 
+/* Boolean type */
 PYTHONBN(True);
 PYTHONBN(False);