diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index b9e973b09e..808e249cb4 100644
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -39,7 +39,7 @@
                 @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
                 @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
                 @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
-                @echo USE_WEB=$(USE_WEB) >>$(BUILD_CFG_FILE)
+                @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
                 @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
                 @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
                 @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 8de09ff2a7..a3ff845849 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -161,8 +161,8 @@
     <set var="WXLIB_STC">
         <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
     </set>
-    <set var="WXLIB_WEB">
-        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('web')))</if>
+    <set var="WXLIB_WEBVIEW">
+        <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
     </set>
     <set var="WXLIB_MONO">
         <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 4d57319cce..32ebf6017d 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -200,11 +200,11 @@ Default is to use debug CRT if and only if BUILD==debug.
         </description>
     </option>
 
-    <option name="USE_WEB">
+    <option name="USE_WEBVIEW">
         <values>0,1</values>
         <default-value>1</default-value>
         <description>
-            Build wxWeb library (USE_GUI must be 1)?
+            Build wxWebView library (USE_GUI must be 1)?
         </description>
     </option>
     
@@ -380,7 +380,7 @@ to run the tests, include CppUnit library here.
         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_XML"/>
         <option name="EXTRALIBS_HTML"/>
-        <option name="EXTRALIBS_WEB"/>
+        <option name="EXTRALIBS_WEBVIEW"/>
         <option name="EXTRALIBS_MEDIA"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="EXTRALIBS_OPENGL"/>
@@ -441,7 +441,7 @@ it if SHARED=1 unless you know what you are doing.
         <set var="EXTRALIBS"/>
         <set var="EXTRALIBS_XML"/>
         <set var="EXTRALIBS_HTML"/>
-        <set var="EXTRALIBS_WEB"/>
+        <set var="EXTRALIBS_WEBVIEW"/>
         <set var="EXTRALIBS_MEDIA"/>
         <set var="EXTRALIBS_GUI"/>
         <set var="EXTRALIBS_OPENGL">
@@ -490,7 +490,7 @@ Set the version of your Mingw installation here.
         <set var="USE_RICHTEXT">1</set>
         <set var="USE_STC">1</set>
         <set var="USE_HTML">1</set>
-        <set var="USE_WEB">1</set>
+        <set var="USE_WEBVIEW">1</set>
         <set var="USE_MEDIA">1</set>
         <set var="USE_XRC">1</set>
         <set var="USE_OPENGL">1</set>
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d66f183247..1492d85206 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3346,21 +3346,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <!-- ====================================================================== -->
-<!--                                wxWEB                                   -->
+<!--                                wxWEBVIEW                               -->
 <!-- ====================================================================== -->
 
-<set var="WEB_SRC_PLATFORM">
+<set var="WEBVIEW_SRC_PLATFORM">
     <if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
     <if cond="PLATFORM_UNIX=='1'">src/gtk/webview_webkit.cpp</if>
     <if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
 </set>
-<set var="WEB_SRC" hints="files">
-    $(WEB_SRC_PLATFORM)
+<set var="WEBVIEW_SRC" hints="files">
+    $(WEBVIEW_SRC_PLATFORM)
     src/common/webview.cpp
     src/common/webviewarchivehandler.cpp
 </set>
 
-<set var="WEB_HDR_PLATFORM" hints="files">
+<set var="WEBVIEW_HDR_PLATFORM" hints="files">
     <if cond="TOOLKIT=='MSW'">
         wx/msw/webviewhistoryitem_ie.h
         wx/msw/webview_ie.h
@@ -3374,8 +3374,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         wx/osx/webview_webkit.h
     </if>
 </set>
-<set var="WEB_HDR" hints="files">
-    $(WEB_HDR_PLATFORM)
+<set var="WEBVIEW_HDR" hints="files">
+    $(WEBVIEW_HDR_PLATFORM)
     wx/webview.h
     wx/webviewarchivehandler.h
 </set>
@@ -3981,7 +3981,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
             $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
-            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) ${WEB_HDR}
+            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) ${WEBVIEW_HDR}
         </if>
     </set>
 
diff --git a/build/bakefiles/monolithic.bkl b/build/bakefiles/monolithic.bkl
index f02411eab1..31751f7814 100644
--- a/build/bakefiles/monolithic.bkl
+++ b/build/bakefiles/monolithic.bkl
@@ -4,9 +4,9 @@
 
     <set var="MONOLIB_GUI_SRC">
         <if cond="USE_GUI=='1'">
