--- a/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs	Wed Nov 04 16:28:01 2009 +0100
+++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml.cs	Thu Nov 05 13:13:52 2009 +0100
@@ -87,10 +87,10 @@
             try
             {
                 existingProjects = LoadProjects(MainViewModel.Project.VideoPath);
-                UserControlListSession listProject = new UserControlListSession(existingProjects);
+                UserControlListProject listProject = new UserControlListProject(existingProjects);
                 listProject.Name = "ListProject";
                 LayoutRoot.Children.Add(listProject);
-                listProject.EH_List_ContactDown += new EventHandler(listProject_EH_List_ContactDown);
+                listProject.EH_ListProject_ContactDown += new EventHandler(listProject_EH_ListProject_ContactDown);
             }
             catch (Exception)
             {
@@ -113,23 +113,23 @@
             }
         }
 
-        void listProject_EH_List_ContactDown(object sender, EventArgs e)
+        void listProject_EH_ListProject_ContactDown(object sender, EventArgs e)
         {
             try
             {
-                LayoutRoot.Children.Remove((UserControlListSession)sender);
-                if (((UserControlListSession)sender).SelectedItem.Equals("New Project"))
+                LayoutRoot.Children.Remove((UserControlListProject)sender);
+                if (((UserControlListProject)sender).SelectedItem.Equals("New Project"))
                 {
-                    UserControlSessionInput ProjectInput = new UserControlSessionInput();
+                    UserControlNewProjectForm ProjectInput = new UserControlNewProjectForm();
                     ProjectInput.Name = "ProjectInput";
                     LayoutRoot.Children.Add(ProjectInput);
-                    ProjectInput.EH_SurfaceButtonSubmit_ContactDown += new System.EventHandler(this.ProjectInput_EH_SurfaceButtonSubmit_ContactDown);
+                    ProjectInput.EH_NewProjectForm_ContactDown += new System.EventHandler(this.ProjectInput_EH_NewProjectForm_ContactDown);
                 }
                 else
                 {
                     foreach (Project elt in existingProjects)
                     {
-                        if (elt.Name.Equals(((UserControlListSession)sender).SelectedItem))
+                        if (elt.Name.Equals(((UserControlListProject)sender).SelectedItem))
                         {
                             MainViewModel.Project.Project = elt;
                             OpenProject();
@@ -146,18 +146,18 @@
             }
         }
 
-        private void ProjectInput_EH_SurfaceButtonSubmit_ContactDown(object sender, EventArgs e)
+        private void ProjectInput_EH_NewProjectForm_ContactDown(object sender, EventArgs e)
         {
             try
             {
-                //MainViewModel.Project.Alias = ((UserControlSessionInput)sender).Alias;
-                //MainViewModel.Project.Email = ((UserControlSessionInput)sender).Email;
-                MainViewModel.Project.Description = ((UserControlSessionInput)sender).Description;
-                MainViewModel.Project.Name = ((UserControlSessionInput)sender).SessionName;
+                //MainViewModel.Project.Alias = ((UserControlNewProjectForm)sender).Alias;
+                //MainViewModel.Project.Email = ((UserControlNewProjectForm)sender).Email;
+                MainViewModel.Project.Description = ((UserControlNewProjectForm)sender).Description;
+                MainViewModel.Project.Name = ((UserControlNewProjectForm)sender).SessionName;
                 
                 
                 //2-Suppression UCSession Input
-                LayoutRoot.Children.Remove((UserControlSessionInput)sender);
+                LayoutRoot.Children.Remove((UserControlNewProjectForm)sender);
                 OpenProject();
             }
             catch (Exception ex) 
@@ -172,7 +172,7 @@
         {
             try
             {
-                UserControlListProject listCuttings = new UserControlListProject(MainViewModel.Project.CuttingsDict);
+                UserControlListCutting listCuttings = new UserControlListCutting(MainViewModel.Project.CuttingsDict);
                 listCuttings.Name = "listCuttings";
                 LayoutRoot.Children.Add(listCuttings);
                 listCuttings.EH_Item_ContactDown += new EventHandler(listCuttings_EH_Item_ContactDown);
@@ -189,18 +189,18 @@
         {
             try
             {
-                LayoutRoot.Children.Remove((UserControlListProject)sender);
-                if (((UserControlListProject)sender).SelectedItem.Equals("New Cutting"))
+                LayoutRoot.Children.Remove((UserControlListCutting)sender);
+                if (((UserControlListCutting)sender).SelectedItem.Equals("New Cutting"))
                 {
-                    UserControlNewProject newCutting = new UserControlNewProject(User);
+                    UserControlNewCuttingForm newCutting = new UserControlNewCuttingForm(User);
                     newCutting.Name = "newCutting";
                     LayoutRoot.Children.Add(newCutting);
-                    newCutting.EH_NewCutting_ContactDown += new EventHandler(newCutting_EH_ContactDown);
+                    newCutting.EH_NewCuttingForm_ContactDown += new EventHandler(newCutting_EH_ContactDown);
                 }
                 else
                 {
                     foreach(KeyValuePair<string, Cutting> elt in MainViewModel.Project.CuttingsDict)
-                        if (elt.Key.Equals(((UserControlListProject)sender).SelectedItem))
+                        if (elt.Key.Equals(((UserControlListCutting)sender).SelectedItem))
                         {
                             CuttingVM = new CuttingViewModel(elt.Value, 815);
                             if (UC_Screen_NewCutting != null)
@@ -221,9 +221,9 @@
         {
             try
             {
-                LayoutRoot.Children.Remove((UserControlNewProject)sender);
-                CuttingVM = new CuttingViewModel(((UserControlNewProject)sender).Cutting, 850);
-                MainViewModel.Project.CuttingsDict.Add(CuttingVM.Title, ((UserControlNewProject)sender).Cutting);
+                LayoutRoot.Children.Remove((UserControlNewCuttingForm)sender);
+                CuttingVM = new CuttingViewModel(((UserControlNewCuttingForm)sender).Cutting, 850);
+                MainViewModel.Project.CuttingsDict.Add(CuttingVM.Title, ((UserControlNewCuttingForm)sender).Cutting);
                 if (UC_Screen_NewCutting != null)
                     UC_Screen_NewCutting(this, new EventArgs());
             }