diff --git a/COPYING b/COPYING
index 9b8d08d..ef0eb42 100644
--- a/COPYING
+++ b/COPYING
@@ -271,7 +271,7 @@ TO THE TQUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
 
-  12. IN NO EVENT UNLESS RETQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSETQUENTIAL DAMAGES ARISING
diff --git a/doc/classref/khtml/DOM.DOMException.html b/doc/classref/khtml/DOM.DOMException.html
index a695d2e..cb254cb 100644
--- a/doc/classref/khtml/DOM.DOMException.html
+++ b/doc/classref/khtml/DOM.DOMException.html
@@ -35,7 +35,7 @@
         </tr>
         </table>
         <h3>enums</h3><ul>
-<li><b>ExceptionCode</b> = {INDEX_SIZE_ERR, DOMSTRING_SIZE_ERR, HIERARCHY_RETQUEST_ERR, WRONG_DOCUMENT_ERR, INVALID_CHARACTER_ERR, NO_DATA_ALLOWED_ERR, NO_MODIFICATION_ALLOWED_ERR, NOT_FOUND_ERR, NOT_SUPPORTED_ERR, INUSE_ATTRIBUTE_ERR, INVALID_STATE_ERR, SYNTAX_ERR, INVALID_MODIFICATION_ERR, NAMESPACE_ERR, INVALID_ACCESS_ERR
+<li><b>ExceptionCode</b> = {INDEX_SIZE_ERR, DOMSTRING_SIZE_ERR, HIERARCHY_REQUEST_ERR, WRONG_DOCUMENT_ERR, INVALID_CHARACTER_ERR, NO_DATA_ALLOWED_ERR, NO_MODIFICATION_ALLOWED_ERR, NOT_FOUND_ERR, NOT_SUPPORTED_ERR, INUSE_ATTRIBUTE_ERR, INVALID_STATE_ERR, SYNTAX_ERR, INVALID_MODIFICATION_ERR, NAMESPACE_ERR, INVALID_ACCESS_ERR
 }</ul>
 <h3>methods</h3><ul>
 <li><b>DOMException</b> (_code)
diff --git a/doc/classref/kio/KIO.html b/doc/classref/kio/KIO.html
index f01caf6..df3ae6a 100644
--- a/doc/classref/kio/KIO.html
+++ b/doc/classref/kio/KIO.html
@@ -45,7 +45,7 @@
 }<li><b>Error</b> = {ERR_CANNOT_OPEN_FOR_READING, ERR_CANNOT_OPEN_FOR_WRITING, ERR_CANNOT_LAUNCH_PROCESS, ERR_INTERNAL, ERR_MALFORMED_URL, ERR_UNSUPPORTED_PROTOCOL, ERR_NO_SOURCE_PROTOCOL, ERR_UNSUPPORTED_ACTION, ERR_IS_DIRECTORY, ERR_IS_FILE, ERR_DOES_NOT_EXIST, ERR_FILE_ALREADY_EXIST, ERR_DIR_ALREADY_EXIST, ERR_UNKNOWN_HOST, ERR_ACCESS_DENIED, ERR_WRITE_ACCESS_DENIED, ERR_CANNOT_ENTER_DIRECTORY, ERR_PROTOCOL_IS_NOT_A_FILESYSTEM, ERR_CYCLIC_LINK, ERR_USER_CANCELED, ERR_CYCLIC_COPY, ERR_COULD_NOT_CREATE_SOCKET, ERR_COULD_NOT_CONNECT, ERR_CONNECTION_BROKEN, ERR_NOT_FILTER_PROTOCOL, ERR_COULD_NOT_MOUNT, ERR_COULD_NOT_UNMOUNT, ERR_COULD_NOT_READ, ERR_COULD_NOT_WRITE, ERR_COULD_NOT_BIND, ERR_COULD_NOT_LISTEN, ERR_COULD_NOT_ACCEPT, ERR_COULD_NOT_LOGIN, ERR_COULD_NOT_STAT, ERR_COULD_NOT_CLOSEDIR, ERR_COULD_NOT_MKDIR, ERR_COULD_NOT_RMDIR, ERR_CANNOT_RESUME, ERR_CANNOT_RENAME, ERR_CANNOT_CHMOD, ERR_CANNOT_DELETE, ERR_SLAVE_DIED, ERR_OUT_OF_MEMORY, ERR_UNKNOWN_PROXY_HOST, ERR_COULD_NOT_AUTHENTICATE, ERR_ABORTED, ERR_INTERNAL_SERVER, ERR_SERVER_TIMEOUT, ERR_SERVICE_NOT_AVAILABLE, ERR_UNKNOWN, ERR_UNKNOWN_INTERRUPT, ERR_CANNOT_DELETE_ORIGINAL, ERR_CANNOT_DELETE_PARTIAL, ERR_CANNOT_RENAME_ORIGINAL, ERR_CANNOT_RENAME_PARTIAL, ERR_NEED_PASSWD, ERR_CANNOT_SYMLINK, ERR_NO_CONTENT, ERR_DISK_FULL, ERR_IDENTICAL_FILES, ERR_SLAVE_DEFINED
 }<li><b>FileSystemFlag</b> = {SupportsChmod, SupportsChown, SupportsUTime, SupportsSymlinks, CaseInsensitive
 }<li><b>Info</b> = {INF_TOTAL_SIZE, INF_PROCESSED_SIZE, INF_SPEED, INF_REDIRECTION, INF_MIME_TYPE, INF_ERROR_PAGE, INF_WARNING, INF_GETTING_FILE, INF_NEED_PASSWD, INF_INFOMESSAGE, INF_META_DATA, INF_NETWORK_STATUS, INF_MESSAGEBOX
-}<li><b>Message</b> = {MSG_DATA, MSG_DATA_REQ, MSG_ERROR, MSG_CONNECTED, MSG_FINISHED, MSG_STAT_ENTRY, MSG_LIST_ENTRIES, MSG_RENAMED, MSG_RESUME, MSG_SLAVE_STATUS, MSG_SLAVE_ACK, MSG_NET_RETQUEST, MSG_NET_DROP, MSG_NEED_SUBURL_DATA, MSG_CANRESUME, MSG_AUTH_KEY, MSG_DEL_AUTH_KEY
+}<li><b>Message</b> = {MSG_DATA, MSG_DATA_REQ, MSG_ERROR, MSG_CONNECTED, MSG_FINISHED, MSG_STAT_ENTRY, MSG_LIST_ENTRIES, MSG_RENAMED, MSG_RESUME, MSG_SLAVE_STATUS, MSG_SLAVE_ACK, MSG_NET_REQUEST, MSG_NET_DROP, MSG_NEED_SUBURL_DATA, MSG_CANRESUME, MSG_AUTH_KEY, MSG_DEL_AUTH_KEY
 }<li><b>Progress</b> = {DEFAULT, STATUSBAR, LIST
 }<li><b>RenameDlg_Mode</b> = {M_OVERWRITE, M_OVERWRITE_ITSELF, M_SKIP, M_SINGLE, M_MULTI, M_RESUME, M_NORENAME
 }<li><b>RenameDlg_Result</b> = {R_RESUME, R_RESUME_ALL, R_OVERWRITE, R_OVERWRITE_ALL, R_SKIP, R_AUTO_SKIP, R_RENAME, R_CANCEL
diff --git a/examples/kpartgui.dtd b/examples/kpartgui.dtd
index fa7354d..7706569 100644
--- a/examples/kpartgui.dtd
+++ b/examples/kpartgui.dtd
@@ -13,8 +13,8 @@
 <!--The root element that must enclose all other tags in the document. -->
 <!ELEMENT kpartgui ((ActionProperties | MenuBar | ToolBar | Merge | DefineGroup | MainWindow | StatusBar | Menu)*)>
 <!ATTLIST kpartgui
-  name CDATA #RETQUIRED
-  version CDATA #RETQUIRED
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
   library CDATA #IMPLIED
 >
 
@@ -43,7 +43,7 @@
   -->
 <!ELEMENT ToolBar ((Action | Separator | ActionList | Merge | DefineGroup)*)>
 <!ATTLIST ToolBar
-  name CDATA #RETQUIRED
+  name CDATA #REQUIRED
   fullWidth (true|false) "true"
   position (top|bottom|left|right) "top"
   iconText (icononly|textonly|icontextright|icontextbottom) #IMPLIED
@@ -59,7 +59,7 @@
 <!-- A Menu such as the "File" or "Edit" menu. Can be used to define popup menus as well. -->
 <!ELEMENT Menu (text?, (Action | ActionList | Separator | TearOffHandle | Merge | DefineGroup | Menu )*)>
 <!ATTLIST Menu
-  name CDATA #RETQUIRED
+  name CDATA #REQUIRED
   group CDATA #IMPLIED
   icon CDATA #IMPLIED
 >
@@ -70,7 +70,7 @@
 <!-- We defined only a few standard KAction properties here. Theoritically we can have
      any property here -->
 <!ATTLIST Action
-  name CDATA #RETQUIRED
+  name CDATA #REQUIRED
   group CDATA #IMPLIED
   text CDATA #IMPLIED
   whatsThis CDATA #IMPLIED
@@ -99,7 +99,7 @@
 <!-- Specifies a dynamic list of actions, each of which can be changed by plugging/unplugging it -->
 <!ELEMENT ActionList EMPTY>
 <!ATTLIST ActionList
-  name CDATA #RETQUIRED
+  name CDATA #REQUIRED
 >
 
 <!-- Not explicitly defined or in widely used yet. -->
@@ -118,5 +118,5 @@
      accessible via the group attribute of other tags -->
 <!ELEMENT DefineGroup EMPTY>
 <!ATTLIST DefineGroup
-  name CDATA #RETQUIRED
+  name CDATA #REQUIRED
 >
diff --git a/sip/khtml/dom_exception.sip b/sip/khtml/dom_exception.sip
index 8245b75..6a446a8 100644
--- a/sip/khtml/dom_exception.sip
+++ b/sip/khtml/dom_exception.sip
@@ -41,7 +41,7 @@ public:
     {
         INDEX_SIZE_ERR, 
         DOMSTRING_SIZE_ERR, 
-        HIERARCHY_RETQUEST_ERR, 
+        HIERARCHY_REQUEST_ERR, 
         WRONG_DOCUMENT_ERR, 
         INVALID_CHARACTER_ERR, 
         NO_DATA_ALLOWED_ERR, 
diff --git a/sip/kio/global.sip b/sip/kio/global.sip
index 9812d44..4c203fb 100644
--- a/sip/kio/global.sip
+++ b/sip/kio/global.sip
@@ -152,7 +152,7 @@ enum Error
     ERR_DISK_FULL, 
     ERR_IDENTICAL_FILES, 
     ERR_SLAVE_DEFINED, 
-    ERR_UPGRADE_RETQUIRED, 
+    ERR_UPGRADE_REQUIRED, 
     ERR_POST_DENIED
 };
 
diff --git a/sip/kio/slaveinterface.sip b/sip/kio/slaveinterface.sip
index 2a66eae..80e2251 100644
--- a/sip/kio/slaveinterface.sip
+++ b/sip/kio/slaveinterface.sip
@@ -63,7 +63,7 @@ enum Message
     MSG_RESUME, 
     MSG_SLAVE_STATUS, 
     MSG_SLAVE_ACK, 
-    MSG_NET_RETQUEST, 
+    MSG_NET_REQUEST, 
     MSG_NET_DROP, 
     MSG_NEED_SUBURL_DATA, 
     MSG_CANRESUME,