Index: Core/Gui/src/Core.Gui/Attributes/DynamicPropertyOrderEvaluationMethodAttribute.cs
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r72f890728aa040c48c4478bacf6119c75306c827
--- Core/Gui/src/Core.Gui/Attributes/DynamicPropertyOrderEvaluationMethodAttribute.cs	(.../DynamicPropertyOrderEvaluationMethodAttribute.cs)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Attributes/DynamicPropertyOrderEvaluationMethodAttribute.cs	(.../DynamicPropertyOrderEvaluationMethodAttribute.cs)	(revision 72f890728aa040c48c4478bacf6119c75306c827)
@@ -23,7 +23,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using CoreCommonGuiResources = Core.Gui.Properties.Resources;
+using Core.Gui.Properties;
 
 namespace Core.Gui.Attributes
 {
@@ -67,7 +67,7 @@
             if (methodInfo.ReturnType != typeof(int))
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicPropertyOrderEvaluationMethod_must_return_int_on_Class_0_,
+                                               Resources.DynamicPropertyOrderEvaluationMethod_must_return_int_on_Class_0_,
                                                methodInfo.DeclaringType);
                 throw new MissingMethodException(message);
             }
@@ -76,15 +76,15 @@
             if (parameterInfos.Length != 1)
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicPropertyOrderEvaluationMethod_incorrect_argument_count_must_be_one_string_argument_on_Class_0_,
+                                               Resources.DynamicPropertyOrderEvaluationMethod_incorrect_argument_count_must_be_one_string_argument_on_Class_0_,
                                                methodInfo.DeclaringType);
                 throw new MissingMethodException(message);
             }
 
             if (parameterInfos[0].ParameterType != typeof(string))
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicPropertyOrderEvaluationMethod_must_have_string_argument_on_Class_0_,
+                                               Resources.DynamicPropertyOrderEvaluationMethod_must_have_string_argument_on_Class_0_,
                                                methodInfo.DeclaringType);
                 throw new MissingMethodException(message);
             }
@@ -99,15 +99,15 @@
             if (propertyOrderMethods.Length == 0)
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicPropertyOrderEvaluationMethod_not_found_or_not_public_on_Class_0_,
+                                               Resources.DynamicPropertyOrderEvaluationMethod_not_found_or_not_public_on_Class_0_,
                                                obj.GetType());
                 throw new MissingMethodException(message);
             }
 
             if (propertyOrderMethods.Length > 1)
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicPropertyOrderEvaluationMethod_only_one_allowed_per_Class_0_,
+                                               Resources.DynamicPropertyOrderEvaluationMethod_only_one_allowed_per_Class_0_,
                                                obj.GetType());
                 throw new MissingMethodException(message);
             }
Index: Core/Gui/src/Core.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r72f890728aa040c48c4478bacf6119c75306c827
--- Core/Gui/src/Core.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs	(.../DynamicReadOnlyValidationMethodAttribute.cs)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs	(.../DynamicReadOnlyValidationMethodAttribute.cs)	(revision 72f890728aa040c48c4478bacf6119c75306c827)
@@ -23,7 +23,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using CoreCommonGuiResources = Core.Gui.Properties.Resources;
+using Core.Gui.Properties;
 
 namespace Core.Gui.Attributes
 {
@@ -67,7 +67,7 @@
             if (methodInfo.ReturnType != typeof(bool))
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicReadOnlyValidationMethod_must_return_bool_on_Class_0_,
+                                               Resources.DynamicReadOnlyValidationMethod_must_return_bool_on_Class_0_,
                                                methodInfo.DeclaringType);
                 throw new MissingMethodException(message);
             }
@@ -76,15 +76,15 @@
             if (parameterInfos.Length != 1)
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicReadOnlyValidationMethod_incorrect_argument_count_must_be_one_string_argument_on_Class_0_,
+                                               Resources.DynamicReadOnlyValidationMethod_incorrect_argument_count_must_be_one_string_argument_on_Class_0_,
                                                methodInfo.DeclaringType);
                 throw new MissingMethodException(message);
             }
 
             if (parameterInfos[0].ParameterType != typeof(string))
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicReadOnlyValidationMethod_must_have_string_argument_on_Class_0_,
+                                               Resources.DynamicReadOnlyValidationMethod_must_have_string_argument_on_Class_0_,
                                                methodInfo.DeclaringType);
                 throw new MissingMethodException(message);
             }
@@ -99,15 +99,15 @@
             if (validationMethods.Length == 0)
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicReadOnlyValidationMethod_not_found_or_not_public_on_Class_0_,
+                                               Resources.DynamicReadOnlyValidationMethod_not_found_or_not_public_on_Class_0_,
                                                obj.GetType());
                 throw new MissingMethodException(message);
             }
 
             if (validationMethods.Length > 1)
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicReadOnlyValidationMethod_only_one_allowed_per_Class_0_,
+                                               Resources.DynamicReadOnlyValidationMethod_only_one_allowed_per_Class_0_,
                                                obj.GetType());
                 throw new MissingMethodException(message);
             }
Index: Core/Gui/src/Core.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs
===================================================================
diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r72f890728aa040c48c4478bacf6119c75306c827
--- Core/Gui/src/Core.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs	(.../DynamicVisibleValidationMethodAttribute.cs)	(revision 434415295de74c310ce6d3cdd0100c28838cf9ea)
+++ Core/Gui/src/Core.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs	(.../DynamicVisibleValidationMethodAttribute.cs)	(revision 72f890728aa040c48c4478bacf6119c75306c827)
@@ -23,7 +23,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using CoreCommonGuiResources = Core.Gui.Properties.Resources;
+using Core.Gui.Properties;
 
 namespace Core.Gui.Attributes
 {
@@ -67,7 +67,7 @@
             if (methodInfo.ReturnType != typeof(bool))
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicVisibleValidationMethod_must_return_bool_on_Class_0_,
+                                               Resources.DynamicVisibleValidationMethod_must_return_bool_on_Class_0_,
                                                methodInfo.DeclaringType);
                 throw new MissingMethodException(message);
             }
@@ -76,15 +76,15 @@
             if (parameterInfos.Length != 1)
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicVisibleValidationMethod_incorrect_argument_count_must_be_one_string_argument_on_Class_0_,
+                                               Resources.DynamicVisibleValidationMethod_incorrect_argument_count_must_be_one_string_argument_on_Class_0_,
                                                methodInfo.DeclaringType);
                 throw new MissingMethodException(message);
             }
 
             if (parameterInfos[0].ParameterType != typeof(string))
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicVisibleValidationMethod_must_have_string_argument_on_Class_0_,
+                                               Resources.DynamicVisibleValidationMethod_must_have_string_argument_on_Class_0_,
                                                methodInfo.DeclaringType);
                 throw new MissingMethodException(message);
             }
@@ -99,15 +99,15 @@
             if (validationMethods.Length == 0)
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicVisibleValidationMethod_not_found_or_not_public_on_Class_0_,
+                                               Resources.DynamicVisibleValidationMethod_not_found_or_not_public_on_Class_0_,
                                                obj.GetType());
                 throw new MissingMethodException(message);
             }
 
             if (validationMethods.Length > 1)
             {
                 string message = string.Format(CultureInfo.CurrentCulture,
-                                               CoreCommonGuiResources.DynamicVisibleValidationMethod_only_one_allowed_per_Class_0_,
+                                               Resources.DynamicVisibleValidationMethod_only_one_allowed_per_Class_0_,
                                                obj.GetType());
                 throw new MissingMethodException(message);
             }