Index: trunk/src/Dam/Forms/LocationScenariosControl.cs
===================================================================
diff -u -r7 -r31
--- trunk/src/Dam/Forms/LocationScenariosControl.cs	(.../LocationScenariosControl.cs)	(revision 7)
+++ trunk/src/Dam/Forms/LocationScenariosControl.cs	(.../LocationScenariosControl.cs)	(revision 31)
@@ -28,13 +28,13 @@
             userContextFilterBarEditItem.Width = 110;
 
             userContextFilterBarEditItem.Edit = new RepositoryItemComboBox();
-            SelectedContextFilter = categoryAll;
+            SelectedContextFilter = CategoryAll;
 
             Name = "Scenarios";
             LocalizationSupport.Register(typeof(Location), this);
 
             InitializeBinding();
-            BindSupport.Assign(controlPanel, this);
+            BindSupport.Assign(ControlPanel, this);
             PropertyEditorReactionType = PropertyEditorReactionType.Ignore;
         }
         
@@ -83,7 +83,7 @@
         private void InitializeBinding()
         {
             BindSupport.Bind(this, this, typeof(Location), "Scenarios");
-            BindSupport.Bind<LocationScenariosControl>(controlPanel, userContextFilterBarEditItem, x => x.SelectedContextFilter, BindingType.LabelAndValue);
+            BindSupport.Bind<LocationScenariosControl>(ControlPanel, userContextFilterBarEditItem, x => x.SelectedContextFilter, BindingType.LabelAndValue);
             LocalizationManager.CultureChanged += LocalizationManager_CultureChanged;
             DataEventPublisher.OnChanged += DataEventPublisherOnOnAfterChange;
             DataEventPublisher.AddListenerForSenders(EventType.Changed, this, this);
@@ -111,23 +111,23 @@
             HasItems = false;
             var combobox = userContextFilterBarEditItem.Edit as RepositoryItemComboBox;
             var context = Context.CurrentContext as DamContext;
-            if (null != context && null != combobox && null != itemType)
+            if (null != context && null != combobox && null != ItemType)
             {
-                var categories = context.GetColumnNamedFilters(itemType);
+                var categories = context.GetColumnNamedFilters(ItemType);
                 var currentIndex = combobox.Items.IndexOf(userContextFilterBarEditItem.EditValue);
                 if (GridControl.DataSource != null)
                 {
                     combobox.Items.Clear();
-                    combobox.Items.Add(categoryAll);
+                    combobox.Items.Add(CategoryAll);
                     foreach (var objectCategory in categories)
                     {
-                        combobox.Items.Add(new CategoryDisplayItem(objectCategory, LocalizationManager.GetTranslatedText(itemType, objectCategory)));
+                        combobox.Items.Add(new CategoryDisplayItem(objectCategory, LocalizationManager.GetTranslatedText(ItemType, objectCategory)));
                         HasItems = true;
                     }
                     if (currentIndex > -1)
                     {
                         SelectedContextFilter = (CategoryDisplayItem) combobox.Items[currentIndex];
-                        BindSupport.Update(controlPanel);
+                        BindSupport.Update(ControlPanel);
                     }
                 }
             }
@@ -149,7 +149,7 @@
             var context = Context.CurrentContext as DamContext;
             if (null != context && null != combobox)
             {
-                var visibleColumns = context.GetFilteredColumns(itemType, SelectedContextFilter.Text);
+                var visibleColumns = context.GetFilteredColumns(ItemType, SelectedContextFilter.Text);
                 foreach (GridColumn column in gridView1.Columns)
                 {
                     column.Visible = visibleColumns == null || visibleColumns.Contains(((MemberInfo) column.Tag).Name);