diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs
index 26d7262a..7ff648a1 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.Designer.cs
@@ -26,7 +26,7 @@ namespace WebsitePanel.Installer.Core.Properties {
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://www.websitepanel.net/Services/InstallerService.asmx")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://www.websitepanel.net/Services/InstallerService-2.0.asmx")]
         public string WebsitePanel_Installer_Core_InstallerService_InstallerService {
             get {
                 return ((string)(this["WebsitePanel_Installer_Core_InstallerService_InstallerService"]));
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.settings b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.settings
index 849e4839..32a58250 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.settings
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="WebsitePanel_Installer_Core_InstallerService_InstallerService" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService.asmx</Value>
+      <Value Profile="(Default)">http://www.websitepanel.net/Services/InstallerService-2.0.asmx</Value>
     </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceProviderProxy.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceProviderProxy.cs
index bebbfd30..32379607 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceProviderProxy.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceProviderProxy.cs
@@ -48,7 +48,7 @@ namespace WebsitePanel.Installer.Core
 			}
 			else
 			{
-				webService.Url = "http://www.websitepanel.net/Services/InstallerService.asmx";
+				webService.Url = "http://www.websitepanel.net/Services/InstallerService-2.0.asmx";
 			}
 
 			// check if we need to add a proxy to access Internet
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco
index 25fbb398..7d6644d1 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.disco	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://www.websitepanel.net/Services/InstallerService.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <contractRef ref="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" docRef="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
 </discovery>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl
index 6de2de10..efe74830 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/InstallerService.wsdl	
@@ -294,10 +294,10 @@
   </wsdl:binding>
   <wsdl:service name="InstallerService">
     <wsdl:port name="InstallerServiceSoap" binding="tns:InstallerServiceSoap">
-      <soap:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
+      <soap:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
     <wsdl:port name="InstallerServiceSoap12" binding="tns:InstallerServiceSoap12">
-      <soap12:address location="http://www.websitepanel.net/Services/InstallerService.asmx" />
+      <soap12:address location="http://www.websitepanel.net/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.map b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.map
index ebf6cfab..e67f00f2 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.map	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Web References/InstallerService/Reference.map	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?wsdl" filename="InstallerService.wsdl" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService.asmx?disco" filename="InstallerService.disco" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?wsdl" filename="InstallerService.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://www.websitepanel.net/Services/InstallerService-2.0.asmx?disco" filename="InstallerService.disco" />
   </Results>
 </DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj
index c33c09e2..a6dffff2 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/WebsitePanel.Installer.Core.csproj
@@ -110,10 +110,10 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService.asmx">
+    <WebReferenceUrl Include="http://www.websitepanel.net/Services/InstallerService-2.0.asmx">
       <UrlBehavior>Dynamic</UrlBehavior>
       <RelPath>Web References\InstallerService\</RelPath>
-      <UpdateFromURL>http://www.websitepanel.net/Services/InstallerService.asmx</UpdateFromURL>
+      <UpdateFromURL>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
index 2d080502..7e4789c2 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/app.config
@@ -13,7 +13,7 @@
         <WebsitePanel.Installer.Core.Properties.Settings>
             <setting name="WebsitePanel_Installer_Core_InstallerService_InstallerService"
                 serializeAs="String">
-                <value>http://www.websitepanel.net/Services/InstallerService.asmx</value>
+                <value>http://www.websitepanel.net/Services/InstallerService-2.0.asmx</value>
             </setting>
         </WebsitePanel.Installer.Core.Properties.Settings>
     </applicationSettings>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.disco b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.disco
index 70beaaa0..a775a480 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.disco	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.disco	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://localhost/WebsitePanelSite/Services/InstallerService.asmx?wsdl" docRef="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-  <soap address="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
-  <soap address="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <contractRef ref="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx?wsdl" docRef="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <soap address="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" xmlns:q1="http://websitepanel.net/services" binding="q1:InstallerServiceSoap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
+  <soap address="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" xmlns:q2="http://websitepanel.net/services" binding="q2:InstallerServiceSoap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
 </discovery>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.wsdl b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.wsdl
index dfe09e67..618a3ec1 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.wsdl	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/InstallerService.wsdl	
@@ -145,10 +145,10 @@
   </wsdl:binding>
   <wsdl:service name="InstallerService">
     <wsdl:port name="InstallerServiceSoap" binding="tns:InstallerServiceSoap">
-      <soap:address location="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" />
+      <soap:address location="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
     <wsdl:port name="InstallerServiceSoap12" binding="tns:InstallerServiceSoap12">
-      <soap12:address location="http://localhost/WebsitePanelSite/Services/InstallerService.asmx" />
+      <soap12:address location="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.cs
index b638760f..5c240ebd 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.cs	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.cs	
@@ -40,7 +40,7 @@ namespace WebsitePanel.Updater.Services {
         
         /// <remarks/>
         public InstallerService() {
-            this.Url = "http://localhost/WebsitePanelSite/Services/InstallerService.asmx";
+            this.Url = "http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx";
             if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
                 this.UseDefaultCredentials = true;
                 this.useDefaultCredentialsSetExplicitly = false;
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.map b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.map
index a404a967..4b67d079 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.map	
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/Web References/Services/Reference.map	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WebsitePanelSite/Services/InstallerService.asmx?disco" filename="InstallerService.disco" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WebsitePanelSite/Services/InstallerService.asmx?wsdl" filename="InstallerService.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx?disco" filename="InstallerService.disco" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx?wsdl" filename="InstallerService.wsdl" />
   </Results>
 </DiscoveryClientResultsFile>
\ No newline at end of file
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
index 68e87839..e23eb9e7 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
@@ -107,10 +107,10 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://localhost/WebsitePanelSite/Services/InstallerService.asmx">
+    <WebReferenceUrl Include="http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx">
       <UrlBehavior>Static</UrlBehavior>
       <RelPath>Web References\Services\</RelPath>
-      <UpdateFromURL>http://localhost/WebsitePanelSite/Services/InstallerService.asmx</UpdateFromURL>
+      <UpdateFromURL>http://localhost/WebsitePanelSite/Services/InstallerService-2.0.asmx</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>