-            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEB_SRC) $(QA_SRC)
-            $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC) $(RICHTEXT_SRC)
-            $(STC_SRC)
+            $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC)
+            $(QA_SRC) $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC)
+            $(RICHTEXT_SRC) $(STC_SRC)
         </if>
     </set>
     <set var="MONOLIB_SRC">
@@ -25,7 +25,7 @@
         <define>WXMAKINGDLL</define>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
-        <ldlibs>$(EXTRALIBS_WEB)</ldlibs>
+        <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
         <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
         <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
         <library>$(wxscintilla_library_link)</library>
diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 748bf64c7c..545ca64ce7 100644
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -174,28 +174,28 @@
     <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
 
     <!-- ================================================================ -->
-    <!--                               wxWEB                              -->
+    <!--                               wxWEBVIEW                          -->
     <!-- ================================================================ -->
 
-    <dll id="webdll" template="wx_dll"
-         cond="SHARED=='1' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">
+    <dll id="webviewdll" template="wx_dll"
+         cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
         <define>WXUSINGDLL</define>
-        <define>WXMAKINGDLL_WEB</define>
-        <sources>$(WEB_SRC)</sources>
+        <define>WXMAKINGDLL_WEBVIEW</define>
+        <sources>$(WEBVIEW_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
-        <msvc-headers>$(WEB_HDR)</msvc-headers>
+        <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
     </dll>
 
-    <lib id="weblib" template="wx_lib"
-         cond="SHARED=='0' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">
-        <sources>$(WEB_SRC)</sources>
-        <msvc-headers>$(WEB_HDR)</msvc-headers>
+    <lib id="webviewlib" template="wx_lib"
+         cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
+        <sources>$(WEBVIEW_SRC)</sources>
+        <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
     </lib>
 
-    <wxshortcut id="wxweb" cond="MONOLITHIC=='0' and USE_WEB=='1'"/>
+    <wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
 
-    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">web=weblib+webdll</set>
+    <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
 
     <!-- ================================================================ -->
     <!--                             OpenGL                               -->
diff --git a/build/bakefiles/wxpresets/presets/wx.bkl b/build/bakefiles/wxpresets/presets/wx.bkl
index ca51a0deeb..5ca63850a9 100644
--- a/build/bakefiles/wxpresets/presets/wx.bkl
+++ b/build/bakefiles/wxpresets/presets/wx.bkl
@@ -89,6 +89,7 @@
  NOTE: as a reference here is a list of all wxWidgets libraries satisfying
        the dependency constraints mentioned in <wx-lib> description:
 
+        <wx-lib>webview</wx-lib>
         <wx-lib>richtext</wx-lib>
         <wx-lib>aui</wx-lib>
         <wx-lib>ribbon</wx-lib>
@@ -104,7 +105,6 @@
         <wx-lib>xml</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <wx-lib>web</wx-lib>
 
 -->
 
@@ -125,7 +125,7 @@
                          tag definitions.
     -->
     <set var="WX_LIB_LIST">
-        base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc web
+        base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview
     </set>
 
     <!-- if you define this variable to 0 before including wx presets, the
diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 0cdf3a45d6..989942ace2 100644
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -39,12 +39,12 @@ def mk_wxid(id):
 
 
 # All libs that are part of the main library:
-MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'web',
+MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'webview',
              'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc']
 # List of library names/ids for categories with different names:
 LIBS_NOGUI = ['xml', 'net']
 LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',
