Index: /branches/eraser6/pluginsRewrite/Eraser.Plugins/Eraser.Plugins.csproj
===================================================================
--- /branches/eraser6/pluginsRewrite/Eraser.Plugins/Eraser.Plugins.csproj	(revision 2437)
+++ /branches/eraser6/pluginsRewrite/Eraser.Plugins/Eraser.Plugins.csproj	(revision 2438)
@@ -62,5 +62,5 @@
     <Compile Include="IPlugin.cs" />
     <Compile Include="IRegistrar.cs" />
-    <Compile Include="LoadingPolicy.cs" />
+    <Compile Include="PluginLoadingPolicy.cs" />
     <Compile Include="PersistentStore.cs" />
     <Compile Include="PluginInfo.cs" />
Index: /branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginInfo.cs
===================================================================
--- /branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginInfo.cs	(revision 2437)
+++ /branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginInfo.cs	(revision 2438)
@@ -117,6 +117,6 @@
 					else if (attr.Constructor.DeclaringType == typeof(AssemblyCompanyAttribute))
 						info.Author = (string)attr.ConstructorArguments[0].Value;
-					else if (attr.Constructor.DeclaringType.GUID == typeof(LoadingPolicyAttribute).GUID)
-						LoadingPolicy = (LoadingPolicy)attr.ConstructorArguments[0].Value;
+					else if (attr.Constructor.DeclaringType.GUID == typeof(PluginLoadingPolicyAttribute).GUID)
+						LoadingPolicy = (PluginLoadingPolicy)attr.ConstructorArguments[0].Value;
 
 				this.AssemblyInfo = info;
@@ -138,5 +138,5 @@
 		/// therefore cannot be disabled.)
 		/// </summary>
-		public LoadingPolicy LoadingPolicy { get; internal set; }
+		public PluginLoadingPolicy LoadingPolicy { get; internal set; }
 
 		/// <summary>
Index: /branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginLoadingPolicy.cs
===================================================================
--- /branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginLoadingPolicy.cs	(revision 2438)
+++ /branches/eraser6/pluginsRewrite/Eraser.Plugins/PluginLoadingPolicy.cs	(revision 2438)
@@ -0,0 +1,84 @@
+/* 
+ * $Id$
+ * Copyright 2008-2010 The Eraser Project
+ * Original Author: Joel Low <lowjoel@users.sourceforge.net>
+ * Modified By:
+ * 
+ * This file is part of Eraser.
+ * 
+ * Eraser is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * 
+ * Eraser is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * 
+ * A copy of the GNU General Public License can be found at
+ * <http://www.gnu.org/licenses/>.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Eraser.Plugins
+{
+	/// <summary>
+	/// Loading policies applicable for a given plugin.
+	/// </summary>
+	public enum PluginLoadingPolicy
+	{
+		/// <summary>
+		/// The host decides the best policy for loading the plugin.
+		/// </summary>
+		None,
+
+		/// <summary>
+		/// The host will enable the plugin by default.
+		/// </summary>
+		DefaultOn,
+
+		/// <summary>
+		/// The host will disable the plugin by default.
+		/// </summary>
+		DefaultOff,
+
+		/// <summary>
+		/// The host must always load the plugin.
+		/// </summary>
+		/// <remarks>This policy does not have an effect when declared in the
+		/// <see cref="PluginLoadingPolicyAttribute"/> attribute and will be equivalent
+		/// to <see cref="None"/>.</remarks>
+		Core
+	}
+
+	/// <summary>
+	/// Declares the loading policy for the assembly containing the plugin. Only
+	/// plugins signed with an Authenticode signature will be trusted and have
+	/// this attribute checked at initialisation.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
+	public sealed class PluginLoadingPolicyAttribute : Attribute
+	{
+		/// <summary>
+		/// Constructor.
+		/// </summary>
+		/// <param name="policy">The policy used for loading the plugin.</param>
+		public PluginLoadingPolicyAttribute(PluginLoadingPolicy policy)
+		{
+			Policy = policy;
+		}
+
+		/// <summary>
+		/// The loading policy to be applied to the assembly.
+		/// </summary>
+		public PluginLoadingPolicy Policy
+		{
+			get;
+			set;
+		}
+	}
+}
Index: /branches/eraser6/pluginsRewrite/Eraser.Plugins/Host.cs
===================================================================
--- /branches/eraser6/pluginsRewrite/Eraser.Plugins/Host.cs	(revision 2437)
+++ /branches/eraser6/pluginsRewrite/Eraser.Plugins/Host.cs	(revision 2438)
@@ -359,5 +359,5 @@
 
 			//Load the plugin, depending on type
-			bool result = instance.LoadingPolicy == LoadingPolicy.Core ?
+			bool result = instance.LoadingPolicy == PluginLoadingPolicy.Core ?
 				LoadCorePlugin(instance) : LoadNonCorePlugin(instance);
 			if (result)
@@ -382,5 +382,5 @@
 			if (CorePlugins.Count(x => x == info.Assembly.GetName().Name) == 0)
 			{
-				info.LoadingPolicy = LoadingPolicy.None;
+				info.LoadingPolicy = PluginLoadingPolicy.None;
 				return LoadNonCorePlugin(info);
 			}
Index: anches/eraser6/pluginsRewrite/Eraser.Plugins/LoadingPolicy.cs
===================================================================
--- /branches/eraser6/pluginsRewrite/Eraser.Plugins/LoadingPolicy.cs	(revision 2437)
+++ 	(revision )
@@ -1,84 +1,0 @@
-/* 
- * $Id$
- * Copyright 2008-2010 The Eraser Project
- * Original Author: Joel Low <lowjoel@users.sourceforge.net>
- * Modified By:
- * 
- * This file is part of Eraser.
- * 
- * Eraser is free software: you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * 
- * Eraser is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * A copy of the GNU General Public License can be found at
- * <http://www.gnu.org/licenses/>.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Eraser.Plugins
-{
-	/// <summary>
-	/// Loading policies applicable for a given plugin.
-	/// </summary>
-	public enum LoadingPolicy
-	{
-		/// <summary>
-		/// The host decides the best policy for loading the plugin.
-		/// </summary>
-		None,
-
-		/// <summary>
-		/// The host will enable the plugin by default.
-		/// </summary>
-		DefaultOn,
-
-		/// <summary>
-		/// The host will disable the plugin by default.
-		/// </summary>
-		DefaultOff,
-
-		/// <summary>
-		/// The host must always load the plugin.
-		/// </summary>
-		/// <remarks>This policy does not have an effect when declared in the
-		/// <see cref="LoadingPolicyAttribute"/> attribute and will be equivalent
-		/// to <see cref="None"/>.</remarks>
-		Core
-	}
-
-	/// <summary>
-	/// Declares the loading policy for the assembly containing the plugin. Only
-	/// plugins signed with an Authenticode signature will be trusted and have
-	/// this attribute checked at initialisation.
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
-	public sealed class LoadingPolicyAttribute : Attribute
-	{
-		/// <summary>
-		/// Constructor.
-		/// </summary>
-		/// <param name="policy">The policy used for loading the plugin.</param>
-		public LoadingPolicyAttribute(LoadingPolicy policy)
-		{
-			Policy = policy;
-		}
-
-		/// <summary>
-		/// The loading policy to be applied to the assembly.
-		/// </summary>
-		public LoadingPolicy Policy
-		{
-			get;
-			set;
-		}
-	}
-}