diff --git a/Makefile.in b/Makefile.in
index f0eba0756d..0b650a0936 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2264,7 +2264,7 @@ COND_PLATFORM_WIN32_1_GTK_PLATFORM_HDR =  \
 COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM =  \
 	wx/msw/webviewhistoryitem_ie.h \
 	wx/msw/webview_ie.h \
-	wx/msw/webview_edgec.h
+	wx/msw/webview_edge.h
 @COND_TOOLKIT_MSW@WEBVIEW_HDR_PLATFORM = $(COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM)
 @COND_TOOLKIT_COCOA@OPENGL_HDR_PLATFORM = wx/cocoa/glcanvas.h
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@OPENGL_HDR_PLATFORM \
@@ -6137,7 +6137,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS = \
 @COND_TOOLKIT_GTK@	monodll_gtk_webview_webkit.o monodll_webview_webkit2.o
 @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = \
-@COND_TOOLKIT_MSW@	monodll_webview_ie.o monodll_webview_edgec.o
+@COND_TOOLKIT_MSW@	monodll_webview_ie.o monodll_webview_edge.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monodll_tabartgtk.o
 @COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS = \
@@ -8127,7 +8127,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_GTK@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \
 @COND_TOOLKIT_GTK@	monolib_gtk_webview_webkit.o monolib_webview_webkit2.o
 @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = \
-@COND_TOOLKIT_MSW@	monolib_webview_ie.o monolib_webview_edgec.o
+@COND_TOOLKIT_MSW@	monolib_webview_ie.o monolib_webview_edge.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_1 \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@	= monolib_tabartgtk.o
 @COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS_1 = \
@@ -12336,7 +12336,7 @@ COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \
 @COND_TOOLKIT_GTK@	webviewdll_gtk_webview_webkit.o \
 @COND_TOOLKIT_GTK@	webviewdll_webview_webkit2.o
 @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \
-@COND_TOOLKIT_MSW@	webviewdll_webview_ie.o webviewdll_webview_edgec.o
+@COND_TOOLKIT_MSW@	webviewdll_webview_ie.o webviewdll_webview_edge.o
 @COND_TOOLKIT_MSW@__webview_additional_include_p_1 = \
 @COND_TOOLKIT_MSW@	--include-dir \
 @COND_TOOLKIT_MSW@	$(top_srcdir)/3rdparty/webview2/build/native/include
@@ -12360,7 +12360,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \
 @COND_TOOLKIT_GTK@	webviewlib_gtk_webview_webkit.o \
 @COND_TOOLKIT_GTK@	webviewlib_webview_webkit2.o
 @COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \
-@COND_TOOLKIT_MSW@	webviewlib_webview_ie.o webviewlib_webview_edgec.o
+@COND_TOOLKIT_MSW@	webviewlib_webview_ie.o webviewlib_webview_edge.o
 @COND_SHARED_1@____wxwebview_namedll_DEP = $(__webviewdll___depname)
 @COND_SHARED_0@____wxwebview_namelib_DEP = $(__webviewlib___depname)
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname = \
@@ -17119,8 +17119,8 @@ monodll_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONODLL_ODEP)
 monodll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
 
-monodll_webview_edgec.o: $(srcdir)/src/msw/webview_edgec.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/webview_edgec.cpp
+monodll_webview_edge.o: $(srcdir)/src/msw/webview_edge.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/webview_edge.cpp
 
 monodll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
@@ -22399,8 +22399,8 @@ monolib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONOLIB_ODEP)
 monolib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
 
-monolib_webview_edgec.o: $(srcdir)/src/msw/webview_edgec.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/webview_edgec.cpp
+monolib_webview_edge.o: $(srcdir)/src/msw/webview_edge.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/webview_edge.cpp
 
 monolib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
