diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 6d18f699..32d72c41 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -9503,3 +9503,6 @@ BEGIN
 END
 
 GO
+
+UPDATE [dbo].[ServiceItemTypes] SET TypeName ='WebsitePanel.Providers.SharePoint.SharePointEnterpriseSiteCollection, WebsitePanel.Providers.Base' WHERE DisplayName = 'SharePointEnterpriseSiteCollection'
+GO
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
index 5bb15cef..acd5f507 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
@@ -1078,7 +1078,7 @@ namespace WebsitePanel.EnterpriseServer
 
                                     if (cntxTmp.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
                                     {
-                                        SharePointSiteCollectionListPaged sharePointStats = HostedSharePointServerController.GetSiteCollectionsPaged(org.PackageId, o.Id, string.Empty, string.Empty, string.Empty, 0, 0);
+                                        SharePointEnterpriseSiteCollectionListPaged sharePointStats = HostedSharePointServerEntController.GetSiteCollectionsPaged(org.PackageId, o.Id, string.Empty, string.Empty, string.Empty, 0, 0);
                                         stats.CreatedSharePointEnterpriseSiteCollections += sharePointStats.TotalRowCount;
                                     }                                    
 
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerController.cs
index 90d87927..6dfe1bd3 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerController.cs
@@ -69,7 +69,7 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
             }
 
             SharePointSiteCollectionListPaged paged = new SharePointSiteCollectionListPaged();
-            DataSet result = PackageController.GetRawPackageItemsPaged(packageId, "Sharepoint Foundation Server", typeof(SharePointSiteCollection),
+            DataSet result = PackageController.GetRawPackageItemsPaged(packageId,  ResourceGroups.SharepointFoundationServer, typeof(SharePointSiteCollection),
                 true, filterColumn, filterValue, sortColumn, startRow, Int32.MaxValue);
             List<SharePointSiteCollection> items = PackageController.CreateServiceItemsList(result, 1).ConvertAll<SharePointSiteCollection>(delegate(ServiceProviderItem item) { return (SharePointSiteCollection)item; });
 
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerEntController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerEntController.cs
index 94020e38..c15bcb58 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerEntController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerEntController.cs
@@ -69,7 +69,7 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
             }
 
             SharePointEnterpriseSiteCollectionListPaged paged = new SharePointEnterpriseSiteCollectionListPaged();
-            DataSet result = PackageController.GetRawPackageItemsPaged(packageId, "Sharepoint Enterprise Server", typeof(SharePointEnterpriseSiteCollection),
+            DataSet result = PackageController.GetRawPackageItemsPaged(packageId, ResourceGroups.SharepointEnterpriseServer, typeof(SharePointEnterpriseSiteCollection),
                 true, filterColumn, filterValue, sortColumn, startRow, Int32.MaxValue);
             List<SharePointEnterpriseSiteCollection> items = PackageController.CreateServiceItemsList(result, 1).ConvertAll<SharePointEnterpriseSiteCollection>(delegate(ServiceProviderItem item) { return (SharePointEnterpriseSiteCollection)item; });
 
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 145d2914..88440ff3 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
@@ -16,7 +16,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\WebsitePanel.Server\bin\Sharepoint2013Ent\</OutputPath>
+    <OutputPath>..\WebsitePanel.Server\bin\Sharepoint2013\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -24,7 +24,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\WebsitePanel.Server\bin\Sharepoint2013Ent\</OutputPath>
+    <OutputPath>..\WebsitePanel.Server\bin\Sharepoint2013\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
index 2c8eda9a..029e25a2 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
@@ -157,10 +157,10 @@
     <Content Include="bin\Microsoft.Web.Management.dll" />
     <Content Include="bin\Microsoft.Web.PlatformInstaller.dll" />
     <Content Include="bin\Microsoft.Web.Services3.dll" />
-    <Content Include="bin\Sharepoint2013Ent\WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.dll" />
-    <Content Include="bin\Sharepoint2013Ent\WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.pdb" />
     <Content Include="bin\Sharepoint2013\WebsitePanel.Providers.HostedSolution.SharePoint2013.dll" />
     <Content Include="bin\Sharepoint2013\WebsitePanel.Providers.HostedSolution.SharePoint2013.pdb" />
+    <Content Include="bin\Sharepoint2013\WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.dll" />
+    <Content Include="bin\Sharepoint2013\WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.pdb" />
     <Content Include="bin\WebsitePanel.Providers.Base.dll" />
     <Content Include="bin\WebsitePanel.Providers.Base.pdb" />
     <Content Include="bin\WebsitePanel.Providers.Database.MySQL.dll" />