-              'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'web']
+              'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'webview']
 # Additional libraries that must be linked in:
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',
diff --git a/configure.in b/configure.in
index 64fcb9ace4..a42031001e 100644
--- a/configure.in
+++ b/configure.in
@@ -848,7 +848,7 @@ WX_ARG_FEATURE(richtext,    [  --enable-richtext       use wxRichTextCtrl], wxUS
 WX_ARG_FEATURE(postscript,  [  --enable-postscript     use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
 WX_ARG_FEATURE(printarch,   [  --enable-printarch      use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
 WX_ARG_FEATURE(svg,         [  --enable-svg            use wxSVGFileDC device context], wxUSE_SVG)
-WX_ARG_FEATURE(webview,     [  --enable-webview        use wxWeb library], wxUSE_WEBVIEW)
+WX_ARG_FEATURE(webview,     [  --enable-webview        use wxWebView library], wxUSE_WEBVIEW)
 
 dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
 dnl can't be disabled, don't even provide an option to do it
@@ -7353,11 +7353,11 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi
 
-USE_WEB=0
+USE_WEBVIEW=0
 if test "$wxUSE_WEBVIEW" = "yes"; then
    AC_DEFINE(wxUSE_WEBVIEW)
-   USE_WEB=1
-   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web"
+   USE_WEBVIEW=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
 
    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then
        AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 796e97d7c6..ceb31207f4 100644
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -187,8 +187,8 @@
         #pragma comment(lib, wxMSW_LIB_NAME("stc"))
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
     #endif
-    #if wxUSE_WEB && !defined(wxNO_WEB_LIB)
-        #pragma comment(lib, wxMSW_LIB_NAME("web"))
+    #if wxUSE_WEBVIEW && !defined(wxNO_WEBVIEW_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("webview"))
     #endif
 #endif // wxUSE_GUI
 
diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 12e98fea54..fc5e008f9d 100644
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -102,7 +102,7 @@
 #    define WXMAKINGDLL_RICHTEXT
 #    define WXMAKINGDLL_MEDIA
 #    define WXMAKINGDLL_STC
-#    define WXMAKINGDLL_WEB
+#    define WXMAKINGDLL_WEBVIEW
 #endif /* WXMAKINGDLL */
 
 /*
@@ -275,15 +275,15 @@
 #    define WXDLLIMPEXP_DATA_STC(type) type
 #endif
 
-#ifdef WXMAKINGDLL_WEB
-#    define WXDLLIMPEXP_WEB WXEXPORT
-#    define WXDLLIMPEXP_DATA_WEB(type) WXEXPORT type
+#ifdef WXMAKINGDLL_WEBVIEW
+#    define WXDLLIMPEXP_WEBVIEW WXEXPORT
+#    define WXDLLIMPEXP_DATA_WEBVIEW(type) WXEXPORT type
 #elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_WEB WXIMPORT
-#    define WXDLLIMPEXP_DATA_WEB(type) WXIMPORT type
+#    define WXDLLIMPEXP_WEBVIEW WXIMPORT
+#    define WXDLLIMPEXP_DATA_WEBVIEW(type) WXIMPORT type
 #else /* not making nor using DLL */
-#    define WXDLLIMPEXP_WEB
-#    define WXDLLIMPEXP_DATA_WEB(type) type
+#    define WXDLLIMPEXP_WEBVIEW
+#    define WXDLLIMPEXP_DATA_WEBVIEW(type) type
 #endif
 
 /*
@@ -307,7 +307,7 @@
     #define WXDLLIMPEXP_FWD_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA
     #define WXDLLIMPEXP_FWD_STC
-    #define WXDLLIMPEXP_FWD_WEB
+    #define WXDLLIMPEXP_FWD_WEBVIEW
 #else
     #define WXDLLIMPEXP_FWD_BASE      WXDLLIMPEXP_BASE
     #define WXDLLIMPEXP_FWD_NET       WXDLLIMPEXP_NET
@@ -323,7 +323,7 @@
     #define WXDLLIMPEXP_FWD_RICHTEXT  WXDLLIMPEXP_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA     WXDLLIMPEXP_MEDIA
     #define WXDLLIMPEXP_FWD_STC       WXDLLIMPEXP_STC
-    #define WXDLLIMPEXP_FWD_WEB       WXDLLIMPEXP_WEB
+    #define WXDLLIMPEXP_FWD_WEBVIEW   WXDLLIMPEXP_WEBVIEW
 #endif
 
 /* for backwards compatibility, define suffix-less versions too */
diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index 57796a0ba9..3add4d993a 100644
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -22,7 +22,7 @@
 // wxWebViewWebKit
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_WEB wxWebViewWebKit : public wxWebView
+class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:
     wxWebViewWebKit() { Init(); }
diff --git a/include/wx/gtk/webviewhistoryitem_webkit.h b/include/wx/gtk/webviewhistoryitem_webkit.h
index 3f96d612b4..071f3fb9ff 100644
--- a/include/wx/gtk/webviewhistoryitem_webkit.h
+++ b/include/wx/gtk/webviewhistoryitem_webkit.h
@@ -16,7 +16,7 @@
 
 #include "webkit/webkit.h"
 
-class WXDLLIMPEXP_WEB wxWebViewHistoryItem
+class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {
 public:
     wxWebViewHistoryItem(const wxString& url, const wxString& title) : 
diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 270493c0f4..bcc823ac23 100644
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -24,7 +24,7 @@
 struct IHTMLDocument2;
 class wxFSFile;
 
-class WXDLLIMPEXP_WEB wxWebViewIE : public wxWebView
+class WXDLLIMPEXP_WEBVIEW wxWebViewIE : public wxWebView
 {
 public:
 
diff --git a/include/wx/msw/webviewhistoryitem_ie.h b/include/wx/msw/webviewhistoryitem_ie.h
index 29f94ce647..102b98f516 100644
--- a/include/wx/msw/webviewhistoryitem_ie.h
+++ b/include/wx/msw/webviewhistoryitem_ie.h
@@ -14,7 +14,7 @@
 
 #if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
 
-class WXDLLIMPEXP_WEB wxWebViewHistoryItem
+class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {
 public:
     wxWebViewHistoryItem(const wxString& url, const wxString& title) : 
diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index 0be4e25144..32a4d98247 100644
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -25,7 +25,7 @@
 // Web Kit Control
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_WEB wxWebViewWebKit : public wxWebView
+class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
 {
 public:
     wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
diff --git a/include/wx/osx/webviewhistoryitem_webkit.h b/include/wx/osx/webviewhistoryitem_webkit.h
index 97a23d265e..9ae2577496 100644
--- a/include/wx/osx/webviewhistoryitem_webkit.h
+++ b/include/wx/osx/webviewhistoryitem_webkit.h
@@ -15,7 +15,7 @@
 #if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
                          ||  defined(__WXOSX_CARBON__))
 
-class WXDLLIMPEXP_WEB wxWebViewHistoryItem
+class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {
 public:
     wxWebViewHistoryItem(const wxString& url, const wxString& title) :
diff --git a/include/wx/webview.h b/include/wx/webview.h
index ced86a7df9..59dc17de98 100644
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -70,7 +70,7 @@ enum wxWebViewBackend
 };
 
 //Base class for custom scheme handlers
-class WXDLLIMPEXP_WEB wxWebViewHandler
+class WXDLLIMPEXP_WEBVIEW wxWebViewHandler
 {
 public:
     wxWebViewHandler(const wxString& scheme) : m_scheme(scheme) {}
@@ -80,10 +80,10 @@ private:
     wxString m_scheme;
 };
 
-extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[];
-extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[];
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[];
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[];
 
-class WXDLLIMPEXP_WEB wxWebView : public wxControl
+class WXDLLIMPEXP_WEBVIEW wxWebView : public wxControl
 {
 public:
 
@@ -171,7 +171,7 @@ public:
     wxDECLARE_ABSTRACT_CLASS(wxWebView);
 };
 
-class WXDLLIMPEXP_WEB wxWebViewEvent : public wxNotifyEvent
+class WXDLLIMPEXP_WEBVIEW wxWebViewEvent : public wxNotifyEvent
 {
 public:
     wxWebViewEvent() {}
@@ -192,12 +192,12 @@ private:
     wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebViewEvent);
 };
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebViewEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebViewEvent );
 
 typedef void (wxEvtHandler::*wxWebViewEventFunction)
              (wxWebViewEvent&);
diff --git a/include/wx/webviewarchivehandler.h b/include/wx/webviewarchivehandler.h
index 305219f02b..3654c75b60 100644
--- a/include/wx/webviewarchivehandler.h
+++ b/include/wx/webviewarchivehandler.h
@@ -22,7 +22,7 @@ class wxFileSystem;
 //Loads from uris such as scheme:///C:/example/example.html or archives such as
 //scheme:///C:/example/example.zip;protocol=zip/example.html 
 
-class WXDLLIMPEXP_WEB wxWebViewArchiveHandler : public wxWebViewHandler
+class WXDLLIMPEXP_WEBVIEW wxWebViewArchiveHandler : public wxWebViewHandler
 {
 public:
     wxWebViewArchiveHandler(const wxString& scheme);
diff --git a/samples/samples.bkl b/samples/samples.bkl
index 88e97bdef8..7e0e997826 100644
--- a/samples/samples.bkl
+++ b/samples/samples.bkl
@@ -87,7 +87,7 @@
     <subproject id="uiaction" template="sub"/>
     <subproject id="validate" template="sub"/>
     <subproject id="vscroll" template="sub"/>
-    <subproject id="web" template="sub"/>
+    <subproject id="webview" template="sub"/>
     <subproject id="widgets" template="sub"/>
     <subproject id="wizard" template="sub"/>
     <subproject id="wrapsizer" template="sub"/>
diff --git a/samples/web/Makefile.in b/samples/webview/Makefile.in
similarity index 100%
rename from samples/web/Makefile.in
rename to samples/webview/Makefile.in
diff --git a/samples/web/makefile.bcc b/samples/webview/makefile.bcc
similarity index 100%
rename from samples/web/makefile.bcc
rename to samples/webview/makefile.bcc
diff --git a/samples/web/makefile.gcc b/samples/webview/makefile.gcc
similarity index 100%
rename from samples/web/makefile.gcc
rename to samples/webview/makefile.gcc
diff --git a/samples/web/makefile.unx b/samples/webview/makefile.unx
similarity index 100%
rename from samples/web/makefile.unx
rename to samples/webview/makefile.unx
diff --git a/samples/web/makefile.vc b/samples/webview/makefile.vc
similarity index 100%
rename from samples/web/makefile.vc
rename to samples/webview/makefile.vc
diff --git a/samples/web/makefile.wat b/samples/webview/makefile.wat
similarity index 100%
rename from samples/web/makefile.wat
rename to samples/webview/makefile.wat
diff --git a/samples/web/refresh.xpm b/samples/webview/refresh.xpm
similarity index 100%
rename from samples/web/refresh.xpm
rename to samples/webview/refresh.xpm
diff --git a/samples/web/stop.xpm b/samples/webview/stop.xpm
similarity index 100%
rename from samples/web/stop.xpm
rename to samples/webview/stop.xpm
diff --git a/samples/web/web.dsp b/samples/webview/web.dsp
similarity index 100%
rename from samples/web/web.dsp
rename to samples/webview/web.dsp
diff --git a/samples/web/web_vc7.vcproj b/samples/webview/web_vc7.vcproj
similarity index 100%
rename from samples/web/web_vc7.vcproj
rename to samples/webview/web_vc7.vcproj
diff --git a/samples/web/web_vc8.vcproj b/samples/webview/web_vc8.vcproj
similarity index 100%
rename from samples/web/web_vc8.vcproj
rename to samples/webview/web_vc8.vcproj
diff --git a/samples/web/web_vc9.vcproj b/samples/webview/web_vc9.vcproj
similarity index 100%
rename from samples/web/web_vc9.vcproj
rename to samples/webview/web_vc9.vcproj
diff --git a/samples/web/web.bkl b/samples/webview/webview.bkl
similarity index 77%
rename from samples/web/web.bkl
rename to samples/webview/webview.bkl
index 285b059c5f..e57440067b 100644
--- a/samples/web/web.bkl
+++ b/samples/webview/webview.bkl
@@ -4,12 +4,12 @@
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
-    <exe id="web" template="wx_sample" template_append="wx_append">
+    <exe id="webview" template="wx_sample" template_append="wx_append">
         <sources>
-            web.cpp
+            webview.cpp
         </sources>
         <headers></headers>
-        <wx-lib>web</wx-lib>
+        <wx-lib>webview</wx-lib>
         <wx-lib>stc</wx-lib>       
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
diff --git a/samples/web/web.cpp b/samples/webview/webview.cpp
similarity index 99%
rename from samples/web/web.cpp
rename to samples/webview/webview.cpp
index c42a2152f3..452cc699ed 100644
--- a/samples/web/web.cpp
+++ b/samples/webview/webview.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        web.cpp
+// Name:        webview.cpp
 // Purpose:     wxWebView sample
 // Author:      Marianne Gagnon
 // Id:          $Id$
diff --git a/samples/web/wxlogo.xpm b/samples/webview/wxlogo.xpm
similarity index 100%
rename from samples/web/wxlogo.xpm
rename to samples/webview/wxlogo.xpm
diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 258c891ce1..63f5f2b343 100644
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -24,10 +24,10 @@
 
 // DLL options compatibility check:
 #include "wx/app.h"
-WX_CHECK_BUILD_OPTIONS("wxWEB")
+WX_CHECK_BUILD_OPTIONS("wxWEBVIEW")
 
-extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView";
-extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank";
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[] = "wxWebView";
+extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[] = "about:blank";
 
 wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl);
 wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEvent, wxCommandEvent);