@@ -35983,8 +35983,8 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP)
 webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP)
 	$(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
 
-webviewdll_webview_edgec.o: $(srcdir)/src/msw/webview_edgec.cpp $(WEBVIEWDLL_ODEP)
-	$(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_edgec.cpp
+webviewdll_webview_edge.o: $(srcdir)/src/msw/webview_edge.cpp $(WEBVIEWDLL_ODEP)
+	$(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_edge.cpp
 
 webviewdll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWDLL_ODEP)
 	$(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
@@ -36010,8 +36010,8 @@ webviewdll_version_rc.o: $(srcdir)/src/msw/version.rc $(WEBVIEWDLL_ODEP)
 webviewlib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWLIB_ODEP)
 	$(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
 
-webviewlib_webview_edgec.o: $(srcdir)/src/msw/webview_edgec.cpp $(WEBVIEWLIB_ODEP)
-	$(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/msw/webview_edgec.cpp
+webviewlib_webview_edge.o: $(srcdir)/src/msw/webview_edge.cpp $(WEBVIEWLIB_ODEP)
+	$(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/msw/webview_edge.cpp
 
 webviewlib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWLIB_ODEP)
 	$(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d39a372fc4..c0f237f83f 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3017,7 +3017,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="WEBVIEW_SRC_PLATFORM">
     <if cond="TOOLKIT=='MSW'">
         src/msw/webview_ie.cpp
-        src/msw/webview_edgec.cpp
+        src/msw/webview_edge.cpp
     </if>
     <if cond="TOOLKIT=='GTK'">
         src/gtk/webview_webkit.cpp
@@ -3039,7 +3039,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='MSW'">
         wx/msw/webviewhistoryitem_ie.h
         wx/msw/webview_ie.h
-        wx/msw/webview_edgec.h
+        wx/msw/webview_edge.h
     </if>
     <if cond="TOOLKIT=='GTK'">
         wx/gtk/webviewhistoryitem_webkit.h
diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake
index 3285075adb..cb8d420c1e 100644
--- a/build/cmake/files.cmake
+++ b/build/cmake/files.cmake
@@ -2835,7 +2835,7 @@ set(HTML_CMN_HDR
 
 set(WEBVIEW_MSW_SRC
     src/msw/webview_ie.cpp
-    src/msw/webview_edgec.cpp
+    src/msw/webview_edge.cpp
 )
 
 set(WEBVIEW_CMN_SRC
@@ -2847,7 +2847,7 @@ set(WEBVIEW_CMN_SRC
 set(WEBVIEW_MSW_HDR
     wx/msw/webviewhistoryitem_ie.h
     wx/msw/webview_ie.h
-    wx/msw/webview_edgec.h
+    wx/msw/webview_edge.h
 )
 
 set(WEBVIEW_CMN_HDR
diff --git a/build/files b/build/files
index ec255b4188..6799e46bd0 100644
--- a/build/files
+++ b/build/files
@@ -2788,7 +2788,7 @@ HTML_CMN_HDR =
 
 WEBVIEW_MSW_SRC =
     src/msw/webview_ie.cpp
-    src/msw/webview_edgec.cpp
+    src/msw/webview_edge.cpp
 WEBVIEW_CMN_SRC =
     src/common/webview.cpp
     src/common/webviewarchivehandler.cpp
@@ -2797,7 +2797,7 @@ WEBVIEW_CMN_SRC =
 WEBVIEW_MSW_HDR =
     wx/msw/webviewhistoryitem_ie.h
     wx/msw/webview_ie.h
-    wx/msw/webview_edgec.h
+    wx/msw/webview_edge.h
 WEBVIEW_CMN_HDR =
     wx/webview.h
     wx/webviewarchivehandler.h
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 9077167101..fefb2ee256 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1132,7 +1132,7 @@ WEBVIEWDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 WEBVIEWDLL_OBJECTS =  \
 	$(OBJS)\webviewdll_dummy.obj \
 	$(OBJS)\webviewdll_webview_ie.obj \
-	$(OBJS)\webviewdll_webview_edgec.obj \
+	$(OBJS)\webviewdll_webview_edge.obj \
 	$(OBJS)\webviewdll_webview.obj \
 	$(OBJS)\webviewdll_webviewarchivehandler.obj \
 	$(OBJS)\webviewdll_webviewfshandler.obj
@@ -1148,7 +1148,7 @@ WEBVIEWLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 WEBVIEWLIB_OBJECTS =  \
 	$(OBJS)\webviewlib_dummy.obj \
 	$(OBJS)\webviewlib_webview_ie.obj \
-	$(OBJS)\webviewlib_webview_edgec.obj \
+	$(OBJS)\webviewlib_webview_edge.obj \
 	$(OBJS)\webviewlib_webview.obj \
 	$(OBJS)\webviewlib_webviewarchivehandler.obj \
 	$(OBJS)\webviewlib_webviewfshandler.obj
@@ -1680,7 +1680,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_winpars.obj \
 	$(OBJS)\monodll_htmllbox.obj \
 	$(OBJS)\monodll_webview_ie.obj \
-	$(OBJS)\monodll_webview_edgec.obj \
+	$(OBJS)\monodll_webview_edge.obj \
 	$(OBJS)\monodll_webview.obj \
 	$(OBJS)\monodll_webviewarchivehandler.obj \
 	$(OBJS)\monodll_webviewfshandler.obj \
@@ -2514,7 +2514,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_winpars.obj \
 	$(OBJS)\monolib_htmllbox.obj \
 	$(OBJS)\monolib_webview_ie.obj \
-	$(OBJS)\monolib_webview_edgec.obj \
+	$(OBJS)\monolib_webview_edge.obj \
 	$(OBJS)\monolib_webview.obj \
 	$(OBJS)\monolib_webviewarchivehandler.obj \
 	$(OBJS)\monolib_webviewfshandler.obj \
@@ -7240,8 +7240,8 @@ $(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
 $(OBJS)\monodll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-$(OBJS)\monodll_webview_edgec.obj: ..\..\src\msw\webview_edgec.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_edgec.cpp
+$(OBJS)\monodll_webview_edge.obj: ..\..\src\msw\webview_edge.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_edge.cpp
 
 $(OBJS)\monodll_webview.obj: ..\..\src\common\webview.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webview.cpp
@@ -9795,8 +9795,8 @@ $(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
 $(OBJS)\monolib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-$(OBJS)\monolib_webview_edgec.obj: ..\..\src\msw\webview_edgec.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_edgec.cpp
+$(OBJS)\monolib_webview_edge.obj: ..\..\src\msw\webview_edge.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_edge.cpp
 
 $(OBJS)\monolib_webview.obj: ..\..\src\common\webview.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webview.cpp
@@ -15990,8 +15990,8 @@ $(OBJS)\webviewdll_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\webviewdll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
 	$(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-$(OBJS)\webviewdll_webview_edgec.obj: ..\..\src\msw\webview_edgec.cpp
-	$(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_edgec.cpp
+$(OBJS)\webviewdll_webview_edge.obj: ..\..\src\msw\webview_edge.cpp
+	$(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_edge.cpp
 
 $(OBJS)\webviewdll_webview.obj: ..\..\src\common\webview.cpp
 	$(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webview.cpp
@@ -16011,8 +16011,8 @@ $(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\webviewlib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
 	$(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-$(OBJS)\webviewlib_webview_edgec.obj: ..\..\src\msw\webview_edgec.cpp
-	$(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_edgec.cpp
+$(OBJS)\webviewlib_webview_edge.obj: ..\..\src\msw\webview_edge.cpp
+	$(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_edge.cpp
 
 $(OBJS)\webviewlib_webview.obj: ..\..\src\common\webview.cpp
 	$(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webview.cpp
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 38fe9df5f7..ab62bc8cc4 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1133,7 +1133,7 @@ WEBVIEWDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
 WEBVIEWDLL_OBJECTS =  \
 	$(OBJS)\webviewdll_dummy.o \
 	$(OBJS)\webviewdll_webview_ie.o \
-	$(OBJS)\webviewdll_webview_edgec.o \
+	$(OBJS)\webviewdll_webview_edge.o \
 	$(OBJS)\webviewdll_webview.o \
 	$(OBJS)\webviewdll_webviewarchivehandler.o \
 	$(OBJS)\webviewdll_webviewfshandler.o \
@@ -1150,7 +1150,7 @@ WEBVIEWLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
 WEBVIEWLIB_OBJECTS =  \
 	$(OBJS)\webviewlib_dummy.o \
 	$(OBJS)\webviewlib_webview_ie.o \
-	$(OBJS)\webviewlib_webview_edgec.o \
+	$(OBJS)\webviewlib_webview_edge.o \
 	$(OBJS)\webviewlib_webview.o \
 	$(OBJS)\webviewlib_webviewarchivehandler.o \
 	$(OBJS)\webviewlib_webviewfshandler.o
@@ -1705,7 +1705,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_winpars.o \
 	$(OBJS)\monodll_htmllbox.o \
 	$(OBJS)\monodll_webview_ie.o \
-	$(OBJS)\monodll_webview_edgec.o \
+	$(OBJS)\monodll_webview_edge.o \
 	$(OBJS)\monodll_webview.o \
 	$(OBJS)\monodll_webviewarchivehandler.o \
 	$(OBJS)\monodll_webviewfshandler.o \
@@ -2545,7 +2545,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_winpars.o \
 	$(OBJS)\monolib_htmllbox.o \
 	$(OBJS)\monolib_webview_ie.o \
-	$(OBJS)\monolib_webview_edgec.o \
+	$(OBJS)\monolib_webview_edge.o \
 	$(OBJS)\monolib_webview.o \
 	$(OBJS)\monolib_webviewarchivehandler.o \
 	$(OBJS)\monolib_webviewfshandler.o \
@@ -7422,7 +7422,7 @@ $(OBJS)\monodll_htmllbox.o: ../../src/generic/htmllbox.cpp
 $(OBJS)\monodll_webview_ie.o: ../../src/msw/webview_ie.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_webview_edgec.o: ../../src/msw/webview_edgec.cpp
+$(OBJS)\monodll_webview_edge.o: ../../src/msw/webview_edge.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monodll_webview.o: ../../src/common/webview.cpp
@@ -9977,7 +9977,7 @@ $(OBJS)\monolib_htmllbox.o: ../../src/generic/htmllbox.cpp
 $(OBJS)\monolib_webview_ie.o: ../../src/msw/webview_ie.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_webview_edgec.o: ../../src/msw/webview_edgec.cpp
+$(OBJS)\monolib_webview_edge.o: ../../src/msw/webview_edge.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\monolib_webview.o: ../../src/common/webview.cpp
@@ -16172,7 +16172,7 @@ $(OBJS)\webviewdll_dummy.o: ../../src/common/dummy.cpp
 $(OBJS)\webviewdll_webview_ie.o: ../../src/msw/webview_ie.cpp
 	$(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\webviewdll_webview_edgec.o: ../../src/msw/webview_edgec.cpp
+$(OBJS)\webviewdll_webview_edge.o: ../../src/msw/webview_edge.cpp
 	$(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\webviewdll_webview.o: ../../src/common/webview.cpp
@@ -16193,7 +16193,7 @@ $(OBJS)\webviewlib_dummy.o: ../../src/common/dummy.cpp
 $(OBJS)\webviewlib_webview_ie.o: ../../src/msw/webview_ie.cpp
 	$(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\webviewlib_webview_edgec.o: ../../src/msw/webview_edgec.cpp
+$(OBJS)\webviewlib_webview_edge.o: ../../src/msw/webview_edge.cpp
 	$(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\webviewlib_webview.o: ../../src/common/webview.cpp
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 4cfe184aba..8f828728ba 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1238,7 +1238,7 @@ WEBVIEWDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \
 WEBVIEWDLL_OBJECTS =  \
 	$(OBJS)\webviewdll_dummy.obj \
 	$(OBJS)\webviewdll_webview_ie.obj \
-	$(OBJS)\webviewdll_webview_edgec.obj \
+	$(OBJS)\webviewdll_webview_edge.obj \
 	$(OBJS)\webviewdll_webview.obj \
 	$(OBJS)\webviewdll_webviewarchivehandler.obj \
 	$(OBJS)\webviewdll_webviewfshandler.obj
@@ -1261,7 +1261,7 @@ WEBVIEWLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \
 WEBVIEWLIB_OBJECTS =  \
 	$(OBJS)\webviewlib_dummy.obj \
 	$(OBJS)\webviewlib_webview_ie.obj \
-	$(OBJS)\webviewlib_webview_edgec.obj \
+	$(OBJS)\webviewlib_webview_edge.obj \
 	$(OBJS)\webviewlib_webview.obj \
 	$(OBJS)\webviewlib_webviewarchivehandler.obj \
 	$(OBJS)\webviewlib_webviewfshandler.obj
@@ -2039,7 +2039,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_winpars.obj \
 	$(OBJS)\monodll_htmllbox.obj \
 	$(OBJS)\monodll_webview_ie.obj \
-	$(OBJS)\monodll_webview_edgec.obj \
+	$(OBJS)\monodll_webview_edge.obj \
 	$(OBJS)\monodll_webview.obj \
 	$(OBJS)\monodll_webviewarchivehandler.obj \
 	$(OBJS)\monodll_webviewfshandler.obj \
@@ -2879,7 +2879,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_winpars.obj \
 	$(OBJS)\monolib_htmllbox.obj \
 	$(OBJS)\monolib_webview_ie.obj \
-	$(OBJS)\monolib_webview_edgec.obj \
+	$(OBJS)\monolib_webview_edge.obj \
 	$(OBJS)\monolib_webview.obj \
 	$(OBJS)\monolib_webviewarchivehandler.obj \
 	$(OBJS)\monolib_webviewfshandler.obj \
@@ -7991,8 +7991,8 @@ $(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
 $(OBJS)\monodll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-$(OBJS)\monodll_webview_edgec.obj: ..\..\src\msw\webview_edgec.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_edgec.cpp
+$(OBJS)\monodll_webview_edge.obj: ..\..\src\msw\webview_edge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_edge.cpp
 
 $(OBJS)\monodll_webview.obj: ..\..\src\common\webview.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webview.cpp
@@ -10546,8 +10546,8 @@ $(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp
 $(OBJS)\monolib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-$(OBJS)\monolib_webview_edgec.obj: ..\..\src\msw\webview_edgec.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_edgec.cpp
+$(OBJS)\monolib_webview_edge.obj: ..\..\src\msw\webview_edge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_edge.cpp
 
 $(OBJS)\monolib_webview.obj: ..\..\src\common\webview.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webview.cpp
@@ -16741,8 +16741,8 @@ $(OBJS)\webviewdll_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\webviewdll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-$(OBJS)\webviewdll_webview_edgec.obj: ..\..\src\msw\webview_edgec.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_edgec.cpp
+$(OBJS)\webviewdll_webview_edge.obj: ..\..\src\msw\webview_edge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_edge.cpp
 
 $(OBJS)\webviewdll_webview.obj: ..\..\src\common\webview.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webview.cpp
@@ -16762,8 +16762,8 @@ $(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\webviewlib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp
 
-$(OBJS)\webviewlib_webview_edgec.obj: ..\..\src\msw\webview_edgec.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_edgec.cpp
+$(OBJS)\webviewlib_webview_edge.obj: ..\..\src\msw\webview_edge.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_edge.cpp
 
 $(OBJS)\webviewlib_webview.obj: ..\..\src\common\webview.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webview.cpp
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 7dfeab9d08..55c4d683e1 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1794,7 +1794,7 @@
 				RelativePath="..\..\include\wx\msw\uxtheme.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_edgec.h">
+				RelativePath="..\..\include\wx\msw\webview_edge.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\webview_ie.h">
diff --git a/build/msw/wx_vc7_webview.vcproj b/build/msw/wx_vc7_webview.vcproj
index 056d91b6d5..1c72c3dd22 100644
--- a/build/msw/wx_vc7_webview.vcproj
+++ b/build/msw/wx_vc7_webview.vcproj
@@ -326,7 +326,7 @@
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\webview_edgec.cpp">
+				RelativePath="..\..\src\msw\webview_edge.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\msw\webview_ie.cpp">
@@ -425,7 +425,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_edgec.h">
+				RelativePath="..\..\include\wx\msw\webview_edge.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\webview_ie.h">
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 66b04a4080..3cb6c2ee35 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2894,7 +2894,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_edgec.h"
+				RelativePath="..\..\include\wx\msw\webview_edge.h"
 				>
 			</File>
 			<File
diff --git a/build/msw/wx_vc8_webview.vcproj b/build/msw/wx_vc8_webview.vcproj
index 7aee069795..61ceb1174c 100644
--- a/build/msw/wx_vc8_webview.vcproj
+++ b/build/msw/wx_vc8_webview.vcproj
@@ -847,7 +847,7 @@
 				/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\webview_edgec.cpp"
+				RelativePath="..\..\src\msw\webview_edge.cpp"
 				>
 			</File>
 			<File
@@ -1069,7 +1069,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_edgec.h"
+				RelativePath="..\..\include\wx\msw\webview_edge.h"
 				>
 			</File>
 			<File
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 9a88f3b6e4..eea014effd 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2890,7 +2890,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_edgec.h"
+				RelativePath="..\..\include\wx\msw\webview_edge.h"
 				>
 			</File>
 			<File
diff --git a/build/msw/wx_vc9_webview.vcproj b/build/msw/wx_vc9_webview.vcproj
index 0166ba315b..597702e788 100644
--- a/build/msw/wx_vc9_webview.vcproj
+++ b/build/msw/wx_vc9_webview.vcproj
@@ -843,7 +843,7 @@
 				/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\webview_edgec.cpp"
+				RelativePath="..\..\src\msw\webview_edge.cpp"
 				>
 			</File>
 			<File
@@ -1065,7 +1065,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_edgec.h"
+				RelativePath="..\..\include\wx\msw\webview_edge.h"
 				>
 			</File>
 			<File
diff --git a/build/msw/wx_webview.vcxproj b/build/msw/wx_webview.vcxproj
index bb73ff175e..bdccf0f9b3 100644
--- a/build/msw/wx_webview.vcxproj
+++ b/build/msw/wx_webview.vcxproj
@@ -460,7 +460,7 @@
     <ClCompile Include="..\..\src\common\webviewarchivehandler.cpp" />
     <ClCompile Include="..\..\src\common\webviewfshandler.cpp" />
     <ClCompile Include="..\..\src\msw\webview_ie.cpp" />
-    <ClCompile Include="..\..\src\msw\webview_edgec.cpp" />
+    <ClCompile Include="..\..\src\msw\webview_edge.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -496,7 +496,7 @@
     <ClInclude Include="..\..\include\wx\webview.h" />
     <ClInclude Include="..\..\include\wx\webviewarchivehandler.h" />
     <ClInclude Include="..\..\include\wx\webviewfshandler.h" />
-    <ClInclude Include="..\..\include\wx\msw\webview_edgec.h" />
+    <ClInclude Include="..\..\include\wx\msw\webview_edge.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/msw/wx_webview.vcxproj.filters b/build/msw/wx_webview.vcxproj.filters
index 529edc4af3..a53014e96b 100644
--- a/build/msw/wx_webview.vcxproj.filters
+++ b/build/msw/wx_webview.vcxproj.filters
@@ -30,7 +30,7 @@
     <ClCompile Include="..\..\src\common\webviewfshandler.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\webview_edgec.cpp">
+    <ClCompile Include="..\..\src\msw\webview_edge.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\webview_ie.cpp">
@@ -43,7 +43,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\wx\msw\webview_edgec.h">
+    <ClInclude Include="..\..\include\wx\msw\webview_edge.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\webview_ie.h">
diff --git a/include/wx/msw/webview_edgec.h b/include/wx/msw/webview_edge.h
similarity index 100%
rename from include/wx/msw/webview_edgec.h
rename to include/wx/msw/webview_edge.h
diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index c9be93add5..802cf00171 100644
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -23,7 +23,7 @@
 #include "wx/gtk/webview_webkit.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/webview_ie.h"
-#include "wx/msw/webview_edgec.h"
+#include "wx/msw/webview_edge.h"
 #endif
 
 // DLL options compatibility check:
diff --git a/src/msw/webview_edgec.cpp b/src/msw/webview_edge.cpp
similarity index 99%
rename from src/msw/webview_edgec.cpp
rename to src/msw/webview_edge.cpp
index ddd725422a..26eb2c7f98 100644
--- a/src/msw/webview_edgec.cpp
+++ b/src/msw/webview_edge.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        source/msw/webview_edgec.cpp
+// Name:        source/msw/webview_edge.cpp
 // Purpose:     wxMSW Edge Chromium wxWebView backend implementation
 // Author:      Markus Pingel
 // Created:     2019-12-15
@@ -14,7 +14,7 @@
 #pragma hdrstop
 #endif
 
-#include "wx/msw/webview_edgec.h"
+#include "wx/msw/webview_edge.h"
 
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_EDGE