diff --git a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/WebsitePanel.Import.Enterprise.csproj b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/WebsitePanel.Import.Enterprise.csproj
index 32738387..dc52b6d8 100644
--- a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/WebsitePanel.Import.Enterprise.csproj
+++ b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/WebsitePanel.Import.Enterprise.csproj
@@ -65,21 +65,6 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="WebsitePanel.EnterpriseServer">
-      <HintPath>..\..\WebsitePanel.EnterpriseServer\bin\WebsitePanel.EnterpriseServer.dll</HintPath>
-    </Reference>
-    <Reference Include="WebsitePanel.EnterpriseServer.Base">
-      <HintPath>..\..\..\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="WebsitePanel.EnterpriseServer.Client">
-      <HintPath>..\..\..\Bin\WebsitePanel.EnterpriseServer.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="WebsitePanel.EnterpriseServer.Code">
-      <HintPath>..\..\..\Bin\WebsitePanel.EnterpriseServer.Code.dll</HintPath>
-    </Reference>
-    <Reference Include="WebsitePanel.Providers.Base">
-      <HintPath>..\..\..\Bin\WebsitePanel.Providers.Base.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\VersionInfo.cs">
@@ -216,6 +201,28 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\WebsitePanel.EnterpriseServer.Base\WebsitePanel.EnterpriseServer.Base.csproj">
+      <Project>{c09ce910-f16b-48a1-b2cc-c99b8c1cf775}</Project>
+      <Name>WebsitePanel.EnterpriseServer.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\WebsitePanel.EnterpriseServer.Client\WebsitePanel.EnterpriseServer.Client.csproj">
+      <Project>{4b344644-a570-477e-adcc-f2b267d6c038}</Project>
+      <Name>WebsitePanel.EnterpriseServer.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\WebsitePanel.EnterpriseServer.Code\WebsitePanel.EnterpriseServer.Code.csproj">
+      <Project>{60e39314-659c-4fad-ab91-d0d08e223578}</Project>
+      <Name>WebsitePanel.EnterpriseServer.Code</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\WebsitePanel.EnterpriseServer\WebsitePanel.EnterpriseServer.csproj">
+      <Project>{59c7623a-5181-48a5-880a-c9b82b48f589}</Project>
+      <Name>WebsitePanel.EnterpriseServer</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\WebsitePanel.Providers.Base\WebsitePanel.Providers.Base.csproj">
+      <Project>{684c932a-6c75-46ac-a327-f3689d89eb42}</Project>
+      <Name>WebsitePanel.Providers.Base</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
index 36a2f85f..02dead74 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
@@ -4995,12 +4995,18 @@ namespace WebsitePanel.Providers.HostedSolution
                 //general settings
                 Command cmd = new Command("Set-MailPublicFolder");
                 cmd.Parameters.Add("Identity", folder);
-                if (!folderName.Equals(newFolderName, StringComparison.OrdinalIgnoreCase))
-                {
-                    cmd.Parameters.Add("Name", newFolderName);
-                }
                 cmd.Parameters.Add("HiddenFromAddressListsEnabled", hideFromAddressBook);
                 ExecuteShellCommand(runSpace, cmd);
+
+                // rename
+                if (!folderName.Equals(newFolderName, StringComparison.OrdinalIgnoreCase))
+                {
+                    cmd = new Command("Set-PublicFolder");
+                    cmd.Parameters.Add("Identity", folder);
+                    cmd.Parameters.Add("Name", newFolderName);
+                    ExecuteShellCommand(runSpace, cmd);
+
+                }
             }
             finally
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.csproj
index 27740b68..0d80844d 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.csproj
@@ -46,18 +46,21 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WebsitePanel.Providers.Base">
-      <HintPath>..\..\Bin\WebsitePanel.Providers.Base.dll</HintPath>
+    <ProjectReference Include="..\WebsitePanel.Providers.Base\WebsitePanel.Providers.Base.csproj">
+      <Project>{684C932A-6C75-46AC-A327-F3689D89EB42}</Project>
+      <Name>WebsitePanel.Providers.Base</Name>
       <Private>False</Private>
-    </Reference>
-    <Reference Include="WebsitePanel.Providers.HostedSolution">
-      <HintPath>..\WebsitePanel.Server\bin\WebsitePanel.Providers.HostedSolution.dll</HintPath>
+    </ProjectReference>
+    <ProjectReference Include="..\WebsitePanel.Providers.HostedSolution\WebsitePanel.Providers.HostedSolution.csproj">
+      <Project>{A06DE5E4-4331-47E1-8F46-7B846146B559}</Project>
+      <Name>WebsitePanel.Providers.HostedSolution</Name>
       <Private>False</Private>
-    </Reference>
-    <Reference Include="WebsitePanel.Server.Utils">
-      <HintPath>..\WebsitePanel.Server.Utils\bin\Debug\WebsitePanel.Server.Utils.dll</HintPath>
+    </ProjectReference>
+    <ProjectReference Include="..\WebsitePanel.Server.Utils\WebsitePanel.Server.Utils.csproj">
+      <Project>{E91E52F3-9555-4D00-B577-2B1DBDD87CA7}</Project>
+      <Name>WebsitePanel.Server.Utils</Name>
       <Private>False</Private>
-    </Reference>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="HostedSharePointServer2013Ent.cs" />