16 files changed, 57 insertions, 57 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 9fb19d538d6..7ce0885ca94 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -132,8 +132,8 @@ KERBEROS_HOME		?= /usr/kerberos
 # ----------------------------------------------------------------------
 
 SHELL			= /bin/sh
-VERSION			= 1.6.0
-SOVERSION		= 16
+VERSION			= 2.0.0
+SOVERSION		= 20
 bindir			= $(top_srcdir)/bin
 libdir			= $(top_srcdir)/lib
 includedir		= $(top_srcdir)/include
diff --git a/cpp/demo/IceStorm/clock/config_service b/cpp/demo/IceStorm/clock/config_service
index fbc4cd23b15..a52cdfdc2f9 100644
--- a/cpp/demo/IceStorm/clock/config_service
+++ b/cpp/demo/IceStorm/clock/config_service
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,16:create --Ice.Config=config
+IceBox.Service.IceStorm=IceStormService,20:create --Ice.Config=config
 
 #
 # This property defines the home directory of the Freeze 
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index a41da9d2c94..b9840678546 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -213,7 +213,7 @@ const Int64 Int64Max = INT64_MAX;
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "1.6.0" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 10600      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "2.0.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 20000      // AABBCC, with AA=major, BB=minor, CC=patch
 
 #endif
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index f8bc6a287bb..7f09370e161 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 libdb42.lib /nologo /dll /machine:I386 /out:"Release/freeze15.dll" /implib:"Release/freeze.lib"
+# ADD LINK32 libdb42.lib /nologo /dll /machine:I386 /out:"Release/freeze20.dll" /implib:"Release/freeze.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\freeze.lib ..\..\lib	copy $(OutDir)\freeze15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\freeze.lib ..\..\lib	copy $(OutDir)\freeze20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "Freeze - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 libdb42d.lib /nologo /dll /debug /machine:I386 /out:"Debug/freeze15d.dll" /implib:"Debug/freezed.lib"
+# ADD LINK32 libdb42d.lib /nologo /dll /debug /machine:I386 /out:"Debug/freeze20d.dll" /implib:"Debug/freezed.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\freezed.lib ..\..\lib	copy $(OutDir)\freeze15d.pdb ..\..\bin	copy $(OutDir)\freeze15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\freezed.lib ..\..\lib	copy $(OutDir)\freeze20d.pdb ..\..\bin	copy $(OutDir)\freeze20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/Glacier/glacier.dsp b/cpp/src/Glacier/glacier.dsp
index d97bbc1c34a..057444f8c6f 100644
--- a/cpp/src/Glacier/glacier.dsp
+++ b/cpp/src/Glacier/glacier.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/glacier15.dll" /implib:"Release/glacier.lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/glacier20.dll" /implib:"Release/glacier.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\glacier.lib ..\..\lib	copy $(OutDir)\glacier15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\glacier.lib ..\..\lib	copy $(OutDir)\glacier20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "Glacier - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/glacier15d.dll" /implib:"Debug/glacierd.lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/glacier20d.dll" /implib:"Debug/glacierd.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\glacierd.lib ..\..\lib	copy $(OutDir)\glacier15d.pdb ..\..\bin	copy $(OutDir)\glacier15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\glacierd.lib ..\..\lib	copy $(OutDir)\glacier20d.pdb ..\..\bin	copy $(OutDir)\glacier20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/Glacier2/glacier2.dsp b/cpp/src/Glacier2/glacier2.dsp
index 78e75d50db1..8b9e11a7791 100755
--- a/cpp/src/Glacier2/glacier2.dsp
+++ b/cpp/src/Glacier2/glacier2.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/glacier215.dll" /implib:"Release/glacier2.lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/glacier220.dll" /implib:"Release/glacier2.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\glacier2.lib ..\..\lib	copy $(OutDir)\glacier215.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\glacier2.lib ..\..\lib	copy $(OutDir)\glacier220.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "Glacier2 - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/glacier215d.dll" /implib:"Debug/glacier2d.lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/glacier220d.dll" /implib:"Debug/glacier2d.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\glacier2d.lib ..\..\lib	copy $(OutDir)\glacier215d.pdb ..\..\bin	copy $(OutDir)\glacier215d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\glacier2d.lib ..\..\lib	copy $(OutDir)\glacier220d.pdb ..\..\bin	copy $(OutDir)\glacier220d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 8971abe244e..42998741cec 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ws2_32.lib libbz2.lib advapi32.lib /nologo /entry:"Ice_DLL_Main" /dll /machine:I386 /out:"Release/ice15.dll" /implib:"Release/ice.lib"
+# ADD LINK32 ws2_32.lib libbz2.lib advapi32.lib /nologo /entry:"Ice_DLL_Main" /dll /machine:I386 /out:"Release/ice20.dll" /implib:"Release/ice.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\ice.lib ..\..\lib	copy $(OutDir)\ice15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\ice.lib ..\..\lib	copy $(OutDir)\ice20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "Ice - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 ws2_32.lib libbz2d.lib advapi32.lib /nologo /entry:"Ice_DLL_Main" /dll /debug /machine:I386 /out:"Debug/ice15d.dll" /implib:"Debug/iced.lib"
+# ADD LINK32 ws2_32.lib libbz2d.lib advapi32.lib /nologo /entry:"Ice_DLL_Main" /dll /debug /machine:I386 /out:"Debug/ice20d.dll" /implib:"Debug/iced.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\iced.lib ..\..\lib	copy $(OutDir)\ice15d.pdb ..\..\bin	copy $(OutDir)\ice15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\iced.lib ..\..\lib	copy $(OutDir)\ice20d.pdb ..\..\bin	copy $(OutDir)\ice20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/IceBox/icebox.dsp b/cpp/src/IceBox/icebox.dsp
index 295f259ccf2..76d463e5e4f 100644
--- a/cpp/src/IceBox/icebox.dsp
+++ b/cpp/src/IceBox/icebox.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icebox15.dll" /implib:"Release/icebox.lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icebox20.dll" /implib:"Release/icebox.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icebox.lib ..\..\lib	copy $(OutDir)\icebox15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icebox.lib ..\..\lib	copy $(OutDir)\icebox20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "IceBox - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icebox15d.dll" /implib:"Debug/iceboxd.lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icebox20d.dll" /implib:"Debug/iceboxd.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\iceboxd.lib ..\..\lib	copy $(OutDir)\icebox15d.pdb ..\..\bin	copy $(OutDir)\icebox15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\iceboxd.lib ..\..\lib	copy $(OutDir)\icebox20d.pdb ..\..\bin	copy $(OutDir)\icebox20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/IcePack/icepack.dsp b/cpp/src/IcePack/icepack.dsp
index d427c867537..a44d8e4d696 100644
--- a/cpp/src/IcePack/icepack.dsp
+++ b/cpp/src/IcePack/icepack.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icepack15.dll" /implib:"Release/icepack.lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icepack20.dll" /implib:"Release/icepack.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icepack.lib ..\..\lib	copy $(OutDir)\icepack15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icepack.lib ..\..\lib	copy $(OutDir)\icepack20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icepack15d.dll" /implib:"Debug/icepackd.lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icepack20d.dll" /implib:"Debug/icepackd.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icepackd.lib ..\..\lib	copy $(OutDir)\icepack15d.pdb ..\..\bin	copy $(OutDir)\icepack15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icepackd.lib ..\..\lib	copy $(OutDir)\icepack20d.pdb ..\..\bin	copy $(OutDir)\icepack20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/IcePatch/icepatch.dsp b/cpp/src/IcePatch/icepatch.dsp
index 86573bd2cdd..57de84660df 100644
--- a/cpp/src/IcePatch/icepatch.dsp
+++ b/cpp/src/IcePatch/icepatch.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 libeay32.lib ssleay32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/icepatch15.dll" /implib:"Release/icepatch.lib"
+# ADD LINK32 libeay32.lib ssleay32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/icepatch20.dll" /implib:"Release/icepatch.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icepatch.lib ..\..\lib	copy $(OutDir)\icepatch15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icepatch.lib ..\..\lib	copy $(OutDir)\icepatch20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "IcePatch - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 libeay32.lib ssleay32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/icepatch15d.dll" /implib:"Debug/icepatchd.lib"
+# ADD LINK32 libeay32.lib ssleay32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/icepatch20d.dll" /implib:"Debug/icepatchd.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icepatchd.lib ..\..\lib	copy $(OutDir)\icepatch15d.pdb ..\..\bin	copy $(OutDir)\icepatch15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icepatchd.lib ..\..\lib	copy $(OutDir)\icepatch20d.pdb ..\..\bin	copy $(OutDir)\icepatch20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/IceSSL/icessl.dsp b/cpp/src/IceSSL/icessl.dsp
index b985d0bb571..8f1552026ff 100644
--- a/cpp/src/IceSSL/icessl.dsp
+++ b/cpp/src/IceSSL/icessl.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib /nologo /dll /machine:I386 /out:"Release/icessl15.dll" /implib:"Release/icessl.lib"
+# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib /nologo /dll /machine:I386 /out:"Release/icessl20.dll" /implib:"Release/icessl.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icessl.lib ..\..\lib	copy $(OutDir)\icessl15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icessl.lib ..\..\lib	copy $(OutDir)\icessl20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "IceSSL - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib /nologo /dll /debug /machine:I386 /out:"Debug/icessl15d.dll" /implib:"Debug/icessld.lib"
+# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib /nologo /dll /debug /machine:I386 /out:"Debug/icessl20d.dll" /implib:"Debug/icessld.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icessld.lib ..\..\lib	copy $(OutDir)\icessl15d.pdb ..\..\bin	copy $(OutDir)\icessl15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icessld.lib ..\..\lib	copy $(OutDir)\icessl20d.pdb ..\..\bin	copy $(OutDir)\icessl20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/IceStorm/icestorm.dsp b/cpp/src/IceStorm/icestorm.dsp
index 9a7f1483afd..4b55037b3fe 100644
--- a/cpp/src/IceStorm/icestorm.dsp
+++ b/cpp/src/IceStorm/icestorm.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestorm15.dll" /implib:"Release/icestorm.lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestorm20.dll" /implib:"Release/icestorm.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icestorm.lib ..\..\lib	copy $(OutDir)\icestorm15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icestorm.lib ..\..\lib	copy $(OutDir)\icestorm20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "IceStorm - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestorm15d.dll" /implib:"Debug/icestormd.lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestorm20d.dll" /implib:"Debug/icestormd.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icestormd.lib ..\..\lib	copy $(OutDir)\icestorm15d.pdb ..\..\bin	copy $(OutDir)\icestorm15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icestormd.lib ..\..\lib	copy $(OutDir)\icestorm20d.pdb ..\..\bin	copy $(OutDir)\icestorm20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/IceStorm/icestormS.dsp b/cpp/src/IceStorm/icestormS.dsp
index fbd0ec115b1..d8f57aff9b8 100644
--- a/cpp/src/IceStorm/icestormS.dsp
+++ b/cpp/src/IceStorm/icestormS.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestormservice15.dll" /implib:"Release/icestormservice.lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestormservice20.dll" /implib:"Release/icestormservice.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icestormservice.lib ..\..\lib	copy $(OutDir)\icestormservice15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icestormservice.lib ..\..\lib	copy $(OutDir)\icestormservice20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "IceStormS - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestormservice15d.dll" /implib:"Debug/icestormserviced.lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestormservice20d.dll" /implib:"Debug/icestormserviced.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icestormserviced.lib ..\..\lib	copy $(OutDir)\icestormservice15d.pdb ..\..\bin	copy $(OutDir)\icestormservice15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icestormserviced.lib ..\..\lib	copy $(OutDir)\icestormservice20d.pdb ..\..\bin	copy $(OutDir)\icestormservice20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/IceUtil/iceutil.dsp b/cpp/src/IceUtil/iceutil.dsp
index 176a39d8ff1..4b2a98125a4 100644
--- a/cpp/src/IceUtil/iceutil.dsp
+++ b/cpp/src/IceUtil/iceutil.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 rpcrt4.lib /nologo /dll /machine:I386 /out:"Release/iceutil15.dll" /implib:"Release/iceutil.lib"
+# ADD LINK32 rpcrt4.lib /nologo /dll /machine:I386 /out:"Release/iceutil20.dll" /implib:"Release/iceutil.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\iceutil.lib ..\..\lib	copy $(OutDir)\iceutil15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\iceutil.lib ..\..\lib	copy $(OutDir)\iceutil20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "IceUtil - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 rpcrt4.lib /nologo /dll /debug /machine:I386 /out:"Debug/iceutil15d.dll" /implib:"Debug/iceutild.lib"
+# ADD LINK32 rpcrt4.lib /nologo /dll /debug /machine:I386 /out:"Debug/iceutil20d.dll" /implib:"Debug/iceutild.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\iceutild.lib ..\..\lib	copy $(OutDir)\iceutil15d.pdb ..\..\bin	copy $(OutDir)\iceutil15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\iceutild.lib ..\..\lib	copy $(OutDir)\iceutil20d.pdb ..\..\bin	copy $(OutDir)\iceutil20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/IceXML/icexml.dsp b/cpp/src/IceXML/icexml.dsp
index df6cc42ae3c..248674c072b 100644
--- a/cpp/src/IceXML/icexml.dsp
+++ b/cpp/src/IceXML/icexml.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 libexpat.lib /nologo /dll /machine:I386 /out:"Release/icexml15.dll" /implib:"Release/icexml.lib"
+# ADD LINK32 libexpat.lib /nologo /dll /machine:I386 /out:"Release/icexml20.dll" /implib:"Release/icexml.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icexml.lib ..\..\lib	copy $(OutDir)\icexml15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icexml.lib ..\..\lib	copy $(OutDir)\icexml20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "IceXML - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 libexpat.lib /nologo /dll /debug /machine:I386 /out:"Debug/icexml15d.dll" /implib:"Debug/icexmld.lib"
+# ADD LINK32 libexpat.lib /nologo /dll /debug /machine:I386 /out:"Debug/icexml20d.dll" /implib:"Debug/icexmld.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icexmld.lib ..\..\lib	copy $(OutDir)\icexml15d.pdb ..\..\bin	copy $(OutDir)\icexml15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icexmld.lib ..\..\lib	copy $(OutDir)\icexml20d.pdb ..\..\bin	copy $(OutDir)\icexml20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/cpp/src/Slice/slice.dsp b/cpp/src/Slice/slice.dsp
index 9bf9462a9ad..819ca070d91 100644
--- a/cpp/src/Slice/slice.dsp
+++ b/cpp/src/Slice/slice.dsp
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/slice15.dll" /implib:"Release/slice.lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/slice20.dll" /implib:"Release/slice.lib"
 # SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Release
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\slice.lib ..\..\lib	copy $(OutDir)\slice15.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\slice.lib ..\..\lib	copy $(OutDir)\slice20.dll ..\..\bin
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "Slice - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/slice15d.dll" /implib:"Debug/sliced.lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/slice20d.dll" /implib:"Debug/sliced.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 # Begin Special Build Tool
 OutDir=.\Debug
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\sliced.lib ..\..\lib	copy $(OutDir)\slice15d.pdb ..\..\bin	copy $(OutDir)\slice15d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\sliced.lib ..\..\lib	copy $(OutDir)\slice20d.pdb ..\..\bin	copy $(OutDir)\slice20d.dll ..\..\bin
 # End Special Build Tool
 
 !ENDIF