Rename PackageManagementService to PackageManagementSolution.

src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/GetPackageCmdlet.cs

@@ -23,7 +23,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 		public GetPackageCmdlet()
 			: this(
 				PackageManagementServices.RegisteredPackageRepositories,
-				PackageManagementServices.PackageManagementService,
+				PackageManagementServices.Solution,
 				PackageManagementServices.ConsoleHost,
 				null)
 		{
@@ -31,10 +31,10 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 		
 		public GetPackageCmdlet(
 			IRegisteredPackageRepositories registeredPackageRepositories,
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementConsoleHost consoleHost,
 			ICmdletTerminatingError terminatingError)
-			: base(packageManagementService, consoleHost, terminatingError)
+			: base(solution, consoleHost, terminatingError)
 		{
 			this.registeredPackageRepositories = registeredPackageRepositories;
 		}
@@ -154,7 +154,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 		IQueryable<IPackage> GetUpdatedPackages()
 		{
 			IPackageRepository aggregateRepository = registeredPackageRepositories.CreateAggregateRepository();
-			var updatedPackages = new UpdatedPackages(PackageManagementService, aggregateRepository, DefaultProject);
+			var updatedPackages = new UpdatedPackages(Solution, aggregateRepository, DefaultProject);
 			updatedPackages.SearchTerms = Filter;
 			return updatedPackages.GetUpdatedPackages().AsQueryable();
 		}
@@ -174,7 +174,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 		
 		ISharpDevelopProjectManager CreateProjectManagerForActiveProject(IPackageRepository repository)
 		{
-			return PackageManagementService.CreateProjectManager(repository, DefaultProject);
+			return Solution.CreateProjectManager(repository, DefaultProject);
 		}
 		
 		IQueryable<IPackage> GetRecentPackages()

src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/InstallPackageCmdlet.cs

@@ -14,17 +14,17 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 	{
 		public InstallPackageCmdlet()
 			: this(
-				PackageManagementServices.PackageManagementService,
+				PackageManagementServices.Solution,
 				PackageManagementServices.ConsoleHost,
 				null)
 		{
 		}
 		
 		public InstallPackageCmdlet(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementConsoleHost consoleHost,
 			ICmdletTerminatingError terminatingError)
-			: base(packageManagementService, consoleHost, terminatingError)
+			: base(solution, consoleHost, terminatingError)
 		{
 		}
 		
@@ -60,7 +60,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 		
 		InstallPackageAction CreateInstallPackageTask(PackageSource packageSource, MSBuildBasedProject project)
 		{
-			InstallPackageAction action = PackageManagementService.CreateInstallPackageAction();
+			InstallPackageAction action = Solution.CreateInstallPackageAction();
 			action.PackageId = Id;
 			action.PackageVersion = Version;
 			action.Project = project;

src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/PackageManagementCmdlet.cs

@@ -11,22 +11,22 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 {
 	public abstract class PackageManagementCmdlet : PSCmdlet, ITerminatingCmdlet
 	{
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		IPackageManagementConsoleHost consoleHost;
 		ICmdletTerminatingError terminatingError;
 		
 		public PackageManagementCmdlet(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementConsoleHost consoleHost,
 			ICmdletTerminatingError terminatingError)
 		{
-			this.packageManagementService = packageManagementService;
+			this.solution = solution;
 			this.consoleHost = consoleHost;
 			this.terminatingError = terminatingError;
 		}
 		
-		protected IPackageManagementService PackageManagementService {
+		protected IPackageManagementSolution Solution {
-			get { return packageManagementService; }
+			get { return solution; }
 		}
 		
 		protected IPackageManagementConsoleHost ConsoleHost {

src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UninstallPackageCmdlet.cs

@@ -14,17 +14,17 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 	{
 		public UninstallPackageCmdlet()
 			: this(
-				PackageManagementServices.PackageManagementService,
+				PackageManagementServices.Solution,
 				PackageManagementServices.ConsoleHost,
 				null)
 		{
 		}
 		
 		public UninstallPackageCmdlet(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementConsoleHost consoleHost,
 			ICmdletTerminatingError terminatingError)
-			: base(packageManagementService, consoleHost, terminatingError)
+			: base(solution, consoleHost, terminatingError)
 		{
 		}
 		
@@ -65,7 +65,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 		
 		UninstallPackageAction CreateUninstallPackageAction(MSBuildBasedProject project, PackageSource packageSource)
 		{
-			var action = PackageManagementService.CreateUninstallPackageAction();
+			var action = Solution.CreateUninstallPackageAction();
 			action.PackageId = Id;
 			action.PackageVersion = Version;
 			action.Project = project;

src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs

@@ -14,17 +14,17 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 	{
 		public UpdatePackageCmdlet()
 			: this(
-				PackageManagementServices.PackageManagementService,
+				PackageManagementServices.Solution,
 				PackageManagementServices.ConsoleHost,
 				null)
 		{
 		}
 		
 		public UpdatePackageCmdlet(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementConsoleHost consoleHost,
 			ICmdletTerminatingError terminatingError)
-			: base(packageManagementService, consoleHost, terminatingError)
+			: base(solution, consoleHost, terminatingError)
 		{
 		}
 		
@@ -60,7 +60,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
 		
 		UpdatePackageAction CreateUpdatePackageAction(PackageSource packageSource, MSBuildBasedProject project)
 		{
-			var action = PackageManagementService.CreateUpdatePackageAction();
+			var action = Solution.CreateUpdatePackageAction();
 			action.PackageSource = packageSource;
 			action.Project = project;
 			action.PackageId = Id;

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Helpers/TestableGetPackageCmdlet.cs

@@ -12,7 +12,7 @@ namespace PackageManagement.Cmdlets.Tests.Helpers
 {
 	public class TestableGetPackageCmdlet : GetPackageCmdlet
 	{
-		public FakePackageManagementService FakePackageManagementService;
+		public FakePackageManagementSolution FakeSolution;
 		public FakeRegisteredPackageRepositories FakeRegisteredPackageRepositories;
 		public FakeCommandRuntime FakeCommandRuntime;
 		public List<IPackage> PackagesPassedToWriteObject = new List<IPackage>();
@@ -21,7 +21,7 @@ namespace PackageManagement.Cmdlets.Tests.Helpers
 		
 		public TestableGetPackageCmdlet()
 			: this(
-				new FakePackageManagementService(),
+				new FakePackageManagementSolution(),
 				new FakeRegisteredPackageRepositories(),
 				new FakePackageManagementConsoleHost(),
 				new FakeCommandRuntime(),
@@ -30,14 +30,14 @@ namespace PackageManagement.Cmdlets.Tests.Helpers
 		}
 		
 		public TestableGetPackageCmdlet(
-			FakePackageManagementService packageManagementService,
+			FakePackageManagementSolution solution,
 			FakeRegisteredPackageRepositories registeredPackageRepositories,
 			FakePackageManagementConsoleHost consoleHost,
 			FakeCommandRuntime commandRuntime,
 			FakeCmdletTerminatingError terminatingError)
-			: base(registeredPackageRepositories, packageManagementService, consoleHost, terminatingError)
+			: base(registeredPackageRepositories, solution, consoleHost, terminatingError)
 		{
-			this.FakePackageManagementService = packageManagementService;
+			this.FakeSolution = solution;
 			this.FakeRegisteredPackageRepositories = registeredPackageRepositories;
 			this.FakePackageManagementConsoleHost = consoleHost;
 			this.FakeCommandRuntime = commandRuntime;

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Helpers/TestableInstallPackageCmdlet.cs

@@ -12,23 +12,23 @@ namespace PackageManagement.Cmdlets.Tests.Helpers
 	{
 		public FakeCmdletTerminatingError FakeCmdletTerminatingError;
 		public FakePackageManagementConsoleHost FakePackageManagementConsoleHost;
-		public FakePackageManagementService FakePackageManagementService;
+		public FakePackageManagementSolution FakeSolution;
 		
 		public TestableInstallPackageCmdlet()
 			: this(
-				new FakePackageManagementService(),
+				new FakePackageManagementSolution(),
 				new FakePackageManagementConsoleHost(),
 				new FakeCmdletTerminatingError())
 		{
 		}
 		
 		public TestableInstallPackageCmdlet(
-			FakePackageManagementService packageManagementService,
+			FakePackageManagementSolution solution,
 			FakePackageManagementConsoleHost consoleHost,
 			FakeCmdletTerminatingError cmdletTerminatingError)
-			: base(packageManagementService, consoleHost, cmdletTerminatingError)
+			: base(solution, consoleHost, cmdletTerminatingError)
 		{
-			this.FakePackageManagementService = packageManagementService;
+			this.FakeSolution = solution;
 			this.FakePackageManagementConsoleHost = consoleHost;
 			this.FakeCmdletTerminatingError = cmdletTerminatingError;
 		}

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Helpers/TestablePackageManagementCmdlet.cs

@@ -12,7 +12,7 @@ namespace PackageManagement.Cmdlets.Tests.Helpers
 	{
 		public TestablePackageManagementCmdlet(FakeCmdletTerminatingError terminatingError)
 			: base(
-				new FakePackageManagementService(),
+				new FakePackageManagementSolution(),
 				new FakePackageManagementConsoleHost(),
 				terminatingError)
 		{

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Helpers/TestableUninstallPackageCmdlet.cs

@@ -12,23 +12,23 @@ namespace PackageManagement.Cmdlets.Tests.Helpers
 	{
 		public FakeCmdletTerminatingError FakeCmdletTerminatingError;
 		public FakePackageManagementConsoleHost FakePackageManagementConsoleHost;
-		public FakePackageManagementService FakePackageManagementService;
+		public FakePackageManagementSolution FakeSolution;
 		
 		public TestableUninstallPackageCmdlet()
 			: this(
-				new FakePackageManagementService(),
+				new FakePackageManagementSolution(),
 				new FakePackageManagementConsoleHost(),
 				new FakeCmdletTerminatingError())
 		{
 		}
 		
 		public TestableUninstallPackageCmdlet(
-			FakePackageManagementService packageManagementService,
+			FakePackageManagementSolution solution,
 			FakePackageManagementConsoleHost consoleHost,
 			FakeCmdletTerminatingError cmdletTerminatingError)
-			: base(packageManagementService, consoleHost, cmdletTerminatingError)
+			: base(solution, consoleHost, cmdletTerminatingError)
 		{
-			this.FakePackageManagementService = packageManagementService;
+			this.FakeSolution = solution;
 			this.FakePackageManagementConsoleHost = consoleHost;
 			this.FakeCmdletTerminatingError = cmdletTerminatingError;
 		}

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Helpers/TestableUpdatePackageCmdlet.cs

@@ -12,23 +12,23 @@ namespace PackageManagement.Cmdlets.Tests.Helpers
 	{
 		public FakeCmdletTerminatingError FakeCmdletTerminatingError;
 		public FakePackageManagementConsoleHost FakePackageManagementConsoleHost;
-		public FakePackageManagementService FakePackageManagementService;
+		public FakePackageManagementSolution FakeSolution;
 		
 		public TestableUpdatePackageCmdlet()
 			: this(
-				new FakePackageManagementService(),
+				new FakePackageManagementSolution(),
 				new FakePackageManagementConsoleHost(),
 				new FakeCmdletTerminatingError())
 		{
 		}
 		
 		public TestableUpdatePackageCmdlet(
-			FakePackageManagementService packageManagementService,
+			FakePackageManagementSolution solution,
 			FakePackageManagementConsoleHost consoleHost,
 			FakeCmdletTerminatingError cmdletTerminatingError)
-			: base(packageManagementService, consoleHost, cmdletTerminatingError)
+			: base(solution, consoleHost, cmdletTerminatingError)
 		{
-			this.FakePackageManagementService = packageManagementService;
+			this.FakeSolution = solution;
 			this.FakePackageManagementConsoleHost = consoleHost;
 			this.FakeCmdletTerminatingError = cmdletTerminatingError;
 		}

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/GetPackageCmdletTests.cs

@@ -15,7 +15,7 @@ namespace PackageManagement.Cmdlets.Tests
 	public class GetPackageCmdletTests : CmdletTestsBase
 	{
 		TestableGetPackageCmdlet cmdlet;
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakeRegisteredPackageRepositories fakeRegisteredPackageRepositories;
 		FakeCommandRuntime fakeCommandRuntime;
 		FakeCmdletTerminatingError fakeTerminatingError;
@@ -23,7 +23,7 @@ namespace PackageManagement.Cmdlets.Tests
 		void CreateCmdlet()
 		{
 			cmdlet = new TestableGetPackageCmdlet();
-			fakePackageManagementService = cmdlet.FakePackageManagementService;
+			fakeSolution = cmdlet.FakeSolution;
 			fakeRegisteredPackageRepositories = cmdlet.FakeRegisteredPackageRepositories;
 			fakeConsoleHost = cmdlet.FakePackageManagementConsoleHost;
 			fakeCommandRuntime = cmdlet.FakeCommandRuntime;
@@ -53,7 +53,7 @@ namespace PackageManagement.Cmdlets.Tests
 		FakePackage AddPackageToProjectManagerLocalRepository(string id, string version)
 		{
 			var package = FakePackage.CreatePackageWithVersion(id, version);
-			fakePackageManagementService
+			fakeSolution
 				.FakeProjectManagerToReturnFromCreateProjectManager
 				.FakeLocalRepository
 				.FakePackages.Add(package);
@@ -168,7 +168,7 @@ namespace PackageManagement.Cmdlets.Tests
 		{
 			CreateCmdlet();
 			AddDefaultProjectToConsoleHost();
-			FakeProjectManager projectManager = fakePackageManagementService.FakeProjectManagerToReturnFromCreateProjectManager;
+			FakeProjectManager projectManager = fakeSolution.FakeProjectManagerToReturnFromCreateProjectManager;
 			projectManager.FakeLocalRepository.AddFakePackage("One");
 			projectManager.FakeLocalRepository.AddFakePackage("Two");
 			
@@ -201,7 +201,7 @@ namespace PackageManagement.Cmdlets.Tests
 			
 			RunCmdlet();
 			
-			var actualRepository = fakePackageManagementService.PackageRepositoryPassedToCreateProjectManager;
+			var actualRepository = fakeSolution.PackageRepositoryPassedToCreateProjectManager;
 			var expectedRepository = fakeRegisteredPackageRepositories.FakePackageRepository;
 			
 			Assert.AreEqual(expectedRepository, actualRepository);
@@ -216,7 +216,7 @@ namespace PackageManagement.Cmdlets.Tests
 			
 			RunCmdlet();
 			
-			var actualProject = fakePackageManagementService.ProjectPassedToCreateProjectManager;
+			var actualProject = fakeSolution.ProjectPassedToCreateProjectManager;
 			
 			Assert.AreEqual(project, actualProject);
 		}
@@ -248,7 +248,7 @@ namespace PackageManagement.Cmdlets.Tests
 			EnableUpdatesParameter();
 			RunCmdlet();
 			
-			var actualProject = fakePackageManagementService.ProjectPassedToCreateProjectManager;
+			var actualProject = fakeSolution.ProjectPassedToCreateProjectManager;
 			
 			Assert.AreEqual(project, actualProject);
 		}
@@ -261,7 +261,7 @@ namespace PackageManagement.Cmdlets.Tests
 			EnableUpdatesParameter();
 			RunCmdlet();
 			
-			var actualRepository = fakePackageManagementService.PackageRepositoryPassedToCreateProjectManager;
+			var actualRepository = fakeSolution.PackageRepositoryPassedToCreateProjectManager;
 			var expectedRepository = fakeRegisteredPackageRepositories.FakeAggregateRepository;
 			
 			Assert.AreEqual(expectedRepository, actualRepository);
@@ -293,7 +293,7 @@ namespace PackageManagement.Cmdlets.Tests
 		{
 			CreateCmdlet();
 			AddPackageSourceToConsoleHost();
-			FakeProjectManager projectManager = fakePackageManagementService.FakeProjectManagerToReturnFromCreateProjectManager;
+			FakeProjectManager projectManager = fakeSolution.FakeProjectManagerToReturnFromCreateProjectManager;
 			projectManager.FakeLocalRepository.AddFakePackage("A");
 			var package = projectManager.FakeLocalRepository.AddFakePackage("B");
 			
@@ -403,7 +403,7 @@ namespace PackageManagement.Cmdlets.Tests
 		{
 			CreateCmdlet();
 			AddPackageSourceToConsoleHost();
-			FakeProjectManager projectManager = fakePackageManagementService.FakeProjectManagerToReturnFromCreateProjectManager;
+			FakeProjectManager projectManager = fakeSolution.FakeProjectManagerToReturnFromCreateProjectManager;
 			var packageA = projectManager.FakeLocalRepository.AddFakePackage("A");
 			var packageB = projectManager.FakeLocalRepository.AddFakePackage("B");
 			var packageC = projectManager.FakeLocalRepository.AddFakePackage("C");

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/InstallPackageCmdletTests.cs

@@ -18,7 +18,7 @@ namespace PackageManagement.Cmdlets.Tests
 	{
 		TestableInstallPackageCmdlet cmdlet;
 		FakeCmdletTerminatingError fakeTerminatingError;
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakeInstallPackageAction fakeInstallPackageTask;
 		
 		void CreateCmdletWithoutActiveProject()
@@ -26,8 +26,8 @@ namespace PackageManagement.Cmdlets.Tests
 			cmdlet = new TestableInstallPackageCmdlet();
 			fakeTerminatingError = cmdlet.FakeCmdletTerminatingError;
 			fakeConsoleHost = cmdlet.FakePackageManagementConsoleHost;
-			fakePackageManagementService = cmdlet.FakePackageManagementService;
+			fakeSolution = cmdlet.FakeSolution;
-			fakeInstallPackageTask = fakePackageManagementService.ActionToReturnFromCreateInstallPackageAction;
+			fakeInstallPackageTask = fakeSolution.ActionToReturnFromCreateInstallPackageAction;
 		}
 				
 		void CreateCmdletWithActivePackageSourceAndProject()

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/UninstallPackageCmdletTests.cs

@@ -15,7 +15,7 @@ namespace PackageManagement.Cmdlets.Tests
 	{
 		TestableUninstallPackageCmdlet cmdlet;
 		FakeCmdletTerminatingError fakeTerminatingError;
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakeUninstallPackageAction uninstallPackageAction;
 		
 		void CreateCmdletWithoutActiveProject()
@@ -23,8 +23,8 @@ namespace PackageManagement.Cmdlets.Tests
 			cmdlet = new TestableUninstallPackageCmdlet();
 			fakeTerminatingError = cmdlet.FakeCmdletTerminatingError;
 			fakeConsoleHost = cmdlet.FakePackageManagementConsoleHost;
-			fakePackageManagementService = cmdlet.FakePackageManagementService;
+			fakeSolution = cmdlet.FakeSolution;
-			uninstallPackageAction = fakePackageManagementService.ActionToReturnFromCreateUninstallPackageAction;
+			uninstallPackageAction = fakeSolution.ActionToReturnFromCreateUninstallPackageAction;
 		}
 		
 		void CreateCmdletWithActivePackageSourceAndProject()

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/UpdatePackageCmdletTests.cs

@@ -15,7 +15,7 @@ namespace PackageManagement.Cmdlets.Tests
 	{
 		TestableUpdatePackageCmdlet cmdlet;
 		FakeCmdletTerminatingError fakeTerminatingError;
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakeUpdatePackageAction fakeUpdatePackageAction;
 		
 		void CreateCmdletWithoutActiveProject()
@@ -23,8 +23,8 @@ namespace PackageManagement.Cmdlets.Tests
 			cmdlet = new TestableUpdatePackageCmdlet();
 			fakeTerminatingError = cmdlet.FakeCmdletTerminatingError;
 			fakeConsoleHost = cmdlet.FakePackageManagementConsoleHost;
-			fakePackageManagementService = cmdlet.FakePackageManagementService;
+			fakeSolution = cmdlet.FakeSolution;
-			fakeUpdatePackageAction = fakePackageManagementService.ActionToReturnFromCreateUpdatePackageAction;
+			fakeUpdatePackageAction = fakeSolution.ActionToReturnFromCreateUpdatePackageAction;
 		}
 				
 		void CreateCmdletWithActivePackageSourceAndProject()

src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj

@@ -123,7 +123,7 @@
     <Compile Include="Src\InstalledPackagesViewModel.cs" />
     <Compile Include="Src\IPackageManagementFileService.cs" />
     <Compile Include="Src\IPackageManagementProjectService.cs" />
-    <Compile Include="Src\IPackageManagementService.cs" />
+    <Compile Include="Src\IPackageManagementSolution.cs" />
     <Compile Include="Src\IPackageManagerFactory.cs" />
     <Compile Include="Src\IPackageViewModelFactory.cs" />
     <Compile Include="Src\ISharpDevelopPackageManager.cs" />
@@ -149,7 +149,7 @@
     <Compile Include="Src\PackageManagementOptionsViewModel.cs" />
     <Compile Include="Src\PackageManagementProjectService.cs" />
     <Compile Include="Src\PackageManagementEnumerableExtensions.cs" />
-    <Compile Include="Src\PackageManagementService.cs" />
+    <Compile Include="Src\PackageManagementSolution.cs" />
     <Compile Include="Src\PackageManagementTask.cs" />
     <Compile Include="Src\PackageManagementTaskFactory.cs" />
     <Compile Include="Src\PackageRepositoryPaths.cs" />

src/AddIns/Misc/PackageManagement/Project/Src/AddPackageReferenceViewModel.cs

@@ -10,20 +10,20 @@ namespace ICSharpCode.PackageManagement
 {
 	public class AddPackageReferenceViewModel : ViewModelBase<AddPackageReferenceViewModel>, IDisposable
 	{
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		IPackageManagementEvents packageManagementEvents;
 		ILicenseAcceptanceService licenseAcceptanceService;
 		string message;
 		bool hasError;
 		
 		public AddPackageReferenceViewModel(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IRegisteredPackageRepositories registeredPackageRepositories,
 			IPackageManagementEvents packageManagementEvents,
 			ILicenseAcceptanceService licenseAcceptanceService,
 			ITaskFactory taskFactory)
 		{
-			this.packageManagementService = packageManagementService;
+			this.solution = solution;
 			this.packageManagementEvents = packageManagementEvents;
 			this.licenseAcceptanceService = licenseAcceptanceService;
 			
@@ -31,11 +31,11 @@ namespace ICSharpCode.PackageManagement
 			packageManagementEvents.PackageOperationsStarting += PackageOperationsStarting;
 			packageManagementEvents.AcceptLicenses += AcceptLicenses;
 			
-			var packageViewModelFactory = new PackageViewModelFactory(packageManagementService, packageManagementEvents);
+			var packageViewModelFactory = new PackageViewModelFactory(solution, packageManagementEvents);
 			
 			AvailablePackagesViewModel = new AvailablePackagesViewModel(registeredPackageRepositories, packageViewModelFactory, taskFactory);
-			InstalledPackagesViewModel = new InstalledPackagesViewModel(packageManagementService, packageManagementEvents, registeredPackageRepositories, packageViewModelFactory, taskFactory);
+			InstalledPackagesViewModel = new InstalledPackagesViewModel(solution, packageManagementEvents, registeredPackageRepositories, packageViewModelFactory, taskFactory);
-			UpdatedPackagesViewModel = new UpdatedPackagesViewModel(packageManagementService, registeredPackageRepositories, packageViewModelFactory, taskFactory);
+			UpdatedPackagesViewModel = new UpdatedPackagesViewModel(solution, registeredPackageRepositories, packageViewModelFactory, taskFactory);
 			RecentPackagesViewModel = new RecentPackagesViewModel(packageManagementEvents, registeredPackageRepositories, packageViewModelFactory, taskFactory);
 			
 			AvailablePackagesViewModel.ReadPackages();

src/AddIns/Misc/PackageManagement/Project/Src/Design/DesignTimeLicenseAcceptanceViewModel.cs

@@ -16,8 +16,8 @@ namespace ICSharpCode.PackageManagement.Design
 		
 		static IEnumerable<IPackage> CreatePackages()
 		{
-			var packageManagementService = new DesignTimeRegisteredPackageRepositories();
+			var repositories = new DesignTimeRegisteredPackageRepositories();
-			return packageManagementService.FakeActiveRepository.FakePackages;
+			return repositories.FakeActiveRepository.FakePackages;
 		}
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/Design/DesignTimePackagesViewModel.cs

@@ -11,16 +11,16 @@ namespace ICSharpCode.PackageManagement.Design
 	public class DesignTimePackagesViewModel : PackagesViewModel
 	{
 		public DesignTimePackagesViewModel()
-			: this(new DesignTimeRegisteredPackageRepositories(), new FakePackageManagementService())
+			: this(new DesignTimeRegisteredPackageRepositories(), new FakePackageManagementSolution())
 		{
 		}
 		
 		public DesignTimePackagesViewModel(
 			DesignTimeRegisteredPackageRepositories registeredPackageRepositories,
-			FakePackageManagementService packageManagementService)
+			FakePackageManagementSolution solution)
 			: base(
 				registeredPackageRepositories,
-				new PackageViewModelFactory(packageManagementService, null),
+				new PackageViewModelFactory(solution, null),
 				new PackageManagementTaskFactory())
 		{
 			PageSize = 3;

src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementService.cs

@@ -10,11 +10,11 @@ using NuGet;
 
 namespace ICSharpCode.PackageManagement.Design
 {
-	public class FakePackageManagementService : IPackageManagementService
+	public class FakePackageManagementSolution : IPackageManagementSolution
 	{
 		public FakeProjectManager FakeActiveProjectManager { get; set; }
 		
-		public FakePackageManagementService()
+		public FakePackageManagementSolution()
 		{
 			FakeActiveProjectManager = new FakeProjectManager();
 		}

src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementSolution.cs

@@ -8,7 +8,7 @@ using NuGet;
 
 namespace ICSharpCode.PackageManagement
 {
-	public interface IPackageManagementService
+	public interface IPackageManagementSolution
 	{
 		ISharpDevelopProjectManager CreateProjectManager(IPackageRepository repository, MSBuildBasedProject project);
 		ISharpDevelopPackageManager CreatePackageManagerForActiveProject();

src/AddIns/Misc/PackageManagement/Project/Src/IPackageViewModelFactory.cs

@@ -10,7 +10,7 @@ namespace ICSharpCode.PackageManagement
 	{
 		PackageViewModel CreatePackageViewModel(IPackageFromRepository package);
 		
-		IPackageManagementService PackageManagementService { get; }
+		IPackageManagementSolution Solution { get; }
 		IPackageManagementEvents PackageManagementEvents { get; }
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/InstallPackageAction.cs

@@ -11,9 +11,9 @@ namespace ICSharpCode.PackageManagement
 	public class InstallPackageAction : ProcessPackageAction
 	{
 		public InstallPackageAction(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementEvents packageManagementEvents)
-			: base(packageManagementService, packageManagementEvents)
+			: base(solution, packageManagementEvents)
 		{
 		}
 		

src/AddIns/Misc/PackageManagement/Project/Src/InstalledPackagesViewModel.cs

@@ -10,21 +10,21 @@ namespace ICSharpCode.PackageManagement
 {
 	public class InstalledPackagesViewModel : PackagesViewModel
 	{
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		IPackageManagementEvents packageManagementEvents;
 		IProjectManager projectManager;
 		IPackageRepository repository;
 		string errorMessage = String.Empty;
 
 		public InstalledPackagesViewModel(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementEvents packageManagementEvents,
 			IRegisteredPackageRepositories registeredPackageRepositories,
 			IPackageViewModelFactory packageViewModelFactory,
 			ITaskFactory taskFactory)
 			: base(registeredPackageRepositories, packageViewModelFactory, taskFactory)
 		{
-			this.packageManagementService = packageManagementService;
+			this.solution = solution;
 			this.packageManagementEvents = packageManagementEvents;
 			packageManagementEvents.ParentPackageInstalled += InstalledPackagesChanged;
 			packageManagementEvents.ParentPackageUninstalled += InstalledPackagesChanged;
@@ -35,7 +35,7 @@ namespace ICSharpCode.PackageManagement
 		void GetActiveProjectManager()
 		{
 			try {
-				this.projectManager = packageManagementService.ActiveProjectManager;
+				this.projectManager = solution.ActiveProjectManager;
 			} catch (Exception ex) {
 				errorMessage = ex.Message;
 			}

src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementServices.cs

@@ -9,7 +9,7 @@ namespace ICSharpCode.PackageManagement
 	public static class PackageManagementServices
 	{
 		static readonly PackageManagementOptions options;
-		static readonly PackageManagementService packageManagementService;
+		static readonly PackageManagementSolution solution;
 		static readonly PackageManagementConsoleHost consoleHost = new PackageManagementConsoleHost();
 		static readonly RegisteredPackageRepositories registeredPackageRepositories;
 		static readonly PackageManagementEvents packageManagementEvents = new PackageManagementEvents();
@@ -22,7 +22,7 @@ namespace ICSharpCode.PackageManagement
 			options = new PackageManagementOptions();
 			registeredPackageRepositories = new RegisteredPackageRepositories(options);
 			outputMessagesView = new PackageManagementOutputMessagesView(packageManagementEvents);
-			packageManagementService = new PackageManagementService(registeredPackageRepositories, packageManagementEvents);
+			solution = new PackageManagementSolution(registeredPackageRepositories, packageManagementEvents);
 			projectBrowserRefresher = new ProjectBrowserRefresher(projectService, packageManagementEvents);
 		}
 		
@@ -30,8 +30,8 @@ namespace ICSharpCode.PackageManagement
 			get { return options; }
 		}
 		
-		public static IPackageManagementService PackageManagementService {
+		public static IPackageManagementSolution Solution {
-			get { return packageManagementService; }
+			get { return solution; }
 		}
 		
 		public static IPackageManagementConsoleHost ConsoleHost {

src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs

@@ -10,14 +10,14 @@ using NuGet;
 
 namespace ICSharpCode.PackageManagement
 {
-	public class PackageManagementService : IPackageManagementService
+	public class PackageManagementSolution : IPackageManagementSolution
 	{
 		IRegisteredPackageRepositories registeredPackageRepositories;
 		IPackageManagerFactory packageManagerFactory;
 		IPackageManagementProjectService projectService;
 		IPackageManagementEvents packageManagementEvents;
 		
-		public PackageManagementService(
+		public PackageManagementSolution(
 			IRegisteredPackageRepositories registeredPackageRepositories,
 			IPackageManagementEvents packageManagementEvents)
 			: this(
@@ -28,7 +28,7 @@ namespace ICSharpCode.PackageManagement
 		{
 		}
 		
-		public PackageManagementService(
+		public PackageManagementSolution(
 			IRegisteredPackageRepositories registeredPackageRepositories,
 			IPackageManagerFactory packageManagerFactory,
 			IPackageManagementEvents packageManagementEvents,

src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementViewModels.cs

@@ -12,7 +12,7 @@ namespace ICSharpCode.PackageManagement
 		AddPackageReferenceViewModel addPackageReferenceViewModel;
 		PackageManagementOptionsViewModel packageManagementOptionsViewModel;
 		PackageManagementConsoleViewModel packageManagementConsoleViewModel;
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		IRegisteredPackageRepositories registeredPackageRepositories;
 		
 		public AddPackageReferenceViewModel AddPackageReferenceViewModel {
@@ -25,23 +25,23 @@ namespace ICSharpCode.PackageManagement
 		void CreateAddPackageReferenceViewModel()
 		{
 			CreateRegisteredPackageRepositories();
-			CreatePackageManagementService();
+			CreateSolution();
 			addPackageReferenceViewModel = 
 				new AddPackageReferenceViewModel(
-					packageManagementService,
+					solution,
 					registeredPackageRepositories,
 					PackageManagementServices.PackageManagementEvents,
 					new LicenseAcceptanceService(),
 					new PackageManagementTaskFactory());
 		}
 		
-		void CreatePackageManagementService()
+		void CreateSolution()
 		{
-			if (packageManagementService == null) {
+			if (solution == null) {
 				if (IsInDesignMode()) {
-					packageManagementService = new FakePackageManagementService();
+					solution = new FakePackageManagementSolution();
 				} else {
-					packageManagementService = PackageManagementServices.PackageManagementService;
+					solution = PackageManagementServices.Solution;
 				}
 			}
 		}
@@ -73,7 +73,7 @@ namespace ICSharpCode.PackageManagement
 		
 		void CreatePackageManagementOptionsViewModel()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			if (IsInDesignMode()) {
 				packageManagementOptionsViewModel = new DesignTimePackageManagementOptionsViewModel();
 			} else {
@@ -92,7 +92,7 @@ namespace ICSharpCode.PackageManagement
 		
 		void CreatePackageManagementConsoleViewModel()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			var consoleHost = PackageManagementServices.ConsoleHost;
 			packageManagementConsoleViewModel = 
 				new PackageManagementConsoleViewModel(

src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs

@@ -14,7 +14,7 @@ namespace ICSharpCode.PackageManagement
 		DelegateCommand addPackageCommand;
 		DelegateCommand removePackageCommand;
 		
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		IPackageManagementEvents packageManagementEvents;
 		IPackageFromRepository package;
 		IEnumerable<PackageOperation> packageOperations = new PackageOperation[0];
@@ -22,12 +22,12 @@ namespace ICSharpCode.PackageManagement
 		
 		public PackageViewModel(
 			IPackageFromRepository package,
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementEvents packageManagementEvents,
 			ILogger logger)
 		{
 			this.package = package;
-			this.packageManagementService = packageManagementService;
+			this.solution = solution;
 			this.packageManagementEvents = packageManagementEvents;
 			this.logger = CreateLogger(logger);
 			
@@ -93,7 +93,7 @@ namespace ICSharpCode.PackageManagement
 		
 		bool IsPackageInstalled(IPackage package)
 		{
-			return packageManagementService.ActiveProjectManager.IsInstalled(package);
+			return solution.ActiveProjectManager.IsInstalled(package);
 		}
 		
 		public IEnumerable<PackageDependency> Dependencies {
@@ -165,7 +165,7 @@ namespace ICSharpCode.PackageManagement
 		
 		ISharpDevelopPackageManager CreatePackageManagerForActiveProject()
 		{
-			ISharpDevelopPackageManager packageManager = packageManagementService.CreatePackageManagerForActiveProject();
+			ISharpDevelopPackageManager packageManager = solution.CreatePackageManagerForActiveProject();
 			packageManager.Logger = logger;
 			return packageManager;
 		}
@@ -229,7 +229,7 @@ namespace ICSharpCode.PackageManagement
 			IPackageFromRepository package,
 			IEnumerable<PackageOperation> packageOperations)
 		{
-			InstallPackageAction task = packageManagementService.CreateInstallPackageAction();
+			InstallPackageAction task = solution.CreateInstallPackageAction();
 			task.PackageRepository = package.Repository;
 			task.Package = package;
 			task.Operations = packageOperations;
@@ -259,7 +259,7 @@ namespace ICSharpCode.PackageManagement
 		void TryUninstallingPackage()
 		{
 			try {
-				var action = packageManagementService.CreateUninstallPackageAction();
+				var action = solution.CreateUninstallPackageAction();
 				action.PackageRepository = package.Repository;
 				action.Package = package;
 				action.Execute();

src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModelFactory.cs

@@ -10,16 +10,16 @@ namespace ICSharpCode.PackageManagement
 	{
 		public PackageViewModelFactory(IPackageViewModelFactory packageViewModelFactory)
 			: this(
-				packageViewModelFactory.PackageManagementService,
+				packageViewModelFactory.Solution,
 				packageViewModelFactory.PackageManagementEvents)
 		{
 		}
 		
 		public PackageViewModelFactory(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementEvents packageManagementEvents)
 		{
-			this.PackageManagementService = packageManagementService;
+			this.Solution = solution;
 			this.PackageManagementEvents = packageManagementEvents;
 			this.Logger = new PackageManagementLogger(packageManagementEvents);
 		}
@@ -28,12 +28,12 @@ namespace ICSharpCode.PackageManagement
 		{
 			return new PackageViewModel(
 				package,
-				PackageManagementService,
+				Solution,
 				PackageManagementEvents,
 				Logger);
 		}
 		
-		public IPackageManagementService PackageManagementService { get; private set; }
+		public IPackageManagementSolution Solution { get; private set; }
 		public IPackageManagementEvents PackageManagementEvents { get; private set; }
 		public ILogger Logger { get; private set; }
 	}

src/AddIns/Misc/PackageManagement/Project/Src/ProcessPackageAction.cs

@@ -9,14 +9,14 @@ namespace ICSharpCode.PackageManagement
 {
 	public abstract class ProcessPackageAction
 	{
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		IPackageManagementEvents packageManagementEvents;
 		
 		public ProcessPackageAction(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementEvents packageManagementEvents)
 		{
-			this.packageManagementService = packageManagementService;
+			this.solution = solution;
 			this.packageManagementEvents = packageManagementEvents;
 		}
 		
@@ -67,9 +67,9 @@ namespace ICSharpCode.PackageManagement
 		void CreatePackageManager()
 		{
 			if (PackageRepository == null) {
-				PackageManager = packageManagementService.CreatePackageManager(PackageSource, Project);
+				PackageManager = solution.CreatePackageManager(PackageSource, Project);
 			} else {
-				PackageManager = packageManagementService.CreatePackageManagerForActiveProject(PackageRepository);
+				PackageManager = solution.CreatePackageManagerForActiveProject(PackageRepository);
 			}
 		}
 		

src/AddIns/Misc/PackageManagement/Project/Src/UninstallPackageAction.cs

@@ -9,14 +9,14 @@ namespace ICSharpCode.PackageManagement
 {
 	public class UninstallPackageAction : ProcessPackageAction
 	{
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		
 		public UninstallPackageAction(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementEvents packageManagementEvents)
-			: base(packageManagementService, packageManagementEvents)
+			: base(solution, packageManagementEvents)
 		{
-			this.packageManagementService = packageManagementService;
+			this.solution = solution;
 		}
 		
 		public bool ForceRemove { get; set; }

src/AddIns/Misc/PackageManagement/Project/Src/UpdatePackageAction.cs

@@ -10,9 +10,9 @@ namespace ICSharpCode.PackageManagement
 	public class UpdatePackageAction : ProcessPackageAction
 	{
 		public UpdatePackageAction(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementEvents packageManagementEvents)
-			: base(packageManagementService, packageManagementEvents)
+			: base(solution, packageManagementEvents)
 
 		{
 			UpdateDependencies = true;

src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackageViewModel.cs

@@ -9,23 +9,23 @@ namespace ICSharpCode.PackageManagement
 {
 	public class UpdatedPackageViewModel : PackageViewModel
 	{
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		
 		public UpdatedPackageViewModel(
 			IPackageFromRepository package,
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageManagementEvents packageManagementEvents,
 			ILogger logger)
-			: base(package, packageManagementService, packageManagementEvents, logger)
+			: base(package, solution, packageManagementEvents, logger)
 		{
-			this.packageManagementService = packageManagementService;
+			this.solution = solution;
 		}
 		
 		protected override void InstallPackage(
 			IPackageFromRepository package,
 			IEnumerable<PackageOperation> packageOperations)
 		{
-			var action = packageManagementService.CreateUpdatePackageAction();
+			var action = solution.CreateUpdatePackageAction();
 			action.PackageRepository = package.Repository;
 			action.Package = package;
 			action.Operations = packageOperations;

src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackageViewModelFactory.cs

@@ -17,7 +17,7 @@ namespace ICSharpCode.PackageManagement
 		{
 			return new UpdatedPackageViewModel(
 				package,
-				PackageManagementService,
+				Solution,
 				PackageManagementEvents,
 				Logger);
 		}

src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackages.cs

@@ -12,24 +12,24 @@ namespace ICSharpCode.PackageManagement
 {
 	public class UpdatedPackages
 	{
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		MSBuildBasedProject project;
 		IPackageRepository localRepository;
 		IPackageRepository sourceRepository;
 		
 		public UpdatedPackages(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageRepository aggregateRepository)
-			: this(packageManagementService, aggregateRepository, null)
+			: this(solution, aggregateRepository, null)
 		{
 		}
 		
 		public UpdatedPackages(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IPackageRepository aggregateRepository,
 			MSBuildBasedProject project)
 		{
-			this.packageManagementService = packageManagementService;
+			this.solution = solution;
 			this.sourceRepository = aggregateRepository;
 			this.project = project;
 			GetRepositories();
@@ -68,9 +68,9 @@ namespace ICSharpCode.PackageManagement
 		IProjectManager CreateProjectManager()
 		{
 			if (project != null) {
-				return packageManagementService.CreateProjectManager(sourceRepository, project);
+				return solution.CreateProjectManager(sourceRepository, project);
 			}
-			return packageManagementService.ActiveProjectManager;
+			return solution.ActiveProjectManager;
 		}
 	}
 }

src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackagesViewModel.cs

@@ -11,17 +11,17 @@ namespace ICSharpCode.PackageManagement
 {
 	public class UpdatedPackagesViewModel : PackagesViewModel
 	{
-		IPackageManagementService packageManagementService;
+		IPackageManagementSolution solution;
 		UpdatedPackages updatedPackages;
 		string errorMessage = String.Empty;
 		
 		public UpdatedPackagesViewModel(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution solution,
 			IRegisteredPackageRepositories registeredPackageRepositories,
 			IPackageViewModelFactory packageViewModelFactory,
 			ITaskFactory taskFactory)
 			: this(
-				packageManagementService,
+				solution,
 				registeredPackageRepositories,
 				new UpdatedPackageViewModelFactory(packageViewModelFactory),
 				taskFactory)
@@ -29,7 +29,7 @@ namespace ICSharpCode.PackageManagement
 		}
 		
 		public UpdatedPackagesViewModel(
-			IPackageManagementService packageManagementService,
+			IPackageManagementSolution packageManagementService,
 			IRegisteredPackageRepositories registeredPackageRepositories,
 			UpdatedPackageViewModelFactory packageViewModelFactory,			
 			ITaskFactory taskFactory)
@@ -38,14 +38,14 @@ namespace ICSharpCode.PackageManagement
 				packageViewModelFactory,
 				taskFactory)
 		{
-			this.packageManagementService = packageManagementService;
+			this.solution = packageManagementService;
 		}
 		
 		protected override void UpdateRepositoryBeforeReadPackagesTaskStarts()
 		{
 			try {
 				IPackageRepository aggregateRepository = RegisteredPackageRepositories.CreateAggregateRepository();
-				updatedPackages = new UpdatedPackages(packageManagementService, aggregateRepository);
+				updatedPackages = new UpdatedPackages(solution, aggregateRepository);
 			} catch (Exception ex) {
 				errorMessage = ex.Message;
 			}

src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj

@@ -145,7 +145,7 @@
     <Compile Include="Src\PackageManagementOptionsTests.cs" />
     <Compile Include="Src\PackageManagementOptionsViewModelTests.cs" />
     <Compile Include="Src\PackageManagementOutputMessagesViewTests.cs" />
-    <Compile Include="Src\PackageManagementServiceTests.cs" />
+    <Compile Include="Src\PackageManagementSolutionTests.cs" />
     <Compile Include="Src\PackageRepositoryCacheTests.cs" />
     <Compile Include="Src\PackageRepositoryPathsTests.cs" />
     <Compile Include="Src\PackageSourceViewModelTests.cs" />

src/AddIns/Misc/PackageManagement/Test/Src/AddPackageReferenceViewModelTests.cs

@@ -18,30 +18,30 @@ namespace PackageManagement.Tests
 		AddPackageReferenceViewModel viewModel;
 		PackageManagementEvents packageManagementEvents;
 		FakeLicenseAcceptanceService fakeLicenseAcceptanceSevice;
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakeRegisteredPackageRepositories fakeRegisteredPackageRepositories;
 		FakeTaskFactory taskFactory;
 		List<FakePackage> packagesPassedToOnAcceptLicenses;
 		
-		void CreatePackageManagementService()
+		void CreateSolution()
 		{
-			fakePackageManagementService = new FakePackageManagementService();
+			fakeSolution = new FakePackageManagementSolution();
 			fakeRegisteredPackageRepositories = new FakeRegisteredPackageRepositories();
 		}
 		
 		void CreateViewModel()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
-			CreateViewModel(fakePackageManagementService);
+			CreateViewModel(fakeSolution);
 		}
 		
-		void CreateViewModel(FakePackageManagementService packageManagementService)
+		void CreateViewModel(FakePackageManagementSolution solution)
 		{
 			taskFactory = new FakeTaskFactory();
 			packageManagementEvents = new PackageManagementEvents();
 			fakeLicenseAcceptanceSevice = new FakeLicenseAcceptanceService();
 			viewModel = new AddPackageReferenceViewModel(
-				packageManagementService,
+				solution,
 				fakeRegisteredPackageRepositories,
 				packageManagementEvents,
 				fakeLicenseAcceptanceSevice,
@@ -91,12 +91,12 @@ namespace PackageManagement.Tests
 		[Test]
 		public void InstalledPackagesViewModel_ProjectHasOneInstalledPackage_HasOnePackageViewModel()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			var projectManager = new FakeProjectManager();
-			fakePackageManagementService.FakeActiveProjectManager = projectManager;
+			fakeSolution.FakeActiveProjectManager = projectManager;
 			FakePackage package = new FakePackage();
 			projectManager.FakeLocalRepository.FakePackages.Add(package);
-			CreateViewModel(fakePackageManagementService);
+			CreateViewModel(fakeSolution);
 			
 			IEnumerable<IPackage> expectedPackages = projectManager.FakeLocalRepository.FakePackages;
 			IEnumerable<PackageViewModel> actualPackageViewModels = viewModel.InstalledPackagesViewModel.PackageViewModels;
@@ -107,11 +107,11 @@ namespace PackageManagement.Tests
 		[Test]
 		public void AvailablePackagesViewModel_ActiveRepositoryHasOnePackage_HasOnePackageViewModel()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			var package = new FakePackage();
 			package.Id = "Test";
 			fakeRegisteredPackageRepositories.FakeActiveRepository.FakePackages.Add(package);
-			CreateViewModel(fakePackageManagementService);
+			CreateViewModel(fakeSolution);
 
 			List<FakePackage> expectedPackages = fakeRegisteredPackageRepositories.FakeActiveRepository.FakePackages;
 			
@@ -121,13 +121,13 @@ namespace PackageManagement.Tests
 		[Test]
 		public void PackageUpdatesViewModel_OneUpdatedPackageVersion_HasOnePackageViewModel()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			var oldPackage = new FakePackage() {
 				Id = "Test",
 				Version = new Version("1.0.0.0")
 			};
-			fakePackageManagementService.AddPackageToProjectLocalRepository(oldPackage);
+			fakeSolution.AddPackageToProjectLocalRepository(oldPackage);
 			
 			var newPackage = new FakePackage() {
 				Id = "Test",
@@ -135,7 +135,7 @@ namespace PackageManagement.Tests
 			};
 			fakeRegisteredPackageRepositories.FakeAggregateRepository.FakePackages.Add(newPackage);
 			
-			CreateViewModel(fakePackageManagementService);
+			CreateViewModel(fakeSolution);
 			
 			List<FakePackage> expectedPackages = fakeRegisteredPackageRepositories.FakeAggregateRepository.FakePackages;
 			
@@ -145,11 +145,11 @@ namespace PackageManagement.Tests
 		[Test]
 		public void RecentPackagesViewModel_RecentRepositoryHasOnePackage_HasOnePackageViewModel()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			var package = new FakePackage();
 			package.Id = "Test";
 			fakeRegisteredPackageRepositories.FakeRecentPackageRepository.FakePackages.Add(package);
-			CreateViewModel(fakePackageManagementService);
+			CreateViewModel(fakeSolution);
 
 			List<FakePackage> expectedPackages = fakeRegisteredPackageRepositories.FakeRecentPackageRepository.FakePackages;
 			

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageManagementService.cs

@@ -9,7 +9,7 @@ using NuGet;
 
 namespace PackageManagement.Tests.Helpers
 {
-	public class ExceptionThrowingPackageManagementService : FakePackageManagementService
+	public class ExceptionThrowingPackageManagementSolution : FakePackageManagementSolution
 	{
 		public Exception ExeptionToThrowWhenActiveProjectManagerAccessed { get; set; }
 		public Exception ExeptionToThrowWhenCreateInstallPackageTaskCalled { get; set; }

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageViewModelFactory.cs

@@ -10,7 +10,7 @@ namespace PackageManagement.Tests.Helpers
 {
 	public class FakePackageViewModelFactory : IPackageViewModelFactory
 	{
-		public FakePackageManagementService FakePackageManagementService = new FakePackageManagementService();
+		public FakePackageManagementSolution FakeSolution = new FakePackageManagementSolution();
 		public FakePackageManagementEvents FakePackageManagementEvents = new FakePackageManagementEvents();
 		public FakeLogger FakeLogger = new FakeLogger();
 		
@@ -18,13 +18,13 @@ namespace PackageManagement.Tests.Helpers
 		{
 			return new PackageViewModel(
 				package,
-				FakePackageManagementService,
+				FakeSolution,
 				FakePackageManagementEvents,
 				FakeLogger);
 		}
 		
-		public IPackageManagementService PackageManagementService { 
+		public IPackageManagementSolution Solution { 
-			get { return FakePackageManagementService; }
+			get { return FakeSolution; }
 		}
 		
 		public IPackageManagementEvents PackageManagementEvents {

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs

@@ -10,15 +10,15 @@ namespace PackageManagement.Tests.Helpers
 {
 	public class TestablePackageViewModel : PackageViewModel
 	{
-		public FakePackageManagementService	FakePackageManagementService;
+		public FakePackageManagementSolution FakeSolution;
 		public FakePackageManagementEvents FakePackageManagementEvents;
 		public FakePackage FakePackage;
 		public FakeLogger FakeLogger;
 		
-		public TestablePackageViewModel(FakePackageManagementService packageManagementService)
+		public TestablePackageViewModel(FakePackageManagementSolution solution)
 			: this(
 				new FakePackage(),
-				packageManagementService,
+				solution,
 				new FakePackageManagementEvents(),
 				new FakeLogger())
 		{		
@@ -26,17 +26,17 @@ namespace PackageManagement.Tests.Helpers
 		
 		public TestablePackageViewModel(
 			FakePackage package,
-			FakePackageManagementService packageManagementService,
+			FakePackageManagementSolution solution,
 			FakePackageManagementEvents packageManagementEvents,
 			FakeLogger logger)
 			: base(
 				package,
-				packageManagementService,
+				solution,
 				packageManagementEvents,
 				logger)
 		{
 			this.FakePackage = package;
-			this.FakePackageManagementService = packageManagementService;
+			this.FakeSolution = solution;
 			this.FakePackageManagementEvents = packageManagementEvents;
 			this.FakeLogger = logger;
 		}
@@ -56,7 +56,7 @@ namespace PackageManagement.Tests.Helpers
 		{
 			var operation = new PackageOperation(FakePackage, PackageAction.Install);
 			
-			FakePackageManagementService
+			FakeSolution
 				.FakePackageManagerToReturnFromCreatePackageManager
 				.PackageOperationsToReturnFromGetInstallPackageOperations
 				.Add(operation);
@@ -69,7 +69,7 @@ namespace PackageManagement.Tests.Helpers
 			var package = new FakePackage("PackageToUninstall");			
 			var operation = new PackageOperation(package, PackageAction.Uninstall);
 			
-			FakePackageManagementService
+			FakeSolution
 				.FakePackageManagerToReturnFromCreatePackageManager
 				.PackageOperationsToReturnFromGetInstallPackageOperations
 				.Add(operation);

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableProcessPackageAction.cs

@@ -9,22 +9,22 @@ namespace PackageManagement.Tests.Helpers
 {
 	public class TestableProcessPackageAction : ProcessPackageAction
 	{
-		public FakePackageManagementService FakePackageManagementService;
+		public FakePackageManagementSolution FakeSolution;
 		public FakePackageManagementEvents FakePackageManagementEvents;
 		public FakePackageRepository FakePackageRepository = new FakePackageRepository();
 		public FakePackage FakePackage = new FakePackage("Test");
 		
 		public TestableProcessPackageAction()
-			: this(new FakePackageManagementService(), new FakePackageManagementEvents())
+			: this(new FakePackageManagementSolution(), new FakePackageManagementEvents())
 		{
 		}
 		
 		public TestableProcessPackageAction(
-			FakePackageManagementService packageManagementService,
+			FakePackageManagementSolution solution,
 			FakePackageManagementEvents packageManagementEvents)
-			: base(packageManagementService, packageManagementEvents)
+			: base(solution, packageManagementEvents)
 		{
-			FakePackageManagementService = packageManagementService;
+			FakeSolution = solution;
 			FakePackageManagementEvents = packageManagementEvents;
 			this.PackageRepository = FakePackageRepository;
 			this.Package = FakePackage;

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableUpdatedPackageViewModel.cs

@@ -11,21 +11,21 @@ namespace PackageManagement.Tests.Helpers
 	public class TestableUpdatedPackageViewModel : UpdatedPackageViewModel
 	{
 		public FakePackageOperationResolver FakePackageOperationResolver = new FakePackageOperationResolver();
-		public FakePackageManagementService	FakePackageManagementService;
+		public FakePackageManagementSolution FakeSolution;
 		public FakePackageManagementEvents FakePackageManagementEvents;
 		public FakePackage FakePackage;
 		public FakeLogger FakeLogger;
 		public ILogger LoggerUsedWhenCreatingPackageResolver;
 		
 		public TestableUpdatedPackageViewModel()
-			: this(new FakePackageManagementService())
+			: this(new FakePackageManagementSolution())
 		{
 		}
 		
-		public TestableUpdatedPackageViewModel(FakePackageManagementService packageManagementService)
+		public TestableUpdatedPackageViewModel(FakePackageManagementSolution solution)
 			: this(
 				new FakePackage(),
-				packageManagementService,
+				solution,
 				new FakePackageManagementEvents(),
 				new FakeLogger())
 		{		
@@ -33,17 +33,17 @@ namespace PackageManagement.Tests.Helpers
 		
 		public TestableUpdatedPackageViewModel(
 			FakePackage package,
-			FakePackageManagementService packageManagementService,
+			FakePackageManagementSolution solution,
 			FakePackageManagementEvents packageManagementEvents,
 			FakeLogger logger)
 			: base(
 				package,
-				packageManagementService,
+				solution,
 				packageManagementEvents,
 				logger)
 		{
 			this.FakePackage = package;
-			this.FakePackageManagementService = packageManagementService;
+			this.FakeSolution = solution;
 			this.FakeLogger = logger;
 		}
 	}

src/AddIns/Misc/PackageManagement/Test/Src/InstallPackageActionTests.cs

@@ -12,7 +12,7 @@ namespace PackageManagement.Tests
 	[TestFixture]
 	public class InstallPackageActionTests
 	{
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakePackageManagementEvents fakePackageManagementEvents;
 		FakePackageManager fakePackageManager;
 		InstallPackageAction action;
@@ -20,10 +20,10 @@ namespace PackageManagement.Tests
 
 		void CreateAction()
 		{
-			fakePackageManagementService = new FakePackageManagementService();
+			fakeSolution = new FakePackageManagementSolution();
 			fakePackageManagementEvents = new FakePackageManagementEvents();
-			fakePackageManager = fakePackageManagementService.FakePackageManagerToReturnFromCreatePackageManager;
+			fakePackageManager = fakeSolution.FakePackageManagerToReturnFromCreatePackageManager;
-			action = new InstallPackageAction(fakePackageManagementService, fakePackageManagementEvents);
+			action = new InstallPackageAction(fakeSolution, fakePackageManagementEvents);
 			installPackageHelper = new InstallPackageHelper(action);
 		}
 		
@@ -59,7 +59,7 @@ namespace PackageManagement.Tests
 			installPackageHelper.InstallPackageById("PackageId");
 			
 			var expectedPackageSource = installPackageHelper.PackageSource;
-			var actualPackageSource = fakePackageManagementService.PackageSourcePassedToCreatePackageManager;
+			var actualPackageSource = fakeSolution.PackageSourcePassedToCreatePackageManager;
 			
 			Assert.AreEqual(expectedPackageSource, actualPackageSource);
 		}
@@ -78,7 +78,7 @@ namespace PackageManagement.Tests
 			installPackageHelper.InstallTestPackage();
 			
 			var expectedRepository = installPackageHelper.PackageRepository;
-			var actualRepository = fakePackageManagementService.PackageRepositoryPassedToCreatePackageManager;
+			var actualRepository = fakeSolution.PackageRepositoryPassedToCreatePackageManager;
 			
 			Assert.AreEqual(expectedRepository, actualRepository);
 		}
@@ -141,7 +141,7 @@ namespace PackageManagement.Tests
 			CreateAction();
 			installPackageHelper.InstallPackageById("PackageId");
 			
-			var actualProject = fakePackageManagementService.ProjectPassedToCreatePackageManager;
+			var actualProject = fakeSolution.ProjectPassedToCreatePackageManager;
 			var expectedProject = installPackageHelper.TestableProject;
 			
 			Assert.AreEqual(expectedProject, actualProject);

src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs

@@ -14,30 +14,30 @@ namespace PackageManagement.Tests
 	public class InstalledPackagesViewModelTests
 	{
 		InstalledPackagesViewModel viewModel;
-		FakePackageManagementService packageManagementService;
+		FakePackageManagementSolution solution;
 		PackageManagementEvents packageManagementEvents;
 		FakeRegisteredPackageRepositories registeredPackageRepositories;
-		ExceptionThrowingPackageManagementService exceptionThrowingPackageManagementService;
+		ExceptionThrowingPackageManagementSolution exceptionThrowingSolution;
 		FakeTaskFactory taskFactory;
 		
 		void CreateViewModel()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
-			CreateViewModel(packageManagementService);
+			CreateViewModel(solution);
 		}
 		
-		void CreatePackageManagementService()
+		void CreateSolution()
 		{
-			packageManagementService = new FakePackageManagementService();
+			solution = new FakePackageManagementSolution();
 			registeredPackageRepositories = new FakeRegisteredPackageRepositories();
 		}
 		
-		void CreateExceptionThrowingPackageManagementService()
+		void CreateExceptionThrowingSolution()
 		{
-			exceptionThrowingPackageManagementService = new ExceptionThrowingPackageManagementService();
+			exceptionThrowingSolution = new ExceptionThrowingPackageManagementSolution();
 		}
 		
-		void CreateViewModel(FakePackageManagementService packageManagementService)
+		void CreateViewModel(FakePackageManagementSolution solution)
 		{
 			registeredPackageRepositories = new FakeRegisteredPackageRepositories();
 			var packageViewModelFactory = new FakePackageViewModelFactory();
@@ -45,7 +45,7 @@ namespace PackageManagement.Tests
 			packageManagementEvents = new PackageManagementEvents();
 			
 			viewModel = new InstalledPackagesViewModel(
-				packageManagementService,
+				solution,
 				packageManagementEvents,
 				registeredPackageRepositories,
 				packageViewModelFactory,
@@ -65,7 +65,7 @@ namespace PackageManagement.Tests
 		FakePackage AddPackageToProjectManagerLocalPackageRepository()
 		{
 			var package = new FakePackage("Test");
-			FakePackageRepository repository = packageManagementService.FakeActiveProjectManager.FakeLocalRepository;
+			FakePackageRepository repository = solution.FakeActiveProjectManager.FakeLocalRepository;
 			repository.FakePackages.Add(package);
 			return package;
 		}
@@ -94,7 +94,7 @@ namespace PackageManagement.Tests
 			viewModel.ReadPackages();
 			CompleteReadPackagesTask();
 			
-			packageManagementService.FakeActiveProjectManager.FakeLocalRepository.FakePackages.Clear();
+			solution.FakeActiveProjectManager.FakeLocalRepository.FakePackages.Clear();
 			
 			ClearReadPackagesTasks();
 			packageManagementEvents.OnParentPackageUninstalled(new FakePackage());
@@ -106,9 +106,9 @@ namespace PackageManagement.Tests
 		[Test]
 		public void ReadPackages_ActiveProjectManagerThrowsException_ErrorMessageFromExceptionNotOverriddenByReadPackagesCall()
 		{
-			CreateExceptionThrowingPackageManagementService();
+			CreateExceptionThrowingSolution();
-			exceptionThrowingPackageManagementService.ExeptionToThrowWhenActiveProjectManagerAccessed = new Exception("Test");
+			exceptionThrowingSolution.ExeptionToThrowWhenActiveProjectManagerAccessed = new Exception("Test");
-			CreateViewModel(exceptionThrowingPackageManagementService);
+			CreateViewModel(exceptionThrowingSolution);
 			viewModel.ReadPackages();
 			
 			ApplicationException ex = Assert.Throws<ApplicationException>(() => CompleteReadPackagesTask());
@@ -118,12 +118,12 @@ namespace PackageManagement.Tests
 		[Test]
 		public void ReadPackages_OnePackageInLocalRepository_RepositoryIsNotCreatedByBackgroundThread()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
-			packageManagementService.AddPackageToProjectLocalRepository(new FakePackage());
+			solution.AddPackageToProjectLocalRepository(new FakePackage());
-			CreateViewModel(packageManagementService);
+			CreateViewModel(solution);
 			viewModel.ReadPackages();
 			
-			packageManagementService.FakeActiveProjectManager.FakeLocalRepository = null;
+			solution.FakeActiveProjectManager.FakeLocalRepository = null;
 			CompleteReadPackagesTask();
 			
 			Assert.AreEqual(1, viewModel.PackageViewModels.Count);
@@ -153,7 +153,7 @@ namespace PackageManagement.Tests
 			viewModel.ReadPackages();
 			CompleteReadPackagesTask();
 			
-			packageManagementService.FakeActiveProjectManager.FakeLocalRepository.FakePackages.Clear();
+			solution.FakeActiveProjectManager.FakeLocalRepository.FakePackages.Clear();
 			
 			ClearReadPackagesTasks();
 			viewModel.Dispose();

src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementSolutionTests.cs

@@ -15,9 +15,9 @@ using PackageManagement.Tests.Helpers;
 namespace PackageManagement.Tests
 {
 	[TestFixture]
-	public class PackageManagementServiceTests
+	public class PackageManagementSolutionTests
 	{
-		PackageManagementService packageManagementService;
+		PackageManagementSolution solution;
 		FakeRegisteredPackageRepositories fakeRegisteredPackageRepositories;
 		OneRegisteredPackageSourceHelper packageSourcesHelper;
 		FakePackageManagerFactory fakePackageManagerFactory;
@@ -29,13 +29,13 @@ namespace PackageManagement.Tests
 			packageSourcesHelper = new OneRegisteredPackageSourceHelper();
 		}
 		
-		void CreatePackageManagementService()
+		void CreateSolution()
 		{
 			CreatePackageSources();
-			CreatePackageManagementService(packageSourcesHelper.Options);
+			CreateSolution(packageSourcesHelper.Options);
 		}
 		
-		void CreatePackageManagementService(PackageManagementOptions options)
+		void CreateSolution(PackageManagementOptions options)
 		{
 			testProject = ProjectHelper.CreateTestProject();
 			fakeRegisteredPackageRepositories = new FakeRegisteredPackageRepositories();
@@ -44,8 +44,8 @@ namespace PackageManagement.Tests
 			var packageManagementEvents = new FakePackageManagementEvents();
 			
 			fakeProjectService.CurrentProject = testProject;
-			packageManagementService = 
+			solution = 
-				new PackageManagementService(
+				new PackageManagementSolution(
 					fakeRegisteredPackageRepositories,
 					fakePackageManagerFactory,
 					packageManagementEvents,
@@ -78,9 +78,9 @@ namespace PackageManagement.Tests
 		[Test]
 		public void ActiveProjectManager_ProjectIsSelected_ReferencesSelectedProject()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
-			IProjectManager activeProjectManager = packageManagementService.ActiveProjectManager;
+			IProjectManager activeProjectManager = solution.ActiveProjectManager;
 			IProject actualProject = fakePackageManagerFactory.ProjectPassedToCreateRepository;
 			
 			Assert.AreEqual(testProject, actualProject);
@@ -89,11 +89,11 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreateProjectManager_RepositoryAndProjectSpecified_CreatesPackageManagerFromPackageManagerFactory()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			var repository = new FakePackageRepository();
 			var project = ProjectHelper.CreateTestProject();
 			
-			ISharpDevelopProjectManager projectManager = packageManagementService.CreateProjectManager(repository, project);
+			ISharpDevelopProjectManager projectManager = solution.CreateProjectManager(repository, project);
 			
 			var expectedProjectManager = fakePackageManagerFactory.FakePackageManager.FakeProjectManager;
 			Assert.AreEqual(expectedProjectManager, projectManager);
@@ -102,10 +102,10 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreateProjectManager_RepositorySpecified_RepositoryUsedToCreateProjectManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			var repository = new FakePackageRepository();
 			
-			packageManagementService.CreateProjectManager(repository, null);
+			solution.CreateProjectManager(repository, null);
 			
 			var expectedRepository = fakePackageManagerFactory.PackageRepositoryPassedToCreatePackageManager;
 			
@@ -115,10 +115,10 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreateProjectManager_ProjectSpecified_ProjectUsedToCreateProjectManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			var project = ProjectHelper.CreateTestProject();
 			
-			packageManagementService.CreateProjectManager(null, project);
+			solution.CreateProjectManager(null, project);
 			
 			var expectedProject = fakePackageManagerFactory.ProjectPassedToCreateRepository;
 			
@@ -128,9 +128,9 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreatePackageManagerForActiveProject_ProjectIsSelected_ReferencesSelectedProject()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
-			packageManagementService.CreatePackageManagerForActiveProject();
+			solution.CreatePackageManagerForActiveProject();
 			
 			IProject expectedProject = fakeProjectService.CurrentProject;
 			IProject actualProject = fakePackageManagerFactory.ProjectPassedToCreateRepository;
@@ -141,10 +141,10 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreatePackageManagerForActiveProject_PackageRepositoryPassed_CreatesPackageManagerWithCurrentlyActiveProject()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			var repository = new FakePackageRepository();
-			packageManagementService.CreatePackageManagerForActiveProject(repository);
+			solution.CreatePackageManagerForActiveProject(repository);
 			
 			IProject expectedProject = fakeProjectService.CurrentProject;
 			IProject actualProject = fakePackageManagerFactory.ProjectPassedToCreateRepository;
@@ -155,10 +155,10 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreatePackageManagerForActiveProject_PackageRepositoryPassed_PackageManagerCreatedWithRepository()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			var repository = new FakePackageRepository();
-			packageManagementService.CreatePackageManagerForActiveProject(repository);
+			solution.CreatePackageManagerForActiveProject(repository);
 			
 			var actualRepository = fakePackageManagerFactory.PackageRepositoryPassedToCreatePackageManager;
 			
@@ -168,9 +168,9 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreatePackageManagerForActiveProject_ProjectIsSelected_UsesActiveRepository()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
-			packageManagementService.CreatePackageManagerForActiveProject();
+			solution.CreatePackageManagerForActiveProject();
 			
 			var expectedRepository = fakeRegisteredPackageRepositories.ActiveRepository;
 			var actualRepository = fakePackageManagerFactory.PackageRepositoryPassedToCreatePackageManager;
@@ -181,10 +181,10 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreatePackageManagerForActiveProject_ProjectIsSelected_ReturnsPackageManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			ISharpDevelopPackageManager packageManager = 
-				packageManagementService.CreatePackageManagerForActiveProject();
+				solution.CreatePackageManagerForActiveProject();
 			
 			var expectedPackageManager = fakePackageManagerFactory.FakePackageManager;
 			
@@ -194,11 +194,11 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreatePackageManager_PackageSourceAndProjectPassed_ReturnsNewPackageManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			var packageSource = new PackageSource("test");
 			ISharpDevelopPackageManager packageManager = 
-				packageManagementService.CreatePackageManager(packageSource, testProject);
+				solution.CreatePackageManager(packageSource, testProject);
 			
 			var expectedPackageManager = fakePackageManagerFactory.FakePackageManager;
 			
@@ -208,11 +208,11 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreatePackageManager_PackageSourceAndProjectPassed_PackageSourceUsedToCreateRepository()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			var packageSource = new PackageSource("test");
 			ISharpDevelopPackageManager packageManager = 
-				packageManagementService.CreatePackageManager(packageSource, testProject);
+				solution.CreatePackageManager(packageSource, testProject);
 			
 			var actualPackageSource = fakeRegisteredPackageRepositories.PackageSourcePassedToCreateRepository;
 			
@@ -222,11 +222,11 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreatePackageManager_PackageSourceAndProjectPassed_CreatedRepositoryUsedToCreatePackageManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			var packageSource = new PackageSource("test");
 			ISharpDevelopPackageManager packageManager = 
-				packageManagementService.CreatePackageManager(packageSource, testProject);
+				solution.CreatePackageManager(packageSource, testProject);
 			
 			var actualRepository = fakePackageManagerFactory.PackageRepositoryPassedToCreatePackageManager;
 			var expectedRepository = fakeRegisteredPackageRepositories.FakePackageRepository;
@@ -237,11 +237,11 @@ namespace PackageManagement.Tests
 		[Test]
 		public void CreatePackageManager_PackageSourceAndProjectPassed_ProjectUsedToCreatePackageManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			var packageSource = new PackageSource("test");
 			ISharpDevelopPackageManager packageManager = 
-				packageManagementService.CreatePackageManager(packageSource, testProject);
+				solution.CreatePackageManager(packageSource, testProject);
 			
 			var actualProject = fakePackageManagerFactory.ProjectPassedToCreateRepository;
 			

src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs

@@ -15,34 +15,34 @@ namespace PackageManagement.Tests
 	{
 		TestablePackageViewModel viewModel;
 		FakePackage package;
-		FakePackageManagementService packageManagementService;
+		FakePackageManagementSolution solution;
 		FakePackageManagementEvents packageManagementEvents;
-		ExceptionThrowingPackageManagementService exceptionThrowingPackageManagementService;
+		ExceptionThrowingPackageManagementSolution exceptionThrowingSolution;
 		FakeInstallPackageAction fakeInstallPackageTask;
 		FakeUninstallPackageAction fakeUninstallPackageAction;
 		FakeLogger fakeLogger;
 		
 		void CreateViewModel()
 		{
-			packageManagementService = new FakePackageManagementService();
+			solution = new FakePackageManagementSolution();
-			CreateViewModel(packageManagementService);
+			CreateViewModel(solution);
 		}
 		
-		void CreateViewModelWithExceptionThrowingPackageManagementService()
+		void CreateViewModelWithExceptionThrowingSolution()
 		{
-			exceptionThrowingPackageManagementService = new ExceptionThrowingPackageManagementService();
+			exceptionThrowingSolution = new ExceptionThrowingPackageManagementSolution();
-			CreateViewModel(exceptionThrowingPackageManagementService);
+			CreateViewModel(exceptionThrowingSolution);
 		}
 		
-		void CreateViewModel(FakePackageManagementService packageManagementService)
+		void CreateViewModel(FakePackageManagementSolution solution)
 		{
-			viewModel = new TestablePackageViewModel(packageManagementService);
+			viewModel = new TestablePackageViewModel(solution);
 			package = viewModel.FakePackage;
-			this.packageManagementService = packageManagementService;
+			this.solution = solution;
 			packageManagementEvents = viewModel.FakePackageManagementEvents;
 			fakeLogger = viewModel.FakeLogger;
-			fakeInstallPackageTask = packageManagementService.ActionToReturnFromCreateInstallPackageAction;
+			fakeInstallPackageTask = solution.ActionToReturnFromCreateInstallPackageAction;
-			fakeUninstallPackageAction = packageManagementService.ActionToReturnFromCreateUninstallPackageAction;
+			fakeUninstallPackageAction = solution.ActionToReturnFromCreateUninstallPackageAction;
 		}
 
 		[Test]
@@ -176,7 +176,7 @@ namespace PackageManagement.Tests
 		public void IsAdded_ProjectHasPackageAdded_ReturnsTrue()
 		{
 			CreateViewModel();
-			packageManagementService.FakeActiveProjectManager.IsInstalledReturnValue = true;
+			solution.FakeActiveProjectManager.IsInstalledReturnValue = true;
 			
 			Assert.IsTrue(viewModel.IsAdded);
 		}
@@ -185,7 +185,7 @@ namespace PackageManagement.Tests
 		public void IsAdded_ProjectDoesNotHavePackageInstalled_ReturnsFalse()
 		{
 			CreateViewModel();
-			packageManagementService.FakeActiveProjectManager.IsInstalledReturnValue = false;
+			solution.FakeActiveProjectManager.IsInstalledReturnValue = false;
 			
 			Assert.IsFalse(viewModel.IsAdded);
 		}
@@ -364,7 +364,7 @@ namespace PackageManagement.Tests
 			viewModel.AddPackage();
 			
 			ILogger expectedLogger = viewModel.OperationLoggerCreated;
-			ILogger actualLogger = packageManagementService
+			ILogger actualLogger = solution
 				.FakePackageManagerToReturnFromCreatePackageManager
 				.Logger;
 			Assert.AreEqual(expectedLogger, actualLogger);
@@ -454,10 +454,10 @@ namespace PackageManagement.Tests
 		[Test]
 		public void AddPackage_ExceptionWhenInstallingPackage_ExceptionErrorMessageReported()
 		{
-			CreateViewModelWithExceptionThrowingPackageManagementService();
+			CreateViewModelWithExceptionThrowingSolution();
 			viewModel.AddOneFakeInstallPackageOperationForViewModelPackage();
 			Exception ex = new Exception("Test");
-			exceptionThrowingPackageManagementService.ExeptionToThrowWhenCreateInstallPackageTaskCalled = ex;
+			exceptionThrowingSolution.ExeptionToThrowWhenCreateInstallPackageTaskCalled = ex;
 			viewModel.AddPackage();
 			
 			Assert.AreEqual(ex, packageManagementEvents.ExceptionPassedToOnPackageOperationError);
@@ -476,10 +476,10 @@ namespace PackageManagement.Tests
 		[Test]
 		public void AddPackage_ExceptionWhenInstallingPackage_ExceptionLogged()
 		{
-			CreateViewModelWithExceptionThrowingPackageManagementService();
+			CreateViewModelWithExceptionThrowingSolution();
 			viewModel.AddOneFakeInstallPackageOperationForViewModelPackage();
 			Exception ex = new Exception("Exception error message");
-			exceptionThrowingPackageManagementService.ExeptionToThrowWhenCreateInstallPackageTaskCalled = ex;
+			exceptionThrowingSolution.ExeptionToThrowWhenCreateInstallPackageTaskCalled = ex;
 			viewModel.AddPackage();
 			
 			string actualMessage = fakeLogger.SecondFormattedMessageLogged;
@@ -491,9 +491,9 @@ namespace PackageManagement.Tests
 		[Test]
 		public void RemovePackage_ExceptionWhenUninstallingPackage_ExceptionErrorMessageReported()
 		{
-			CreateViewModelWithExceptionThrowingPackageManagementService();
+			CreateViewModelWithExceptionThrowingSolution();
 			Exception ex = new Exception("Test");
-			exceptionThrowingPackageManagementService.ExeptionToThrowWhenCreateUninstallPackageActionCalled = ex;
+			exceptionThrowingSolution.ExeptionToThrowWhenCreateUninstallPackageActionCalled = ex;
 			viewModel.RemovePackage();
 			
 			Assert.AreEqual(ex, packageManagementEvents.ExceptionPassedToOnPackageOperationError);
@@ -511,9 +511,9 @@ namespace PackageManagement.Tests
 		[Test]
 		public void RemovePackage_ExceptionWhenUninstallingPackage_ExceptionLogged()
 		{
-			CreateViewModelWithExceptionThrowingPackageManagementService();
+			CreateViewModelWithExceptionThrowingSolution();
 			Exception ex = new Exception("Exception error message");
-			exceptionThrowingPackageManagementService.ExeptionToThrowWhenCreateUninstallPackageActionCalled = ex;
+			exceptionThrowingSolution.ExeptionToThrowWhenCreateUninstallPackageActionCalled = ex;
 			viewModel.RemovePackage();
 			
 			string actualMessage = fakeLogger.SecondFormattedMessageLogged;
@@ -525,11 +525,11 @@ namespace PackageManagement.Tests
 		[Test]
 		public void AddPackage_ExceptionThrownWhenResolvingPackageOperations_ExceptionReported()
 		{
-			CreateViewModelWithExceptionThrowingPackageManagementService();
+			CreateViewModelWithExceptionThrowingSolution();
 			viewModel.AddOneFakeInstallPackageOperationForViewModelPackage();
 			
 			var exception = new Exception("Test");;
-			exceptionThrowingPackageManagementService.ExceptionToThrowWhenCreatePackageManagerForActiveProjectCalled =
+			exceptionThrowingSolution.ExceptionToThrowWhenCreatePackageManagerForActiveProjectCalled =
 				exception;
 			viewModel.AddPackage();
 			
@@ -544,7 +544,7 @@ namespace PackageManagement.Tests
 			viewModel.AddPackage();
 			
 			var expectedPackage = package;
-			var actualPackage = packageManagementService
+			var actualPackage = solution
 				.FakePackageManagerToReturnFromCreatePackageManager
 				.PackagePassedToGetInstallPackageOperations;
 			
@@ -558,7 +558,7 @@ namespace PackageManagement.Tests
 			viewModel.AddOneFakeInstallPackageOperationForViewModelPackage();
 			viewModel.AddPackage();
 			
-			bool result = packageManagementService
+			bool result = solution
 				.FakePackageManagerToReturnFromCreatePackageManager
 				.IgnoreDependenciesPassedToGetInstallPackageOperations;
 			

src/AddIns/Misc/PackageManagement/Test/Src/ProcessPackageActionTests.cs

@@ -14,16 +14,16 @@ namespace PackageManagement.Tests
 	public class ProcessPackageActionTests
 	{
 		TestableProcessPackageAction action;
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakePackageManager fakePackageManager;
 		FakeLogger fakeLogger;
 		
 		void CreateAction()
 		{
 			action = new TestableProcessPackageAction();
-			fakePackageManagementService = action.FakePackageManagementService;
+			fakeSolution = action.FakeSolution;
 			fakeLogger = new FakeLogger();
-			fakePackageManager = fakePackageManagementService.FakePackageManagerToReturnFromCreatePackageManager;
+			fakePackageManager = fakeSolution.FakePackageManagerToReturnFromCreatePackageManager;
 		}
 		
 		ILogger AddLoggerToAction()

src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleViewModelTests.cs

@@ -94,7 +94,7 @@ namespace PackageManagement.Tests.Scripting
 			viewModel.PropertyChanged += (sender, e) => propertiesChanged.Add(e.PropertyName);
 		}
 		
-		Solution CreatePackageManagementServiceWithEmptySolutionOpen()
+		Solution CreateConsoleHostWithEmptySolutionOpen()
 		{
 			CreateConsoleHost();
 			var solution = new Solution();
@@ -104,7 +104,7 @@ namespace PackageManagement.Tests.Scripting
 		
 		Solution CreateViewModelWithEmptySolutionOpen()
 		{
-			var solution = CreatePackageManagementServiceWithEmptySolutionOpen();
+			var solution = CreateConsoleHostWithEmptySolutionOpen();
 			CreateViewModel(consoleHost);
 			return solution;
 		}
@@ -254,7 +254,7 @@ namespace PackageManagement.Tests.Scripting
 		[Test]
 		public void Constructor_EmptySolutionOpenWhenConsoleCreated_DoesNotThrowException()
 		{
-			CreatePackageManagementServiceWithEmptySolutionOpen();
+			CreateConsoleHostWithEmptySolutionOpen();
 			Assert.DoesNotThrow(() => CreateViewModel(consoleHost));
 		}
 		

src/AddIns/Misc/PackageManagement/Test/Src/UninstallPackageActionTests.cs

@@ -14,17 +14,17 @@ namespace PackageManagement.Tests
 	public class UninstallPackageActionTests
 	{
 		UninstallPackageAction action;
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakePackageManagementEvents fakePackageManagementEvents;
 		FakePackageManager fakePackageManager;
 		UninstallPackageHelper uninstallPackageHelper;
 		
 		void CreateAction()
 		{
-			fakePackageManagementService = new FakePackageManagementService();
+			fakeSolution = new FakePackageManagementSolution();
 			fakePackageManagementEvents = new FakePackageManagementEvents();
-			fakePackageManager = fakePackageManagementService.FakePackageManagerToReturnFromCreatePackageManager;
+			fakePackageManager = fakeSolution.FakePackageManagerToReturnFromCreatePackageManager;
-			action = new UninstallPackageAction(fakePackageManagementService, fakePackageManagementEvents);
+			action = new UninstallPackageAction(fakeSolution, fakePackageManagementEvents);
 			uninstallPackageHelper = new UninstallPackageHelper(action);
 		}
 		
@@ -55,7 +55,7 @@ namespace PackageManagement.Tests
 			
 			uninstallPackageHelper.UninstallTestPackage();
 			
-			var actualRepository = fakePackageManagementService.PackageRepositoryPassedToCreatePackageManager;
+			var actualRepository = fakeSolution.PackageRepositoryPassedToCreatePackageManager;
 	
 			var expectedRepository = uninstallPackageHelper.FakePackageRepository;
 			
@@ -110,7 +110,7 @@ namespace PackageManagement.Tests
 			uninstallPackageHelper.PackageSource = expectedPackageSource;
 			uninstallPackageHelper.UninstallPackageById("PackageId");
 			
-			var actualPackageSource = fakePackageManagementService.PackageSourcePassedToCreatePackageManager;
+			var actualPackageSource = fakeSolution.PackageSourcePassedToCreatePackageManager;
 			
 			Assert.AreEqual(expectedPackageSource, actualPackageSource);
 		}
@@ -124,7 +124,7 @@ namespace PackageManagement.Tests
 			
 			uninstallPackageHelper.UninstallPackageById("PackageId");
 			
-			var actualProject = fakePackageManagementService.ProjectPassedToCreatePackageManager;
+			var actualProject = fakeSolution.ProjectPassedToCreatePackageManager;
 			
 			Assert.AreEqual(expectedProject, actualProject);
 		}

src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackageActionTests.cs

@@ -13,24 +13,24 @@ namespace PackageManagement.Tests
 	public class UpdatePackageActionTests
 	{
 		UpdatePackageAction action;
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakePackageManagementEvents fakePackageManagementEvents;
 		FakePackageManager fakePackageManager;
 		UpdatePackageHelper updatePackageHelper;
 		
-		void CreatePackageManagementService()
+		void CreateSolution()
 		{
-			fakePackageManagementService = new FakePackageManagementService();
+			fakeSolution = new FakePackageManagementSolution();
 			fakePackageManagementEvents = new FakePackageManagementEvents();
-			fakePackageManager = fakePackageManagementService.FakePackageManagerToReturnFromCreatePackageManager;
+			fakePackageManager = fakeSolution.FakePackageManagerToReturnFromCreatePackageManager;
-			action = new UpdatePackageAction(fakePackageManagementService, fakePackageManagementEvents);
+			action = new UpdatePackageAction(fakeSolution, fakePackageManagementEvents);
 			updatePackageHelper = new UpdatePackageHelper(action);
 		}
 		
 		[Test]
 		public void Execute_PackageAndRepositoryPassed_PackageIsUpdated()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.UpdateTestPackage();
 			
 			var expectedPackage = updatePackageHelper.TestPackage;
@@ -42,18 +42,18 @@ namespace PackageManagement.Tests
 		[Test]
 		public void UpdateDependencies_DefaultValue_ReturnsTrue()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			Assert.IsTrue(action.UpdateDependencies);
 		}
 		
 		[Test]
 		public void Execute_PackageAndRepositoryPassed_RepositoryUsedToCreatePackageManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.UpdateTestPackage();
 			
 			var expectedRepository = updatePackageHelper.PackageRepository;
-			var actualRepository = fakePackageManagementService.PackageRepositoryPassedToCreatePackageManager;
+			var actualRepository = fakeSolution.PackageRepositoryPassedToCreatePackageManager;
 			
 			Assert.AreEqual(expectedRepository, actualRepository);
 		}
@@ -61,7 +61,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackageAndRepositoryPassed_PackageOperationsUsedToUpdatePackage()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.UpdateTestPackage();
 			
 			var expectedOperations = updatePackageHelper.PackageOperations;
@@ -73,7 +73,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackageAndRepositoryPassed_DependenciesUpdated()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.UpdateDependencies = true;
 			updatePackageHelper.UpdateTestPackage();
 			
@@ -85,7 +85,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackageAndRepositoryPassed_PackageInstalledEventIsFired()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.UpdateTestPackage();
 			
 			var expectedPackage = updatePackageHelper.TestPackage;
@@ -96,11 +96,11 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackageIdAndSourceAndProjectPassed_PackageSourceUsedToCreatePackageManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.UpdatePackageById("PackageId");
 			
 			var expectedPackageSource = updatePackageHelper.PackageSource;
-			var actualPackageSource = fakePackageManagementService.PackageSourcePassedToCreatePackageManager;
+			var actualPackageSource = fakeSolution.PackageSourcePassedToCreatePackageManager;
 			
 			Assert.AreEqual(expectedPackageSource, actualPackageSource);
 		}
@@ -108,10 +108,10 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackageIdAndSourceAndProjectPassed_ProjectIsUsedToCreatePackageManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.UpdatePackageById("PackageId");
 			
-			var actualProject = fakePackageManagementService.ProjectPassedToCreatePackageManager;
+			var actualProject = fakeSolution.ProjectPassedToCreatePackageManager;
 			var expectedProject = updatePackageHelper.TestableProject;
 			
 			Assert.AreEqual(expectedProject, actualProject);
@@ -120,7 +120,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackagePassedButNoPackageOperations_PackageOperationsRetrievedFromPackageManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.PackageOperations = null;
 			updatePackageHelper.UpdateTestPackage();
 			
@@ -133,7 +133,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackagePassedButNoPackageOperations_PackageOperationsCreatedForPackage()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.PackageOperations = null;
 			updatePackageHelper.UpdateTestPackage();
 			
@@ -146,7 +146,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackageIdAndSourceAndProjectPassedAndUpdateDependenciesIsTrue_DependenciesUpdatedWhenUpdatingPackage()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			updatePackageHelper.UpdateDependencies = true;
 			updatePackageHelper.UpdatePackageById("PackageId");
@@ -159,7 +159,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackageIdAndSourceAndProjectPassedAndUpdateDependenciesIsFalse_DependenciesNotUpdatedWhenGettingPackageOperations()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			updatePackageHelper.UpdateDependencies = false;
 			updatePackageHelper.UpdatePackageById("PackageId");
@@ -172,7 +172,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_UpdatedDepdenciesIsFalseAndNoPackageOperations_DependenciesIgnoredWhenGettingPackageOperations()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			updatePackageHelper.UpdateDependencies = false;
 			updatePackageHelper.UpdatePackageById("PackageId");
@@ -185,7 +185,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_UpdateDependenciesIsTrueAndNoPackageOperations_DependenciesNotIgnoredWhenGettingPackageOperations()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			
 			updatePackageHelper.UpdateDependencies = true;
 			updatePackageHelper.UpdatePackageById("PackageId");
@@ -198,7 +198,7 @@ namespace PackageManagement.Tests
 		[Test]
 		public void Execute_PackageAndPackageOperationsSet_OperationsNotRetrievedFromPackageManager()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
 			updatePackageHelper.UpdateTestPackage();
 			
 			var actualPackage = fakePackageManager.PackagePassedToGetInstallPackageOperations;

src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackageViewModelTests.cs

@@ -12,14 +12,14 @@ namespace PackageManagement.Tests
 	public class UpdatedPackageViewModelTests
 	{
 		TestableUpdatedPackageViewModel viewModel;
-		FakePackageManagementService fakePackageManagementService;
+		FakePackageManagementSolution fakeSolution;
 		FakeUpdatePackageAction updatePackageAction;
 		
 		void CreateViewModel()
 		{
 			viewModel = new TestableUpdatedPackageViewModel();
-			fakePackageManagementService = viewModel.FakePackageManagementService;
+			fakeSolution = viewModel.FakeSolution;
-			updatePackageAction = fakePackageManagementService.ActionToReturnFromCreateUpdatePackageAction;
+			updatePackageAction = fakeSolution.ActionToReturnFromCreateUpdatePackageAction;
 		}
 		
 		[Test]

src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackagesViewModelTests.cs

@@ -13,37 +13,37 @@ namespace PackageManagement.Tests
 	public class UpdatedPackagesViewModelTests
 	{
 		UpdatedPackagesViewModel viewModel;
-		FakePackageManagementService packageManagementService;
+		FakePackageManagementSolution solution;
 		FakeTaskFactory taskFactory;
 		FakeRegisteredPackageRepositories registeredPackageRepositories;
-		ExceptionThrowingPackageManagementService exceptionThrowingPackageManagementService;
+		ExceptionThrowingPackageManagementSolution exceptionThrowingSolution;
 		
 		void CreateViewModel()
 		{
-			CreatePackageManagementService();
+			CreateSolution();
-			CreateViewModel(packageManagementService);
+			CreateViewModel(solution);
 		}
 		
-		void CreatePackageManagementService()
+		void CreateSolution()
 		{
-			packageManagementService = new FakePackageManagementService();
+			solution = new FakePackageManagementSolution();
 		}
 		
-		void CreateViewModel(FakePackageManagementService packageManagementService)
+		void CreateViewModel(FakePackageManagementSolution solution)
 		{
 			taskFactory = new FakeTaskFactory();
 			registeredPackageRepositories = new FakeRegisteredPackageRepositories();
 			var packageViewModelFactory = new FakePackageViewModelFactory();
 			viewModel = new UpdatedPackagesViewModel(
-				packageManagementService,
+				solution,
 				registeredPackageRepositories,
 				packageViewModelFactory,
 				taskFactory);
 		}
 		
-		void CreateExceptionThrowingPackageManagementService()
+		void CreateExceptionThrowingSolution()
 		{
-			exceptionThrowingPackageManagementService = new ExceptionThrowingPackageManagementService();
+			exceptionThrowingSolution = new ExceptionThrowingPackageManagementSolution();
 		}
 		
 		void CompleteReadPackagesTask()
@@ -54,7 +54,7 @@ namespace PackageManagement.Tests
 		FakePackage AddPackageToLocalRepository(string version)
 		{
 			var package = FakePackage.CreatePackageWithVersion(version);
-			packageManagementService.AddPackageToProjectLocalRepository(package);
+			solution.AddPackageToProjectLocalRepository(package);
 			return package;
 		}
 		
@@ -108,7 +108,7 @@ namespace PackageManagement.Tests
 			viewModel.ReadPackages();
 			
 			registeredPackageRepositories.FakeAggregateRepository = null;
-			packageManagementService.FakeActiveProjectManager.LocalRepository = null;
+			solution.FakeActiveProjectManager.LocalRepository = null;
 			CompleteReadPackagesTask();
 			
 			Assert.AreEqual(1, viewModel.PackageViewModels.Count);
@@ -117,10 +117,10 @@ namespace PackageManagement.Tests
 		[Test]
 		public void ReadPackages_ActiveProjectManagerThrowsException_ErrorMessageFromExceptionNotOverriddenByReadPackagesCall()
 		{
-			CreateExceptionThrowingPackageManagementService();
+			CreateExceptionThrowingSolution();
-			exceptionThrowingPackageManagementService.ExeptionToThrowWhenActiveProjectManagerAccessed = 
+			exceptionThrowingSolution.ExeptionToThrowWhenActiveProjectManagerAccessed = 
 				new Exception("Test");
-			CreateViewModel(exceptionThrowingPackageManagementService);
+			CreateViewModel(exceptionThrowingSolution);
 			viewModel.ReadPackages();
 			
 			ApplicationException ex = Assert.Throws<ApplicationException>(() => CompleteReadPackagesTask());