[Project] Rename 'Gac' refs to 'Package' refs

This is a couple of years overdue because the "gac" name is wrong, misleading and
confusing.

47 files changed, 256 insertions, 252 deletions

diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs
index 4b9c3aa997..0324f4fb0f 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/AspMvcProject.cs
@@ -110,7 +110,7 @@ namespace MonoDevelop.AspNet.Mvc
 			//HACK: workaround for MD not local-copying package references
 			foreach (ProjectReference projectReference in References) {
 				if (projectReference.Package != null && projectReference.Package.Name == "system.web.mvc") {
-					if (projectReference.ReferenceType == ReferenceType.Gac)
+					if (projectReference.ReferenceType == ReferenceType.Package)
 						foreach (MonoDevelop.Core.Assemblies.SystemAssembly assem in projectReference.Package.Assemblies)
 							list.Add (assem.Location);
 					break;
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/EmptyProject.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/EmptyProject.xpt.xml
index da46c5ce14..8a34f97c1f 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/EmptyProject.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/EmptyProject.xpt.xml
@@ -25,16 +25,16 @@
 		<Project name = "${ProjectName}" directory = "." type = "AspNetMvc">
 			<Options TargetFrameworkVersion = "3.5" />
 			<References>
-				<Reference type="Gac" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Core" />
-				<Reference type="Gac" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Gac" refto="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Gac" refto="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Gac" refto="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
-				<Reference type="Gac" refto="System.Xml.Linq" />
+				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Core" />
+				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
+				<Reference type="Package" refto="System.Xml.Linq" />
 			</References>
 			<Files>
 				<Directory name="Content" />
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/Project.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/Project.xpt.xml
index a51024ad31..865fc08429 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/Project.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.Mvc/Templates/Project.xpt.xml
@@ -25,16 +25,16 @@
 		<Project name = "${ProjectName}" directory = "." type = "AspNetMvc">
 			<Options TargetFrameworkVersion = "3.5" />
 			<References>
-				<Reference type="Gac" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Core" />
-				<Reference type="Gac" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Gac" refto="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-				<Reference type="Gac" refto="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
-				<Reference type="Gac" refto="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
-				<Reference type="Gac" refto="System.Xml.Linq" />
+				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Core" />
+				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+				<Reference type="Package" refto="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false"  />
+				<Reference type="Package" refto="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" SpecificVersion="false" />
+				<Reference type="Package" refto="System.Xml.Linq" />
 			</References>
 			<Files>
 				<Directory name="Content" />
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs
index fe763f3491..155cd08c05 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/DocumentReferenceManager.cs
@@ -283,7 +283,7 @@ namespace MonoDevelop.AspNet.Parser
 			MonoDevelop.Projects.ProjectReference pr;
 			if (string.IsNullOrEmpty (assemblyLocation)) {
 				pr = new MonoDevelop.Projects.ProjectReference
-					(MonoDevelop.Projects.ReferenceType.Gac, assemblyName);
+					(MonoDevelop.Projects.ReferenceType.Package, assemblyName);
 			} else {
 				pr =  new MonoDevelop.Projects.ProjectReference
 					(MonoDevelop.Projects.ReferenceType.Assembly, assemblyLocation);
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs
index e82e080004..030a92705a 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs
@@ -340,7 +340,7 @@ namespace MonoDevelop.AspNet
 			var dllName = parsed.Name + ".dll";
 			
 			foreach (var reference in References) {
-				if (reference.ReferenceType == ReferenceType.Gac || reference.ReferenceType == ReferenceType.Assembly) {
+				if (reference.ReferenceType == ReferenceType.Package || reference.ReferenceType == ReferenceType.Assembly) {
 					foreach (string refPath in reference.GetReferencedFileNames (null))
 						if (Path.GetFileName (refPath) == dllName)
 							return ProjectDomService.GetAssemblyDom (TargetRuntime, refPath);
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
index 8e7db112d0..59e6bb0f3e 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication-Empty.xpt.xml
@@ -25,10 +25,10 @@
 		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
 			<Options />
 			<References>
-				<Reference type="Gac" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 			</References>
 			<Files>
 			</Files>
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
index 7173b05387..00668fc09a 100644
--- a/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
+++ b/main/src/addins/AspNet/MonoDevelop.AspNet/Templates/WebApplication.xpt.xml
@@ -26,10 +26,10 @@
 		<Project name = "${ProjectName}" directory = "." type = "AspNetApp">
 			<Options />
 			<References>
-				<Reference type="Gac" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<Reference type="Gac" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<Reference type="Package" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 			</References>
 			<Files>
 				<FileTemplateReference TemplateID="GlobalAsax-CodeBehind" name="Global.asax" />
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
index 47788a3e42..f66683c649 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpBindingCompilerManager.cs
@@ -95,7 +95,7 @@ namespace MonoDevelop.CSharp
 					continue;
 				foreach (string fileName in lib.GetReferencedFileNames (configSelector)) {
 					switch (lib.ReferenceType) {
-					case ReferenceType.Gac:
+					case ReferenceType.Package:
 						SystemPackage pkg = lib.Package;
 						if (pkg == null) {
 							string msg = string.Format (GettextCatalog.GetString ("{0} could not be found or is invalid."), lib.Reference);
diff --git a/main/src/addins/CSharpBinding/templates/ConsoleProject.xpt.xml b/main/src/addins/CSharpBinding/templates/ConsoleProject.xpt.xml
index 98cfd81c11..35f835e3ec 100644
--- a/main/src/addins/CSharpBinding/templates/ConsoleProject.xpt.xml
+++ b/main/src/addins/CSharpBinding/templates/ConsoleProject.xpt.xml
@@ -26,7 +26,7 @@
 		<Project name = "${ProjectName}" directory = ".">
 			<Options ExternalConsole="True"/>
 			<References>
-				<Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			</References>
 			<Files>
 				<File name="Main.cs" AddStandardHeader="True"><![CDATA[using System;
diff --git a/main/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml b/main/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
index 573b30b74f..b09572fccb 100644
--- a/main/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
+++ b/main/src/addins/CSharpBinding/templates/GtkSharp2Project.xpt.xml
@@ -27,13 +27,13 @@
 			<Options Target = "WinExe"/>
 			
 			<References>
-				<Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" SpecificVersion="false" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" SpecificVersion="false" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
 			</References>
 		
 			<Files>
diff --git a/main/src/addins/CSharpBinding/templates/Library.xpt.xml b/main/src/addins/CSharpBinding/templates/Library.xpt.xml
index e14bc94db7..502208b66f 100644
--- a/main/src/addins/CSharpBinding/templates/Library.xpt.xml
+++ b/main/src/addins/CSharpBinding/templates/Library.xpt.xml
@@ -26,7 +26,7 @@
 		<Project name = "${ProjectName}" directory = ".">
 			<Options Target = "Library" PauseConsoleOutput = "False" />
 			<References>
-				<Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			</References>
 			<Files>
 				<FileTemplateReference TemplateID="EmptyClass" name="MyClass.cs" />
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
index 01b9aeef39..1f96b15947 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
@@ -253,7 +253,7 @@ namespace MonoDevelop.Autotools
 		public bool SyncReferences {
 			get { return syncReferences; }
 			set {
-				GacRefVar.Sync = value;
+				PackageRefVar.Sync = value;
 				AsmRefVar.Sync = value;
 				ProjectRefVar.Sync =value;
 				syncReferences = value;
@@ -278,15 +278,15 @@ namespace MonoDevelop.Autotools
 			get { return ConfiguredPackages != null; }
 		}
 
-		MakefileVar gacRefVar;
+		MakefileVar packageRefVar;
 		[ItemProperty]
-		public MakefileVar GacRefVar {
+		public MakefileVar PackageRefVar {
 			get {
-				if (gacRefVar == null)
-					gacRefVar = new MakefileVar ();
-				return gacRefVar;
+				if (packageRefVar == null)
+					packageRefVar = new MakefileVar ();
+				return packageRefVar;
 			}
-			set { gacRefVar = value; }
+			set { packageRefVar = value; }
 		}
 
 		MakefileVar asmRefVar;
@@ -491,7 +491,7 @@ namespace MonoDevelop.Autotools
 			data.DeployFilesVar = new MakefileVar (this.DeployFilesVar);
 			data.ResourcesVar = new MakefileVar (this.ResourcesVar);
 			data.OthersVar = new MakefileVar (this.OthersVar);
-			data.GacRefVar = new MakefileVar (this.GacRefVar);
+			data.PackageRefVar = new MakefileVar (this.PackageRefVar);
 			data.AsmRefVar = new MakefileVar (this.AsmRefVar);
 			data.ProjectRefVar = new MakefileVar (this.ProjectRefVar);
 
@@ -626,7 +626,7 @@ namespace MonoDevelop.Autotools
 					encodeValues [OthersVar.Name] = false;
 					encodeValues [ResourcesVar.Name] = false;
 
-					encodeValues [GacRefVar.Name] = false;
+					encodeValues [PackageRefVar.Name] = false;
 					encodeValues [AsmRefVar.Name] = false;
 					encodeValues [ProjectRefVar.Name] = false;
 				}
@@ -734,22 +734,22 @@ namespace MonoDevelop.Autotools
 				//Do these for DotNetProject only
 				DotNetProject dotnetProject = ownerProject as DotNetProject;
 				if (dotnetProject != null) {
-					GacRefVar.Extra.Clear ();
+					PackageRefVar.Extra.Clear ();
 					AsmRefVar.Extra.Clear ();
 					ProjectRefVar.Extra.Clear ();
 
-					existingGacRefs = new Dictionary<string, ProjectReference> ();
+					existingPackageRefs = new Dictionary<string, ProjectReference> ();
 					requiredPackageVersions = new Dictionary<string,string> ();
-					newGacRefs = new Dictionary<string, ProjectReference> ();
+					newPackageRefs = new Dictionary<string, ProjectReference> ();
 
 					List<ProjectReference> toRemove = new List<ProjectReference> ();
 					foreach (ProjectReference pref in dotnetProject.References) {
-						if (pref.ReferenceType == ReferenceType.Gac) {
+						if (pref.ReferenceType == ReferenceType.Package) {
 							string [] files = pref.GetReferencedFileNames (ConfigurationSelector.Default);
 							if (files == null)
 								continue;
 
-							if (pref.ReferenceType == ReferenceType.Gac) {
+							if (pref.ReferenceType == ReferenceType.Package) {
 								// Store the package version required by this reference. We'll use
 								// the same version when trying to match references coming from the makefile
 								SystemAssembly asm = assemblyContext.GetAssemblyFromFullName (pref.StoredReference, pref.Package != null ? pref.Package.Name : null, dotnetProject.TargetFramework);
@@ -758,10 +758,10 @@ namespace MonoDevelop.Autotools
 							}
 							// this should help normalize paths like /foo//bar/../
 							string fullpath = Path.GetFullPath (files [0]);
-							if (existingGacRefs.ContainsKey (fullpath))
+							if (existingPackageRefs.ContainsKey (fullpath))
 								toRemove.Add (pref);
 							else
-								existingGacRefs [fullpath] = pref;
+								existingPackageRefs [fullpath] = pref;
 						}
 					}
 
@@ -769,12 +769,12 @@ namespace MonoDevelop.Autotools
 					foreach (ProjectReference pref in toRemove)
 						dotnetProject.References.Remove (pref);
 
-					ReadReferences (GacRefVar, ReferenceType.Gac, "Gac References", dotnetProject);
+					ReadReferences (PackageRefVar, ReferenceType.Package, "Package References", dotnetProject);
 
 					// !SaveReferences indicates that previous ref reading failed
-					if (SaveReferences && String.Compare (AsmRefVar.Name, GacRefVar.Name) != 0)
+					if (SaveReferences && String.Compare (AsmRefVar.Name, PackageRefVar.Name) != 0)
 						ReadReferences (AsmRefVar, ReferenceType.Assembly, "Asm References", dotnetProject);
-					if (SaveReferences && (String.Compare (ProjectRefVar.Name, GacRefVar.Name) != 0) && 
+					if (SaveReferences && (String.Compare (ProjectRefVar.Name, PackageRefVar.Name) != 0) && 
 						(String.Compare (ProjectRefVar.Name, AsmRefVar.Name) != 0))
 						ReadReferences (ProjectRefVar, ReferenceType.Project, "Project References", dotnetProject);
 					
@@ -785,12 +785,12 @@ namespace MonoDevelop.Autotools
 					
 					//only remove unmatched existing refs if everything resolved without errors
 					if (SaveReferences) {
-						foreach (ProjectReference pr in existingGacRefs.Values)
+						foreach (ProjectReference pr in existingPackageRefs.Values)
 							dotnetProject.References.Remove (pr);
 					}
 
-					existingGacRefs.Clear ();
-					newGacRefs.Clear ();
+					existingPackageRefs.Clear ();
+					newPackageRefs.Clear ();
 				}
 			} catch (Exception e) {
 				string msg = GettextCatalog.GetString (
@@ -926,8 +926,8 @@ namespace MonoDevelop.Autotools
 			}
 		}
 
-		Dictionary<string, ProjectReference> existingGacRefs = null;
-		Dictionary<string, ProjectReference> newGacRefs = null;
+		Dictionary<string, ProjectReference> existingPackageRefs = null;
+		Dictionary<string, ProjectReference> newPackageRefs = null;
 		Dictionary<string, string> requiredPackageVersions = null;
 
 		void ReadReferences (MakefileVar refVar, ReferenceType refType, string id, DotNetProject project)
@@ -1066,13 +1066,13 @@ namespace MonoDevelop.Autotools
 
 				string fullpath = Path.GetFullPath (Path.Combine (BaseDirectory, refname));
 				
-				// if refname is part of a package then add as gac
+				// if refname is part of a package then add as package
 				// but don't do it if the refname exactly matches a file name in the project dir
 				if (refname.IndexOf (Path.DirectorySeparatorChar) < 0 && !File.Exists (fullpath) &&
-					ParseReferenceAsGac (refname, project) != null)
+					ParseReferenceAsPackage (refname, project) != null)
 					continue;
 				
-				if (TryGetExistingGacRef (fullpath) != null)
+				if (TryGetExistingPackageRef (fullpath) != null)
 					continue;
 
 				if (refname.IndexOf (Path.DirectorySeparatorChar) < 0) {
@@ -1084,12 +1084,12 @@ namespace MonoDevelop.Autotools
 					} catch (BadImageFormatException) {
 					}
 
-					// Valid assembly, From a package, add as Gac
+					// Valid assembly, From a package, add as Package
 					SystemPackage pkg = assemblyContext.GetPackageFromPath (fullpath);
 					if (fullname != null && pkg != null) {
 						SystemAssembly sa = assemblyContext.GetAssemblyFromFullName (fullname, pkg.Name, project.TargetFramework);
 						if (sa != null) {
-							AddNewGacReference (project, sa);
+							AddNewPackageReference (project, sa);
 							continue;
 						}
 					}
@@ -1118,17 +1118,17 @@ namespace MonoDevelop.Autotools
 			}
 
 			foreach (SystemAssembly sa in pkg.Assemblies) {
-				if (TryGetExistingGacRef (sa.Location) != null)
+				if (TryGetExistingPackageRef (sa.Location) != null)
 					continue;
 
 				//Get fullname of the assembly
-				AddNewGacReference (project, sa);
+				AddNewPackageReference (project, sa);
 			}
 
 			return true;
 		}
 
-		ProjectReference ParseReferenceAsGac (string rname, DotNetProject project)
+		ProjectReference ParseReferenceAsPackage (string rname, DotNetProject project)
 		{
 			string aname = rname;
 			if (rname.EndsWith (".dll", StringComparison.InvariantCultureIgnoreCase))
@@ -1143,34 +1143,34 @@ namespace MonoDevelop.Autotools
 			if (asm == null)
 				return null;
 
-			ProjectReference pref = TryGetExistingGacRef (asm.Location);
+			ProjectReference pref = TryGetExistingPackageRef (asm.Location);
 			if (pref != null)
 				return pref;
 
-			return AddNewGacReference (project, asm);
+			return AddNewPackageReference (project, asm);
 		}
 
-		ProjectReference TryGetExistingGacRef (string fullpath)
+		ProjectReference TryGetExistingPackageRef (string fullpath)
 		{
-			if (existingGacRefs.ContainsKey (fullpath)) {
-				ProjectReference ret = existingGacRefs [fullpath];
-				existingGacRefs.Remove (fullpath);
-				newGacRefs [fullpath] = ret;
+			if (existingPackageRefs.ContainsKey (fullpath)) {
+				ProjectReference ret = existingPackageRefs [fullpath];
+				existingPackageRefs.Remove (fullpath);
+				newPackageRefs [fullpath] = ret;
 
 				return ret;
 			}
 
-			if (newGacRefs.ContainsKey (fullpath))
-				return newGacRefs [fullpath];
+			if (newPackageRefs.ContainsKey (fullpath))
+				return newPackageRefs [fullpath];
 
 			return null;
 		}
 
-		ProjectReference AddNewGacReference (DotNetProject project, SystemAssembly sa)
+		ProjectReference AddNewPackageReference (DotNetProject project, SystemAssembly sa)
 		{
 			ProjectReference pref = new ProjectReference (sa);
 			project.References.Add (pref);
-			newGacRefs [sa.Location] = pref;
+			newPackageRefs [sa.Location] = pref;
 
 			return pref;
 		}
@@ -1341,11 +1341,11 @@ namespace MonoDevelop.Autotools
 			WriteFiles (ResourcesVar, BuildAction.EmbeddedResource, makeRelative, "Resources");
 
 			if (SyncReferences && SaveReferences) {
-				Makefile.ClearVariableValue (GacRefVar.Name);
+				Makefile.ClearVariableValue (PackageRefVar.Name);
 				Makefile.ClearVariableValue (AsmRefVar.Name);
 				Makefile.ClearVariableValue (ProjectRefVar.Name);
 
-				WriteReferences (GacRefVar, ReferenceType.Gac, makeRelative, "Gac");
+				WriteReferences (PackageRefVar, ReferenceType.Package, makeRelative, "Package");
 				WriteReferences (AsmRefVar, ReferenceType.Assembly, makeRelative, "Assembly");
 				WriteReferences (ProjectRefVar, ReferenceType.Project, makeRelative, "Project");
 			
@@ -1353,17 +1353,17 @@ namespace MonoDevelop.Autotools
 				// but sort only once per distinct var
 				// (Required as we are comparing the full makefile as a string,
 				//  to detect changes!)
-				List<string> list = Makefile.GetListVariable (GacRefVar.Name);
+				List<string> list = Makefile.GetListVariable (PackageRefVar.Name);
 				if (list != null)
 					list.Sort (System.StringComparer.InvariantCulture);
 
-				if (String.Compare (AsmRefVar.Name, GacRefVar.Name) != 0) {
+				if (String.Compare (AsmRefVar.Name, PackageRefVar.Name) != 0) {
 					list = Makefile.GetListVariable (AsmRefVar.Name);
 					if (list != null)
 						list.Sort (System.StringComparer.InvariantCulture);
 				}
 
-				if ((String.Compare (ProjectRefVar.Name, GacRefVar.Name) != 0) && 
+				if ((String.Compare (ProjectRefVar.Name, PackageRefVar.Name) != 0) && 
 					(String.Compare (ProjectRefVar.Name, AsmRefVar.Name) != 0)) {
 					list = Makefile.GetListVariable (ProjectRefVar.Name);
 					if (list != null)
@@ -1439,7 +1439,7 @@ namespace MonoDevelop.Autotools
 		bool WriteReferences (MakefileVar refVar, ReferenceType refType, bool makeRelative, string id)
 		{
 			//Reference vars can be shared too, so use existing list
-			//Eg. REF for both Gac and Asm ref
+			//Eg. REF for both Package and Asm ref
 			List<string> references = Makefile.GetListVariable (refVar.Name);
 			if (references == null) {
 				//Var not found, skip
@@ -1462,9 +1462,9 @@ namespace MonoDevelop.Autotools
 
 				string refstr = String.Empty;
 				switch (refType) {
-				case ReferenceType.Gac:
-					//Assemblies coming from packages are always added as Gac
-					refstr = GacRefToString (pr, hasAcSubstPackages, refVar);
+				case ReferenceType.Package:
+					//Assemblies coming from packages are always added as Package
+					refstr = PackageRefToString (pr, hasAcSubstPackages, refVar);
 					if (refstr == null)
 						continue;
 					break;
@@ -1499,9 +1499,9 @@ namespace MonoDevelop.Autotools
 			return true;
 		}
 
-		string GacRefToString (ProjectReference pr, Dictionary<string, bool> hasAcSubstPackages, MakefileVar refVar)
+		string PackageRefToString (ProjectReference pr, Dictionary<string, bool> hasAcSubstPackages, MakefileVar refVar)
 		{
-			//Gac ref can be a full name OR a path!
+			//Package ref can be a full name OR a path!
 			//FIXME: Use GetReferencedFileName and GetPackageFromPath ?
 			string fullname = pr.Reference;
 			SystemPackage pkg = pr.Package;
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
index 13543386d6..749d767ab2 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileOptionPanelWidget.cs
@@ -82,7 +82,7 @@ namespace MonoDevelop.Autotools
 			//References
 			this.cbKeepRefSync.Active = data.SyncReferences;
 
-			this.entryGacRefPattern.Text = data.GacRefVar.Prefix;
+			this.entryPackageRefPattern.Text = data.PackageRefVar.Prefix;
 			this.entryAsmRefPattern.Text = data.AsmRefVar.Prefix;
 			this.entryProjectRefPattern.Text = data.ProjectRefVar.Prefix;
 			
@@ -139,7 +139,7 @@ namespace MonoDevelop.Autotools
 			this.Build();
 			combos = new ComboBox [7] {
 				comboFilesVar, comboDeployFilesVar, comboResourcesVar, comboOthersVar, 
-				comboGacRefVar, comboAsmRefVar, comboProjectRefVar}; 
+				comboPackageRefVar, comboAsmRefVar, comboProjectRefVar}; 
 				//comboAssemblyName, comboOutputDir};
 		}
 		
@@ -174,9 +174,9 @@ namespace MonoDevelop.Autotools
 
 			// References
 			data.SyncReferences = this.cbKeepRefSync.Active;
-			data.GacRefVar.Sync = this.cbKeepRefSync.Active;
-			data.GacRefVar.Name = GetActiveVar (comboGacRefVar);
-			data.GacRefVar.Prefix = this.entryGacRefPattern.Text.Trim ();
+			data.PackageRefVar.Sync = this.cbKeepRefSync.Active;
+			data.PackageRefVar.Name = GetActiveVar (comboPackageRefVar);
+			data.PackageRefVar.Prefix = this.entryPackageRefPattern.Text.Trim ();
 
 			data.AsmRefVar.Sync = this.cbKeepRefSync.Active;
 			data.AsmRefVar.Name = GetActiveVar (comboAsmRefVar);
@@ -229,7 +229,7 @@ namespace MonoDevelop.Autotools
 				}
 
 				if (tmpData.SyncReferences &&
-					(String.IsNullOrEmpty (tmpData.GacRefVar.Name) ||
+					(String.IsNullOrEmpty (tmpData.PackageRefVar.Name) ||
 					String.IsNullOrEmpty (tmpData.AsmRefVar.Name) ||
 					String.IsNullOrEmpty (tmpData.ProjectRefVar.Name))) {
 
@@ -340,7 +340,7 @@ namespace MonoDevelop.Autotools
 			SetActiveVar (comboResourcesVar, data.ResourcesVar.Name);
 			SetActiveVar (comboOthersVar, data.OthersVar.Name);
 
-			SetActiveVar (comboGacRefVar, data.GacRefVar.Name);
+			SetActiveVar (comboPackageRefVar, data.PackageRefVar.Name);
 			SetActiveVar (comboAsmRefVar, data.AsmRefVar.Name);
 			SetActiveVar (comboProjectRefVar, data.ProjectRefVar.Name);
 
@@ -449,7 +449,7 @@ namespace MonoDevelop.Autotools
 
 			string files_var = GetActiveVar (comboFilesVar);
 			string res_var = GetActiveVar (comboResourcesVar);
-			string ref_var = GetActiveVar (comboGacRefVar);
+			string ref_var = GetActiveVar (comboPackageRefVar);
 
 			string prefix;
 			foreach (string var in vars) {
@@ -538,7 +538,7 @@ namespace MonoDevelop.Autotools
 
 			cbKeepRefSync.Active = false;
 
-			entryGacRefPattern.Text = String.Empty;
+			entryPackageRefPattern.Text = String.Empty;
 			entryAsmRefPattern.Text = String.Empty;
 			entryProjectRefPattern.Text = String.Empty;
 
@@ -580,11 +580,11 @@ namespace MonoDevelop.Autotools
 			cbKeepRefSync.Active = true;
 			HandleKeepRefSyncClicked (cbKeepRefSync);
 
-			SetActiveVar (comboGacRefVar, ref_var);
+			SetActiveVar (comboPackageRefVar, ref_var);
 			SetActiveVar (comboAsmRefVar, ref_var);
 			SetActiveVar (comboProjectRefVar, ref_var);
 
-			entryGacRefPattern.Text = prefix;
+			entryPackageRefPattern.Text = prefix;
 			entryAsmRefPattern.Text = prefix;
 			entryProjectRefPattern.Text = prefix;
 		}
@@ -667,9 +667,9 @@ namespace MonoDevelop.Autotools
 			this.lblCol5.Sensitive = state;
 			this.lblCol6.Sensitive = state;
 			
-			this.lblGacRef.Sensitive = state;
-			this.comboGacRefVar.Sensitive = state;
-			this.entryGacRefPattern.Sensitive = state;
+			this.lblPackageRef.Sensitive = state;
+			this.comboPackageRefVar.Sensitive = state;
+			this.entryPackageRefPattern.Sensitive = state;
 
 			this.lblAsmRef.Sensitive = state;
 			this.comboAsmRefVar.Sensitive = state;
@@ -891,15 +891,15 @@ namespace MonoDevelop.Autotools
 			}
 		}
 
-		protected virtual void OnComboGacRefVarChanged (object sender, System.EventArgs e)
+		protected virtual void OnComboPackageRefVarChanged (object sender, System.EventArgs e)
 		{
-			HandleComboGacRefVarChanged ((ComboBox) sender);
+			HandleComboPackageRefVarChanged ((ComboBox) sender);
 		}
 
-		void HandleComboGacRefVarChanged (ComboBox cb)
+		void HandleComboPackageRefVarChanged (ComboBox cb)
 		{
 			string active = GetActiveVar (cb);
-			entryGacRefPattern.Text = GuessRefPrefix (data.Makefile.GetListVariable (active));
+			entryPackageRefPattern.Text = GuessRefPrefix (data.Makefile.GetListVariable (active));
 		}
 
 		protected virtual void OnComboAsmRefVarChanged (object sender, System.EventArgs e)
diff --git a/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs b/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
index 89b7a41806..6f4d39496f 100644
--- a/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
+++ b/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
@@ -497,7 +497,7 @@ endif", s.SwitchName.Replace ('-', '_').ToUpperInvariant (), s.Define));
 			// grab pkg-config references
 			foreach (ProjectReference reference in project.References) 
 			{
-				if (reference.ReferenceType == ReferenceType.Gac) 
+				if (reference.ReferenceType == ReferenceType.Package) 
 				{
 					// Get pkg-config keys
 					SystemPackage pkg = reference.Package;
diff --git a/main/src/addins/MonoDevelop.Autotools/gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs b/main/src/addins/MonoDevelop.Autotools/gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs
index 48f6c01efa..ff40f01a6d 100644
--- a/main/src/addins/MonoDevelop.Autotools/gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/gtk-gui/MonoDevelop.Autotools.MakefileOptionPanelWidget.cs
@@ -58,10 +58,10 @@ namespace MonoDevelop.Autotools
 		private global::Gtk.Table table4;
 		private global::Gtk.CheckButton cbAutotoolsProject;
 		private global::Gtk.ComboBox comboAsmRefVar;
-		private global::Gtk.ComboBox comboGacRefVar;
+		private global::Gtk.ComboBox comboPackageRefVar;
 		private global::Gtk.ComboBox comboProjectRefVar;
 		private global::Gtk.Entry entryAsmRefPattern;
-		private global::Gtk.Entry entryGacRefPattern;
+		private global::Gtk.Entry entryPackageRefPattern;
 		private global::Gtk.Entry entryProjectRefPattern;
 		private global::MonoDevelop.Components.FolderEntry fileEntryConfigureInPath;
 		private global::Gtk.HSeparator hseparator1;
@@ -70,7 +70,7 @@ namespace MonoDevelop.Autotools
 		private global::Gtk.Label lblCol5;
 		private global::Gtk.Label lblCol6;
 		private global::Gtk.Label lblConfigureInPath;
-		private global::Gtk.Label lblGacRef;
+		private global::Gtk.Label lblPackageRef;
 		private global::Gtk.Label lblProjectRef;
 		private global::Gtk.Label label3;
 		private global::Gtk.VBox vbox3;
@@ -666,11 +666,11 @@ namespace MonoDevelop.Autotools
 			w49.RightAttach = ((uint)(2));
 			w49.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table4.Gtk.Table+TableChild
-			this.comboGacRefVar = global::Gtk.ComboBox.NewText ();
-			this.comboGacRefVar.WidthRequest = 200;
-			this.comboGacRefVar.Name = "comboGacRefVar";
-			this.table4.Add (this.comboGacRefVar);
-			global::Gtk.Table.TableChild w50 = ((global::Gtk.Table.TableChild)(this.table4 [this.comboGacRefVar]));
+			this.comboPackageRefVar = global::Gtk.ComboBox.NewText ();
+			this.comboPackageRefVar.WidthRequest = 200;
+			this.comboPackageRefVar.Name = "comboPackageRefVar";
+			this.table4.Add (this.comboPackageRefVar);
+			global::Gtk.Table.TableChild w50 = ((global::Gtk.Table.TableChild)(this.table4 [this.comboPackageRefVar]));
 			w50.TopAttach = ((uint)(2));
 			w50.BottomAttach = ((uint)(3));
 			w50.LeftAttach = ((uint)(1));
@@ -702,13 +702,13 @@ namespace MonoDevelop.Autotools
 			w52.XOptions = ((global::Gtk.AttachOptions)(4));
 			w52.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table4.Gtk.Table+TableChild
-			this.entryGacRefPattern = new global::Gtk.Entry ();
-			this.entryGacRefPattern.CanFocus = true;
-			this.entryGacRefPattern.Name = "entryGacRefPattern";
-			this.entryGacRefPattern.IsEditable = true;
-			this.entryGacRefPattern.InvisibleChar = '●';
-			this.table4.Add (this.entryGacRefPattern);
-			global::Gtk.Table.TableChild w53 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryGacRefPattern]));
+			this.entryPackageRefPattern = new global::Gtk.Entry ();
+			this.entryPackageRefPattern.CanFocus = true;
+			this.entryPackageRefPattern.Name = "entryPackageRefPattern";
+			this.entryPackageRefPattern.IsEditable = true;
+			this.entryPackageRefPattern.InvisibleChar = '●';
+			this.table4.Add (this.entryPackageRefPattern);
+			global::Gtk.Table.TableChild w53 = ((global::Gtk.Table.TableChild)(this.table4 [this.entryPackageRefPattern]));
 			w53.TopAttach = ((uint)(2));
 			w53.BottomAttach = ((uint)(3));
 			w53.LeftAttach = ((uint)(2));
@@ -812,12 +812,12 @@ namespace MonoDevelop.Autotools
 			w61.XOptions = ((global::Gtk.AttachOptions)(4));
 			w61.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table4.Gtk.Table+TableChild
-			this.lblGacRef = new global::Gtk.Label ();
-			this.lblGacRef.Name = "lblGacRef";
-			this.lblGacRef.Xalign = 0F;
-			this.lblGacRef.LabelProp = global::Mono.Unix.Catalog.GetString ("Package References");
-			this.table4.Add (this.lblGacRef);
-			global::Gtk.Table.TableChild w62 = ((global::Gtk.Table.TableChild)(this.table4 [this.lblGacRef]));
+			this.lblPackageRef = new global::Gtk.Label ();
+			this.lblPackageRef.Name = "lblPackageRef";
+			this.lblPackageRef.Xalign = 0F;
+			this.lblPackageRef.LabelProp = global::Mono.Unix.Catalog.GetString ("Package References");
+			this.table4.Add (this.lblPackageRef);
+			global::Gtk.Table.TableChild w62 = ((global::Gtk.Table.TableChild)(this.table4 [this.lblPackageRef]));
 			w62.TopAttach = ((uint)(2));
 			w62.BottomAttach = ((uint)(3));
 			w62.XOptions = ((global::Gtk.AttachOptions)(4));
@@ -983,7 +983,7 @@ namespace MonoDevelop.Autotools
 			this.cbKeepDeployFilesSync.Clicked += new global::System.EventHandler (this.OnCbKeepDeployFilesSyncClicked);
 			this.cbKeepRefSync.Clicked += new global::System.EventHandler (this.OnCbKeepRefSyncClicked);
 			this.comboProjectRefVar.Changed += new global::System.EventHandler (this.OnComboProjectRefVarChanged);
-			this.comboGacRefVar.Changed += new global::System.EventHandler (this.OnComboGacRefVarChanged);
+			this.comboPackageRefVar.Changed += new global::System.EventHandler (this.OnComboPackageRefVarChanged);
 			this.comboAsmRefVar.Changed += new global::System.EventHandler (this.OnComboAsmRefVarChanged);
 			this.cbAutotoolsProject.Clicked += new global::System.EventHandler (this.OnCbAutotoolsProjectClicked);
 			this.comboMessageType.Changed += new global::System.EventHandler (this.OnComboMessageTypeChanged);
diff --git a/main/src/addins/MonoDevelop.Autotools/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Autotools/gtk-gui/gui.stetic
index 1b47509a67..58f863550b 100644
--- a/main/src/addins/MonoDevelop.Autotools/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Autotools/gtk-gui/gui.stetic
@@ -7,6 +7,7 @@
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
+    <widget-library name="../../../../build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.Autotools.MakefileOptionPanelWidget" design-size="589 368">
@@ -1005,12 +1006,12 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.ComboBox" id="comboGacRefVar">
+                  <widget class="Gtk.ComboBox" id="comboPackageRefVar">
                     <property name="MemberName" />
                     <property name="WidthRequest">200</property>
                     <property name="IsTextCombo">True</property>
                     <property name="Items" />
-                    <signal name="Changed" handler="OnComboGacRefVarChanged" />
+                    <signal name="Changed" handler="OnComboPackageRefVarChanged" />
                   </widget>
                   <packing>
                     <property name="TopAttach">2</property>
@@ -1074,7 +1075,7 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.Entry" id="entryGacRefPattern">
+                  <widget class="Gtk.Entry" id="entryPackageRefPattern">
                     <property name="MemberName" />
                     <property name="CanFocus">True</property>
                     <property name="IsEditable">True</property>
@@ -1265,7 +1266,7 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="Gtk.Label" id="lblGacRef">
+                  <widget class="Gtk.Label" id="lblPackageRef">
                     <property name="MemberName" />
                     <property name="Xalign">0</property>
                     <property name="LabelProp" translatable="yes">Package References</property>
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs
index 87cda360e6..6d53f3ebbf 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Projects/ProjectReferenceDescriptor.cs
@@ -50,7 +50,7 @@ namespace MonoDevelop.DesignerSupport.Projects
 				switch (pref.ReferenceType) {
 				case ReferenceType.Assembly:
 					return GettextCatalog.GetString ("Assembly");
-				case ReferenceType.Gac:
+				case ReferenceType.Package:
 					return GettextCatalog.GetString ("Package");
 				case ReferenceType.Project:
 					return GettextCatalog.GetString ("Project");
@@ -137,7 +137,7 @@ namespace MonoDevelop.DesignerSupport.Projects
 		[LocalizedDescription ("Package that provides this reference.")]
 		public string Package {
 			get {
-				if (pref.ReferenceType == ReferenceType.Gac && pref.Package != null)
+				if (pref.ReferenceType == ReferenceType.Package && pref.Package != null)
 					return pref.Package.GetDisplayName ();
 				else
 					return string.Empty;
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs
index 34fac7c7fe..2cde0bbec1 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/TypeReference.cs
@@ -156,7 +156,7 @@ namespace MonoDevelop.DesignerSupport.Toolbox
 		{
 			if (string.IsNullOrEmpty (assemblyLocation)) {
 				return new MonoDevelop.Projects.ProjectReference (
-				    MonoDevelop.Projects.ReferenceType.Gac,
+				    MonoDevelop.Projects.ReferenceType.Package,
 				    assemblyName);
 			} else {
 				return new MonoDevelop.Projects.ProjectReference (
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
index 1ab7d53da4..cb71a676e8 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
@@ -398,7 +398,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 					path = p.GetOutputFileName (IdeApp.Workspace.ActiveConfiguration);
 			} else if (pref.ReferenceType == ReferenceType.Assembly) {
 				path = pref.Reference;
-			} else if (pref.ReferenceType == ReferenceType.Gac) {
+			} else if (pref.ReferenceType == ReferenceType.Package) {
 				path = pref.Reference;
 			}
 			if (path != null && GuiBuilderService.SteticApp.IsWidgetLibrary (path))
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
index e65bcc50b4..de2deabd41 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs
@@ -507,7 +507,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 				if (asm == null)
 					return;
 				if (gproject.Project.AssemblyContext.GetPackagesFromFullName (asm).Length > 0) {
-					pref = new ProjectReference (ReferenceType.Gac, asm);
+					pref = new ProjectReference (ReferenceType.Package, asm);
 				} else {
 					asm = gproject.Project.AssemblyContext.GetAssemblyLocation (asm, gproject.Project.TargetFramework);
 					pref = new ProjectReference (ReferenceType.Assembly, asm);
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs
index 9e62498e33..1cb98ff733 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs
@@ -50,7 +50,7 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 			string rname;
 			
 			if (sp != null) {
-				rt = ReferenceType.Gac;
+				rt = ReferenceType.Package;
 				rname = Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyFullName (filename, null);
 			} else {
 				rt = ReferenceType.Assembly;
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
index 285b8961fb..77cf385b9c 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/GtkDesignInfo.cs
@@ -210,7 +210,7 @@ namespace MonoDevelop.GtkCore
 		
 		static bool IsGtkReference (ProjectReference pref)
 		{
-			if (pref.ReferenceType != ReferenceType.Gac)
+			if (pref.ReferenceType != ReferenceType.Package)
 				return false;
 
 			int idx = pref.StoredReference.IndexOf (",");
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
index 1723055bee..ccce79213c 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
@@ -137,7 +137,7 @@ namespace MonoDevelop.GtkCore {
 			bool gdk = false, gtk = false, posix = false;
 			
 			foreach (ProjectReference r in new List<ProjectReference> (project.References)) {
-				if (r.ReferenceType != ReferenceType.Gac)
+				if (r.ReferenceType != ReferenceType.Package)
 					continue;
 				string name = GetReferenceName (r);
 				if (name == "gdk-sharp")
@@ -156,16 +156,16 @@ namespace MonoDevelop.GtkCore {
 				if (version != assm_version) {
 					project.References.Remove (r);
 					if (name == "gnome-sharp" && assm_version == "Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f") {
-						project.References.Add (new ProjectReference (ReferenceType.Gac, name + ", Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"));
+						project.References.Add (new ProjectReference (ReferenceType.Package, name + ", Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f"));
 					} else {
-						project.References.Add (new ProjectReference (ReferenceType.Gac, name + ", " + assm_version));
+						project.References.Add (new ProjectReference (ReferenceType.Package, name + ", " + assm_version));
 					}
 					changed = true;
 				}
 			}
 
 			if (!gtk) {
-				project.References.Add (new ProjectReference (ReferenceType.Gac, "gtk-sharp" + ", " + assm_version));
+				project.References.Add (new ProjectReference (ReferenceType.Package, "gtk-sharp" + ", " + assm_version));
 				changed = true;
 			}
 
@@ -174,7 +174,7 @@ namespace MonoDevelop.GtkCore {
 
 			GtkDesignInfo info = GtkDesignInfo.FromProject (project);
 			if (!gdk) {
-				project.References.Add (new ProjectReference (ReferenceType.Gac, "gdk-sharp" + ", " + assm_version));
+				project.References.Add (new ProjectReference (ReferenceType.Package, "gdk-sharp" + ", " + assm_version));
 				changed = true;
 			}
 				
@@ -182,7 +182,7 @@ namespace MonoDevelop.GtkCore {
 				// Add a reference to Mono.Posix. Use the version for the selected project's runtime version.
 				string aname = project.AssemblyContext.FindInstalledAssembly ("Mono.Posix, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756", null, project.TargetFramework);
 				aname = project.AssemblyContext.GetAssemblyNameForVersion (aname, project.TargetFramework);
-				project.References.Add (new ProjectReference (ReferenceType.Gac, aname));
+				project.References.Add (new ProjectReference (ReferenceType.Package, aname));
 				changed = true;
 			}
 			updating = false;
@@ -224,7 +224,7 @@ namespace MonoDevelop.GtkCore {
 			if (MessageService.Confirm (GettextCatalog.GetString ("The Gtk# User Interface designer will be disabled by removing the gtk-sharp reference."), new AlertButton (GettextCatalog.GetString ("Disable Designer"))))
 				GtkDesignInfo.DisableProject (dnp);
 			else
-				dnp.References.Add (new ProjectReference (ReferenceType.Gac, args.ProjectReference.StoredReference));
+				dnp.References.Add (new ProjectReference (ReferenceType.Package, args.ProjectReference.StoredReference));
 		}
 
 		static string GetReferenceName (ProjectReference pref)
@@ -239,7 +239,7 @@ namespace MonoDevelop.GtkCore {
 
 		static bool IsGtkReference (ProjectReference pref)
 		{
-			if (pref.ReferenceType != ReferenceType.Gac)
+			if (pref.ReferenceType != ReferenceType.Package)
 				return false;
 
 			return GetReferenceName (pref) == "gtk-sharp";
diff --git a/main/src/addins/MonoDevelop.Moonlight/Templates/Moonlight-ApplicationProject.xpt.xml b/main/src/addins/MonoDevelop.Moonlight/Templates/Moonlight-ApplicationProject.xpt.xml
index c6137ca034..ac35abe90c 100644
--- a/main/src/addins/MonoDevelop.Moonlight/Templates/Moonlight-ApplicationProject.xpt.xml
+++ b/main/src/addins/MonoDevelop.Moonlight/Templates/Moonlight-ApplicationProject.xpt.xml
@@ -27,13 +27,13 @@
 				<SilverlightApplication>True</SilverlightApplication>
 			</Options>
 			<References>
-				<Reference type="Gac" refto="System.Windows" />

-				<Reference type="Gac" refto="mscorlib" />

-				<Reference type="Gac" refto="System" />

-				<Reference type="Gac" refto="System.Core" />

-				<Reference type="Gac" refto="System.Xml" />

-				<Reference type="Gac" refto="System.Net" />

-				<Reference type="Gac" refto="System.Windows.Browser" />
+				<Reference type="Package" refto="System.Windows" />

+				<Reference type="Package" refto="mscorlib" />

+				<Reference type="Package" refto="System" />

+				<Reference type="Package" refto="System.Core" />

+				<Reference type="Package" refto="System.Xml" />

+				<Reference type="Package" refto="System.Net" />

+				<Reference type="Package" refto="System.Windows.Browser" />
 			</References>
 			<Files>
 				<File name="App.xaml" DefaultExtension=".xaml" BuildAction="ApplicationDefinition">
diff --git a/main/src/addins/MonoDevelop.Moonlight/Templates/Moonlight-LibraryProject.xpt.xml b/main/src/addins/MonoDevelop.Moonlight/Templates/Moonlight-LibraryProject.xpt.xml
index 75497b7297..c2c27e3dc7 100644
--- a/main/src/addins/MonoDevelop.Moonlight/Templates/Moonlight-LibraryProject.xpt.xml
+++ b/main/src/addins/MonoDevelop.Moonlight/Templates/Moonlight-LibraryProject.xpt.xml
@@ -27,13 +27,13 @@
 				<SilverlightApplication>False</SilverlightApplication>
 			</Options>
 			<References>
-				<Reference type="Gac" refto="System.Windows" />

-				<Reference type="Gac" refto="mscorlib" />

-				<Reference type="Gac" refto="System" />

-				<Reference type="Gac" refto="System.Core" />

-				<Reference type="Gac" refto="System.Xml" />

-				<Reference type="Gac" refto="System.Net" />

-				<Reference type="Gac" refto="System.Windows.Browser" />
+				<Reference type="Package" refto="System.Windows" />

+				<Reference type="Package" refto="mscorlib" />

+				<Reference type="Package" refto="System" />

+				<Reference type="Package" refto="System.Core" />

+				<Reference type="Package" refto="System.Xml" />

+				<Reference type="Package" refto="System.Net" />

+				<Reference type="Package" refto="System.Windows.Browser" />
 			</References>
 			<Files>
 			</Files>
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
index 2ab1af7a07..785914ed06 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/WebServiceDiscoveryResult.cs
@@ -105,15 +105,15 @@ namespace MonoDevelop.WebReferences
 			item = new WebReferenceItem (engine, project, referenceName, basePath, mapFile);
 			
 			// Add references to the project if they do not exist
-			ProjectReference gacRef;
+			ProjectReference packageRef;
 			
 			foreach (string refName in GetAssemblyReferences ()) {
 				string targetName = project.TargetRuntime.AssemblyContext.GetAssemblyNameForVersion (refName, null, project.TargetFramework);
 				//FIXME: warn when we could not find a matching target assembly
 				if (targetName != null) {
-					gacRef = new ProjectReference (ReferenceType.Gac, targetName);
-					if (!project.References.Contains (gacRef))
-						project.References.Add (gacRef);
+					packageRef = new ProjectReference (ReferenceType.Package, targetName);
+					if (!project.References.Contains (packageRef))
+						project.References.Add (packageRef);
 				}
 			}
 			WebReferencesService.NotifyWebReferencesChanged (project);
diff --git a/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs b/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
index 5ddaa52773..cf5037ee5c 100644
--- a/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
+++ b/main/src/addins/NUnit/Services/NUnitProjectTestSuite.cs
@@ -109,7 +109,7 @@ namespace MonoDevelop.NUnit
 				DotNetProject project = base.OwnerSolutionItem as DotNetProject;
 				if (project != null) {
 					foreach (ProjectReference pr in project.References) {
-						if (pr.ReferenceType != ReferenceType.Gac && !pr.LocalCopy) {
+						if (pr.ReferenceType != ReferenceType.Package && !pr.LocalCopy) {
 							foreach (string file in pr.GetReferencedFileNames (IdeApp.Workspace.ActiveConfiguration))
 								yield return file;
 						}
diff --git a/main/src/addins/NUnit/templates/NUnitProject.xpt.xml b/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
index 86cf538292..00fdd07aea 100644
--- a/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
+++ b/main/src/addins/NUnit/templates/NUnitProject.xpt.xml
@@ -24,9 +24,9 @@
 			<Options Target = "Library" />
 			
 			<References>
-				<Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" refto="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
-				<Reference type="Gac" refto="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+				<Reference type="Package" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+				<Reference type="Package" refto="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
 			</References>
 		
 			<Files>
diff --git a/main/src/addins/VBNetBinding/templates/VBConsoleApplicationProject.xpt.xml b/main/src/addins/VBNetBinding/templates/VBConsoleApplicationProject.xpt.xml
index a669ebf3ee..43b7b12256 100644
--- a/main/src/addins/VBNetBinding/templates/VBConsoleApplicationProject.xpt.xml
+++ b/main/src/addins/VBNetBinding/templates/VBConsoleApplicationProject.xpt.xml
@@ -26,7 +26,7 @@
 		<Project name = "${ProjectName}" directory = ".">
 			<Options ExternalConsole="True"/>
 			<References>
-				<Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			</References>
 			<Files>
 				<File name = "Application.vb" AddStandardHeader="True">
diff --git a/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml b/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
index af31171f31..61ed9d68af 100644
--- a/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
+++ b/main/src/addins/VBNetBinding/templates/VBGtkSharp2Project.xpt.xml
@@ -27,13 +27,13 @@
 			<Options Target="WinExe"/>
 			
 			<References>
-				<Reference type="Gac" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-				<Reference type="Gac" SpecificVersion="false" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-				<Reference type="Gac" SpecificVersion="false" refto="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<Reference type="Package" SpecificVersion="false" refto="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+				<Reference type="Package" SpecificVersion="false" refto="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
 			</References>
 		
 			<Files>
diff --git a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs b/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs
index 3ab92d7afc..2d8d41c259 100644
--- a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs
+++ b/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs
@@ -356,7 +356,7 @@ namespace MonoDevelop.Prj2Make
 							monitor.ReportWarning (GettextCatalog.GetString ("Assembly reference could not be imported: ") + rf.AssemblyName);
 							continue;
 						}
-						rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Gac, oref);
+						rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Package, oref);
 						rfOut.LocalCopy = true;
 						references.Add (rfOut);
 					}
@@ -382,7 +382,7 @@ namespace MonoDevelop.Prj2Make
 							}
 							
 							if (rfOut == null) {
-								rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Gac, Path.GetFileName (rf.HintPath));
+								rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Package, Path.GetFileName (rf.HintPath));
 								rfOut.LocalCopy = true;
 							}
 							references.Add (rfOut);
@@ -409,7 +409,7 @@ namespace MonoDevelop.Prj2Make
 
 			// Test to see if file exist in GAC location
 			if (System.IO.File.Exists (strRefFileName)) {
-				ProjectReference rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Gac, Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyFullName (strRefFileName, fx));
+				ProjectReference rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Package, Runtime.SystemAssemblyService.DefaultAssemblyContext.GetAssemblyFullName (strRefFileName, fx));
 				rfOut.LocalCopy = true;
 				return rfOut;
 			}
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs
index f16db10ed6..d5464056c9 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MD1/MD1CustomDataItem.cs
@@ -85,7 +85,7 @@ namespace MonoDevelop.Projects.Formats.MD1
 				if (pref.ReferenceType == ReferenceType.Assembly) {
 					string basePath = Path.GetDirectoryName (handler.SerializationContext.BaseFile);
 					refto = FileService.AbsoluteToRelativePath (basePath, refto);
-				} else if (pref.ReferenceType == ReferenceType.Gac && pref.LoadedReference != null)
+				} else if (pref.ReferenceType == ReferenceType.Package && pref.LoadedReference != null)
 					refto = pref.LoadedReference;
 	
 				data.Add (new DataValue ("refto", refto));
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
index 0c16ab3b8d..803501a0c3 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
@@ -550,7 +550,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 							if (MSBuildProjectService.IsAbsoluteMSBuildPath (hintPath))
 								pref.ExtendedProperties ["_OriginalMSBuildReferenceIsAbsolute"] = true;
 						} else {
-							pref = new ProjectReference (ReferenceType.Gac, buildItem.Include);
+							pref = new ProjectReference (ReferenceType.Package, buildItem.Include);
 							pref.ExtendedProperties ["_OriginalMSBuildReferenceHintPath"] = hintPath;
 						}
 						pref.LocalCopy = !buildItem.GetMetadataIsFalse ("Private");
@@ -563,7 +563,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 							asm = "System.Xml";
 						else if (asm == "system")
 							asm = "System";
-						pref = new ProjectReference (ReferenceType.Gac, asm);
+						pref = new ProjectReference (ReferenceType.Package, asm);
 						pref.LocalCopy = false;
 					}
 					pref.Condition = buildItem.Condition;
@@ -1120,7 +1120,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 				else
 					buildItem.UnsetMetadata ("Private");
 			}
-			else if (pref.ReferenceType == ReferenceType.Gac) {
+			else if (pref.ReferenceType == ReferenceType.Package) {
 				string include = pref.StoredReference;
 				SystemPackage pkg = pref.Package;
 				if (pkg != null && pkg.IsFrameworkPackage) {
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs
index 7cf1676935..7f494dff50 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/CompiledAssemblyProject.cs
@@ -125,7 +125,7 @@ namespace MonoDevelop.Projects
 				else if (File.Exists (asm + ".exe"))
 					References.Add (new ProjectReference (ReferenceType.Assembly, asm + ".exe"));
 				else
-					References.Add (new ProjectReference (ReferenceType.Gac, aref.FullName));
+					References.Add (new ProjectReference (ReferenceType.Package, aref.FullName));
 			}*/
 		}
 		
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
index d0665cb316..c3d9bd7f6d 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetProject.cs
@@ -983,7 +983,7 @@ namespace MonoDevelop.Projects
 		void UpdateSystemReferences ()
 		{
 			foreach (ProjectReference pref in References) {
-				if (pref.ReferenceType == ReferenceType.Gac) {
+				if (pref.ReferenceType == ReferenceType.Package) {
 					string newRef = AssemblyContext.GetAssemblyNameForVersion (pref.Reference, pref.Package != null ? pref.Package.Name : null, this.TargetFramework);
 					if (newRef == null) {
 						pref.ResetReference ();
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs
index 786ff52581..843ef9c765 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs
@@ -43,8 +43,10 @@ namespace MonoDevelop.Projects
 	public enum ReferenceType {
 		Assembly,
 		Project,
-		Gac,
-		Custom
+		Package,
+		Custom,
+		[Obsolete]
+		Gac = Package
 	}
 	
 	/// <summary>
@@ -95,7 +97,7 @@ namespace MonoDevelop.Projects
 		internal void SetOwnerProject (DotNetProject project)
 		{
 			ownerProject = project;
-			UpdateGacReference ();
+			UpdatePackageReference ();
 		}
 		
 		public ProjectReference (ReferenceType referenceType, string reference)
@@ -104,7 +106,7 @@ namespace MonoDevelop.Projects
 				specificVersion = false;
 			this.referenceType = referenceType;
 			this.reference     = reference;
-			UpdateGacReference ();
+			UpdatePackageReference ();
 		}
 		
 		public ProjectReference (Project referencedProject)
@@ -116,14 +118,14 @@ namespace MonoDevelop.Projects
 		
 		public ProjectReference (SystemAssembly asm)
 		{
-			referenceType = ReferenceType.Gac;
+			referenceType = ReferenceType.Package;
 			reference = asm.FullName;
 			localCopy = false;
 			if (asm.Package.IsFrameworkPackage)
 				specificVersion = false;
 			if (!asm.Package.IsGacPackage)
 				package = asm.Package.Name;
-			UpdateGacReference ();
+			UpdatePackageReference ();
 		}
 		
 		protected void InitCustomReference (string reference)
@@ -155,7 +157,7 @@ namespace MonoDevelop.Projects
 			}
 			internal set {
 				reference = value;
-				UpdateGacReference ();
+				UpdatePackageReference ();
 			}
 		}
 		
@@ -205,7 +207,7 @@ namespace MonoDevelop.Projects
 			get {
 				if (ReferenceType == ReferenceType.Project || ReferenceType == ReferenceType.Custom)
 					return false;
-				if (ReferenceType == ReferenceType.Gac && Package != null && Package.IsFrameworkPackage)
+				if (ReferenceType == ReferenceType.Package && Package != null && Package.IsFrameworkPackage)
 					return false;
 				return true;
 			}
@@ -220,7 +222,7 @@ namespace MonoDevelop.Projects
 			get {
 				if (customError != null)
 					return customError;
-				if (ReferenceType == ReferenceType.Gac) {
+				if (ReferenceType == ReferenceType.Package) {
 					if (!IsExactVersion && SpecificVersion)
 						return GettextCatalog.GetString ("Specified version not found: expected {0}, found {1}", GetVersionNum (StoredReference), GetVersionNum (Reference));
 					if (notFound) {
@@ -253,7 +255,7 @@ namespace MonoDevelop.Projects
 		
 		public bool IsExactVersion {
 			get {
-				if (ReferenceType == ReferenceType.Gac) {
+				if (ReferenceType == ReferenceType.Package) {
 					string r1 = MonoDevelop.Core.Assemblies.AssemblyContext.NormalizeAsmName (StoredReference);
 					string r2 = MonoDevelop.Core.Assemblies.AssemblyContext.NormalizeAsmName (Reference);
 					return r1 == r2;
@@ -287,7 +289,7 @@ namespace MonoDevelop.Projects
 				case ReferenceType.Assembly:
 					return reference;
 				
-				case ReferenceType.Gac:
+				case ReferenceType.Package:
 					string file = AssemblyContext.GetAssemblyLocation (Reference, package, ownerProject != null? ownerProject.TargetFramework : null);
 					return file == null ? reference : file;
 				case ReferenceType.Project:
@@ -307,7 +309,7 @@ namespace MonoDevelop.Projects
 		public virtual string[] GetReferencedFileNames (ConfigurationSelector configuration)
 		{
 			string s = GetReferencedFileName (configuration);
-	/*		if (referenceType == ReferenceType.Gac) {
+	/*		if (referenceType == ReferenceType.Package) {
 				List<string> result = new List<string> ();
 				result.Add (s);
 				AddRequiredPackages (result, Package);
@@ -337,9 +339,9 @@ namespace MonoDevelop.Projects
 			}
 		}*/
 		
-		void UpdateGacReference ()
+		void UpdatePackageReference ()
 		{
-			if (referenceType == ReferenceType.Gac && ownerProject != null) {
+			if (referenceType == ReferenceType.Package && ownerProject != null) {
 				notFound = false;
 				string cref = AssemblyContext.FindInstalledAssembly (reference, package, ownerProject.TargetFramework);
 				if (cref == null)
@@ -388,7 +390,7 @@ namespace MonoDevelop.Projects
 		
 		public SystemPackage Package {
 			get {
-				if (referenceType == ReferenceType.Gac) {
+				if (referenceType == ReferenceType.Package) {
 					if (cachedPackage != null)
 						return cachedPackage;
 					
@@ -424,9 +426,9 @@ namespace MonoDevelop.Projects
 			if (loadedReference != null) {
 				reference = loadedReference;
 				loadedReference = null;
-				UpdateGacReference ();
+				UpdatePackageReference ();
 			} else
-				UpdateGacReference ();
+				UpdatePackageReference ();
 		}
 		
 		public object Clone()
diff --git a/main/src/core/MonoDevelop.Ide/Makefile.am b/main/src/core/MonoDevelop.Ide/Makefile.am
index 877e144c51..ff6b173cdc 100644
--- a/main/src/core/MonoDevelop.Ide/Makefile.am
+++ b/main/src/core/MonoDevelop.Ide/Makefile.am
@@ -626,7 +626,7 @@ FILES =  \
 	MonoDevelop.Ide.Projects/ExportProjectDialog.cs \
 	MonoDevelop.Ide.Projects/ExportProjectPolicyDialog.cs \
 	MonoDevelop.Ide.Projects/FeatureSelectorDialog.cs \
-	MonoDevelop.Ide.Projects/GacReferencePanel.cs \
+	MonoDevelop.Ide.Projects/PackageReferencePanel.cs \
 	MonoDevelop.Ide.Projects/ImportProjectPolicyDialog.cs \
 	MonoDevelop.Ide.Projects/IncludeNewFilesDialog.cs \
 	MonoDevelop.Ide.Projects/NewConfigurationDialog.cs \
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs
index e3cebf2af9..62879fee16 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ClassPad/ReferenceNodeBuilder.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ClassPad
 				case ReferenceType.Assembly:
 					label = Path.GetFileName(pref.Reference);
 					break;
-				case ReferenceType.Gac:
+				case ReferenceType.Package:
 					label = pref.Reference.Split(',')[0];
 					break;
 				default:
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
index e1f7a341bf..20b577d5dc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectReferenceNodeBuilder.cs
@@ -68,7 +68,7 @@ namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
 					label = Path.GetFileName(pref.Reference);
 					icon = Context.GetIcon ("md-reference-folder");
 					break;
-				case ReferenceType.Gac:
+				case ReferenceType.Package:
 					label = pref.Reference.Split(',')[0];
 					icon = Context.GetIcon ("md-reference-package");
 					break;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs
index 6800063574..ac6d233c8f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/GacReferencePanel.cs
@@ -1,4 +1,4 @@
-// GacReferencePanel.cs
+// PackageReferencePanel.cs
 //
 // Author:
 //     Todd Berman <tberman@sevenl.net>
@@ -40,7 +40,7 @@ using MonoDevelop.Core.Text;
 
 namespace MonoDevelop.Ide.Projects
 {
-    internal class GacReferencePanel : VBox, IReferencePanel 
+    internal class PackageReferencePanel : VBox, IReferencePanel 
     {
         ListStore store = null;
         private TreeView treeView = null;
@@ -63,7 +63,7 @@ namespace MonoDevelop.Ide.Projects
 		const int ColMatchRank = 7;
 		const int ColType = 8;
         
-        public GacReferencePanel (SelectReferenceDialog selectDialog, bool showAll)
+        public PackageReferencePanel (SelectReferenceDialog selectDialog, bool showAll)
         {
             this.selectDialog = selectDialog;
 			this.showAll = showAll;
@@ -138,7 +138,7 @@ namespace MonoDevelop.Ide.Projects
                 if (systemAssembly.Package.IsFrameworkPackage && systemAssembly.Name == "mscorlib")
                     continue;
 				
-				bool selected = IsSelected (ReferenceType.Gac, systemAssembly.FullName, systemAssembly.Package.Name);
+				bool selected = IsSelected (ReferenceType.Package, systemAssembly.FullName, systemAssembly.Package.Name);
 				int matchRank = 0;
 				string name, version;
 				
@@ -165,7 +165,7 @@ namespace MonoDevelop.Ide.Projects
 					pkg,
 					MonoDevelop.Ide.Gui.Stock.Package,
 					matchRank,
-					ReferenceType.Gac);
+					ReferenceType.Package);
 			}
 			
 			if (showAll) {
@@ -257,7 +257,7 @@ namespace MonoDevelop.Ide.Projects
 
         public void SignalRefChange (ProjectReference refInfo, bool newState)
         {
-			if (!showAll && refInfo.ReferenceType != ReferenceType.Gac)
+			if (!showAll && refInfo.ReferenceType != ReferenceType.Package)
 				return;
 			
             TreeIter iter;
@@ -267,7 +267,7 @@ namespace MonoDevelop.Ide.Projects
                 do {
 					if (refInfo.ReferenceType == (ReferenceType) store.GetValue(iter, ColType)) {
 						switch (refInfo.ReferenceType) {
-						case ReferenceType.Gac:
+						case ReferenceType.Package:
 							SystemAssembly systemAssembly = store.GetValue(iter, ColAssembly) as SystemAssembly;
 							if ((refInfo.Reference == systemAssembly.FullName) && (refInfo.Package == systemAssembly.Package) )
 								found = true;
@@ -328,7 +328,7 @@ namespace MonoDevelop.Ide.Projects
 			string fullName = (string)store.GetValue (iter, ColFullName);
             if ((bool)store.GetValue (iter, ColSelected) == false) {
                 store.SetValue (iter, ColSelected, true);
-				if (rt == ReferenceType.Gac)
+				if (rt == ReferenceType.Package)
 					selectDialog.AddReference (new ProjectReference ((SystemAssembly)store.GetValue (iter, ColAssembly)));
 				else
 					selectDialog.AddReference (new ProjectReference (rt, fullName));
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectReferencePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectReferencePanel.cs
index 1c14bd0057..07b7e05e9c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectReferencePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/ProjectReferencePanel.cs
@@ -191,7 +191,7 @@ namespace MonoDevelop.Ide.Projects {
 					if (!stringMatcher.CalcMatchRank (projectEntry.Name, out matchRank))
 						continue;
 					int[] match = stringMatcher.GetMatch (projectEntry.Name);
-					txt = GacReferencePanel.GetMatchMarkup (treeView, projectEntry.Name, match, 0);
+					txt = PackageReferencePanel.GetMatchMarkup (treeView, projectEntry.Name, match, 0);
 				} else {
 					txt = GLib.Markup.EscapeText (projectEntry.Name);
 				}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
index 8e4a89c09e..cff9db41b8 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects/SelectReferenceDialog.cs
@@ -52,8 +52,8 @@ namespace MonoDevelop.Ide.Projects
 	{
 		ListStore refTreeStore;
 		
-		GacReferencePanel gacRefPanel;
-		GacReferencePanel allRefPanel;
+		PackageReferencePanel packageRefPanel;
+		PackageReferencePanel allRefPanel;
 		ProjectReferencePanel projectRefPanel;
 		AssemblyReferencePanel assemblyRefPanel;
 		DotNetProject configureProject;
@@ -115,8 +115,8 @@ namespace MonoDevelop.Ide.Projects
 					return AddAssemplyReference (refInfo);
 				case ReferenceType.Project:
 					return AddProjectReference (refInfo);
-				case ReferenceType.Gac:
-					return AddGacReference (refInfo);
+				case ReferenceType.Package:
+					return AddPackageReference (refInfo);
 				default:
 					return TreeIter.Zero;
 			}
@@ -142,7 +142,7 @@ namespace MonoDevelop.Ide.Projects
 			return refTreeStore.AppendValues (txt, GetTypeText (refInfo), p.BaseDirectory.ToString (), refInfo, ImageService.GetPixbuf ("md-project", IconSize.Dnd));
 		}
 
-		TreeIter AddGacReference (ProjectReference refInfo)
+		TreeIter AddPackageReference (ProjectReference refInfo)
 		{
 			string txt = GLib.Markup.EscapeText (System.IO.Path.GetFileNameWithoutExtension (refInfo.Reference));
 			int i = refInfo.Reference.IndexOf (',');
@@ -176,11 +176,11 @@ namespace MonoDevelop.Ide.Projects
 //			ReferencesTreeView.AppendColumn (GettextCatalog.GetString ("Location"), new CellRendererText (), "text", LocationColumn);
 			
 			projectRefPanel = new ProjectReferencePanel (this);
-			gacRefPanel = new GacReferencePanel (this, false);
-			allRefPanel = new GacReferencePanel (this, true);
+			packageRefPanel = new PackageReferencePanel (this, false);
+			allRefPanel = new PackageReferencePanel (this, true);
 			assemblyRefPanel = new AssemblyReferencePanel (this);
 			panels.Add (allRefPanel);
-			panels.Add (gacRefPanel);
+			panels.Add (packageRefPanel);
 			panels.Add (projectRefPanel);
 			panels.Add (assemblyRefPanel);
 			
@@ -198,7 +198,7 @@ namespace MonoDevelop.Ide.Projects
 			tab.PackStart (new Label (GettextCatalog.GetString ("_Packages")), true, true, 0);
 			tab.BorderWidth = 3;
 			tab.ShowAll ();
-			mainBook.AppendPage (gacRefPanel, tab);
+			mainBook.AppendPage (packageRefPanel, tab);
 			
 			tab = new HBox (false, 3);
 //			tab.PackStart (new Image (ImageService.GetPixbuf (MonoDevelop.Ide.Gui.Stock.Project, IconSize.Menu)), false, false, 0);
@@ -321,7 +321,7 @@ namespace MonoDevelop.Ide.Projects
 		string GetTypeText (ProjectReference pref)
 		{
 			switch (pref.ReferenceType) {
-				case ReferenceType.Gac: return GettextCatalog.GetString ("Package");
+				case ReferenceType.Package: return GettextCatalog.GetString ("Package");
 				case ReferenceType.Assembly: return GettextCatalog.GetString ("Assembly");
 				case ReferenceType.Project: return GettextCatalog.GetString ("Project");
 				default: return "";
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
index 3f15bd1508..930af4f71c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs
@@ -87,7 +87,8 @@ namespace MonoDevelop.Ide.Templates
 			if (xmlElement["References"] != null) {
 				foreach (XmlNode xmlNode in xmlElement["References"].ChildNodes) {
 					XmlElement elem = (XmlElement)xmlNode;
-					ProjectReference projectReference = new ProjectReference ((ReferenceType)Enum.Parse (typeof(ReferenceType), elem.GetAttribute ("type")), elem.GetAttribute ("refto"));
+					var refType = elem.GetAttribute ("type");
+					ProjectReference projectReference = new ProjectReference ((ReferenceType)Enum.Parse (typeof(ReferenceType), refType), elem.GetAttribute ("refto"));
 					string specificVersion = elem.GetAttribute ("SpecificVersion");
 					if (!string.IsNullOrEmpty (specificVersion))
 						projectReference.SpecificVersion = bool.Parse (specificVersion);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
index 85f3757947..44e1e5212e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
@@ -133,7 +133,7 @@ namespace MonoDevelop.Ide.Templates
 						string res = netProject.AssemblyContext.GetAssemblyFullName (aref, netProject.TargetFramework);
 						res = netProject.AssemblyContext.GetAssemblyNameForVersion (res, netProject.TargetFramework);
 						if (!ContainsReference (netProject, res))
-							netProject.References.Add (new ProjectReference (ReferenceType.Gac, aref));
+							netProject.References.Add (new ProjectReference (ReferenceType.Package, aref));
 					}
 				}
 				
@@ -151,8 +151,8 @@ namespace MonoDevelop.Ide.Templates
 			else
 				aname = aref.Substring (0, i);
 			foreach (ProjectReference pr in project.References) {
-				if (pr.ReferenceType == ReferenceType.Gac && (pr.Reference == aname || pr.Reference.StartsWith (aname + ",")) || 
-					pr.ReferenceType != ReferenceType.Gac && pr.Reference.Contains (aname))
+				if (pr.ReferenceType == ReferenceType.Package && (pr.Reference == aname || pr.Reference.StartsWith (aname + ",")) || 
+					pr.ReferenceType != ReferenceType.Package && pr.Reference.Contains (aname))
 					return true;
 			}
 			return false;
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/MakefileTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/MakefileTests.cs
index c6a94f4f9b..b94c8dcd73 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/MakefileTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/MakefileTests.cs
@@ -70,7 +70,7 @@ namespace MonoDevelop.Projects
 			// Test saving
 			
 			p.References.Remove (xmlRef);
-			p.References.Add (new ProjectReference (ReferenceType.Gac, "System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"));
+			p.References.Add (new ProjectReference (ReferenceType.Package, "System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"));
 			
 			p.Files.Remove (f);
 			p.Files.Add (new ProjectFile (Path.Combine (p.BaseDirectory, "Class1.cs"), BuildAction.Compile));
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
index 483096ae69..b872d791cb 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
@@ -120,7 +120,7 @@ namespace MonoDevelop.Projects
 			project.Files.Remove ("test2.cs");
 			Assert.AreEqual (2, countFileRemovedFromProject);
 			
-			ProjectReference pr1 = new ProjectReference (ReferenceType.Gac, "SomeTest");
+			ProjectReference pr1 = new ProjectReference (ReferenceType.Package, "SomeTest");
 			project.References.Add (pr1);
 			Assert.AreEqual (1, countReferenceAddedToProject);
 			
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs b/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs
index ca057e5d58..73e4de164b 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/TestProjectsChecks.cs
@@ -63,7 +63,7 @@ namespace MonoDevelop.Projects
 			
 			Assert.AreEqual (1, project.References.Count);
 			ProjectReference pr = project.References [0];
-			Assert.AreEqual (ReferenceType.Gac, pr.ReferenceType);
+			Assert.AreEqual (ReferenceType.Package, pr.ReferenceType);
 			Assert.AreEqual ("System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", pr.Reference);
 			
 			// Configurations
@@ -109,15 +109,15 @@ namespace MonoDevelop.Projects
 			Assert.AreEqual (3, project.References.Count);
 			
 			ProjectReference pr = project.References [0];
-			Assert.AreEqual (ReferenceType.Gac, pr.ReferenceType);
+			Assert.AreEqual (ReferenceType.Package, pr.ReferenceType);
 			Assert.AreEqual ("System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", pr.Reference);
 			
 			pr = project.References [1];
-			Assert.AreEqual (ReferenceType.Gac, pr.ReferenceType);
+			Assert.AreEqual (ReferenceType.Package, pr.ReferenceType);
 			Assert.AreEqual ("System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", pr.Reference);
 			
 			pr = project.References [2];
-			Assert.AreEqual (ReferenceType.Gac, pr.ReferenceType);
+			Assert.AreEqual (ReferenceType.Package, pr.ReferenceType);
 			Assert.AreEqual ("System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", pr.Reference);
 			
 			// Configurations
@@ -151,9 +151,9 @@ namespace MonoDevelop.Projects
 			Assert.AreEqual (0, project.Configurations.Count);
 			
 			InitializeProject (dir, project, "TestProject");
-			project.References.Add (new ProjectReference (ReferenceType.Gac, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
-			project.References.Add (new ProjectReference (ReferenceType.Gac, "System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
-			project.References.Add (new ProjectReference (ReferenceType.Gac, "System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			project.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			project.References.Add (new ProjectReference (ReferenceType.Package, "System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			project.References.Add (new ProjectReference (ReferenceType.Package, "System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
 			project.Files.Add (new ProjectFile (Path.Combine (dir, "Main.cs")));
 			project.Files.Add (new ProjectFile (Path.Combine (dir, "Resource.xml"), BuildAction.EmbeddedResource));
 			project.Files.Add (new ProjectFile (Path.Combine (dir, "Excluded.xml"), BuildAction.Content));
@@ -256,14 +256,14 @@ namespace MonoDevelop.Projects
 			folder1.Name = "nested-solution1";
 			
 			DotNetProject projectLib1 = CreateProject (Util.Combine (dir, "nested-solution1", "library1"), "C#", "library1");
-			projectLib1.References.Add (new ProjectReference (ReferenceType.Gac, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			projectLib1.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
 			projectLib1.Files.Add (new ProjectFile (Path.Combine (projectLib1.BaseDirectory, "MyClass.cs")));
 			projectLib1.Files.Add (new ProjectFile (Path.Combine (projectLib1.BaseDirectory, "AssemblyInfo.cs")));
 			projectLib1.CompileTarget = CompileTarget.Library;
 			folder1.Items.Add (projectLib1);
 			
 			DotNetProject projectLib2 = CreateProject (Util.Combine (dir, "nested-solution1", "library2"), "C#", "library2");
-			projectLib2.References.Add (new ProjectReference (ReferenceType.Gac, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			projectLib2.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
 			projectLib2.Files.Add (new ProjectFile (Path.Combine (projectLib2.BaseDirectory, "MyClass.cs")));
 			projectLib2.Files.Add (new ProjectFile (Path.Combine (projectLib2.BaseDirectory, "AssemblyInfo.cs")));
 			projectLib2.CompileTarget = CompileTarget.Library;
@@ -278,7 +278,7 @@ namespace MonoDevelop.Projects
 			DotNetProject project2 = CreateProject (Util.Combine (dir, "nested-solution2", "console-project2"), "C#", "console-project2");
 			project2.Files.Add (new ProjectFile (Path.Combine (project2.BaseDirectory, "Main.cs")));
 			project2.Files.Add (new ProjectFile (Path.Combine (project2.BaseDirectory, "AssemblyInfo.cs")));
-			project2.References.Add (new ProjectReference (ReferenceType.Gac, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			project2.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
 			
 			// nested-solution3
 
@@ -286,14 +286,14 @@ namespace MonoDevelop.Projects
 			folder3.Name = "nested-solution3";
 			
 			DotNetProject projectLib3 = CreateProject (Util.Combine (dir, "nested-solution2", "nested-solution3", "library3"), "C#", "library3");
-			projectLib3.References.Add (new ProjectReference (ReferenceType.Gac, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			projectLib3.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
 			projectLib3.Files.Add (new ProjectFile (Path.Combine (projectLib3.BaseDirectory, "MyClass.cs")));
 			projectLib3.Files.Add (new ProjectFile (Path.Combine (projectLib3.BaseDirectory, "AssemblyInfo.cs")));
 			projectLib3.CompileTarget = CompileTarget.Library;
 			folder3.Items.Add (projectLib3);
 			
 			DotNetProject projectLib4 = CreateProject (Util.Combine (dir, "nested-solution2", "nested-solution3", "library4"), "C#", "library4");
-			projectLib4.References.Add (new ProjectReference (ReferenceType.Gac, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			projectLib4.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
 			projectLib4.Files.Add (new ProjectFile (Path.Combine (projectLib4.BaseDirectory, "MyClass.cs")));
 			projectLib4.Files.Add (new ProjectFile (Path.Combine (projectLib4.BaseDirectory, "AssemblyInfo.cs")));
 			projectLib4.CompileTarget = CompileTarget.Library;
@@ -305,7 +305,7 @@ namespace MonoDevelop.Projects
 			string file = Path.Combine (dir, "TestSolution.sln");
 			sol.FileName = file;
 			
-			project1.References.Add (new ProjectReference (ReferenceType.Gac, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
+			project1.References.Add (new ProjectReference (ReferenceType.Package, "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
 			project1.References.Add (new ProjectReference (projectLib1));
 			project1.References.Add (new ProjectReference (projectLib2));
 			project1.References.Add (new ProjectReference (projectLib3));