Index: code/branches/cegui0.8_ogre1.9/data/gui/layouts/AudioMenu.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/AudioMenu.layout	(revision 11799)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/AudioMenu.layout	(revision 11800)
@@ -33,5 +33,5 @@
                     <Event function="AudioMenu.AudioMasterScrollbar_started" name="ThumbTrackStarted" />
                     <Event function="AudioMenu.AudioMasterScrollbar_ended" name="ThumbTrackEnded" />
-                    <Event function="AudioMenu.AudioMasterScrollbar_changed" name="ScrollPosChanged" />
+                    <Event function="AudioMenu.AudioMasterScrollbar_changed" name="ScrollPositionChanged" />
                 </Window>
                 <Window name="MasterCheckbox" type="MenuWidgets/Checkbox">
@@ -39,5 +39,5 @@
                     <Property name="MaxSize" value="{{1,0},{1,0}}" />
                     <Property name="Area" value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
-                    <Event function="AudioMenu.AudioMuteMasterCheckbox_clicked" name="CheckStateChanged" />
+                    <Event function="AudioMenu.AudioMuteMasterCheckbox_clicked" name="SelectStateChanged" />
                 </Window>
             </Window>
@@ -60,5 +60,5 @@
                     <Event function="AudioMenu.AudioMusicScrollbar_started" name="ThumbTrackStarted" />
                     <Event function="AudioMenu.AudioMusicScrollbar_ended" name="ThumbTrackEnded" />
-                    <Event function="AudioMenu.AudioMusicScrollbar_changed" name="ScrollPosChanged" />
+                    <Event function="AudioMenu.AudioMusicScrollbar_changed" name="ScrollPositionChanged" />
                 </Window>
                 <Window name="MusicCheckbox" type="MenuWidgets/Checkbox">
@@ -66,5 +66,5 @@
                     <Property name="MaxSize" value="{{1,0},{1,0}}" />
                     <Property name="Area" value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
-                    <Event function="AudioMenu.AudioMuteMusicCheckbox_clicked" name="CheckStateChanged" />
+                    <Event function="AudioMenu.AudioMuteMusicCheckbox_clicked" name="SelectStateChanged" />
                 </Window>
             </Window>
@@ -87,5 +87,5 @@
                     <Event function="AudioMenu.AudioEffectsScrollbar_started" name="ThumbTrackStarted" />
                     <Event function="AudioMenu.AudioEffectsScrollbar_ended" name="ThumbTrackEnded" />
-                    <Event function="AudioMenu.AudioEffectsScrollbar_changed" name="ScrollPosChanged" />
+                    <Event function="AudioMenu.AudioEffectsScrollbar_changed" name="ScrollPositionChanged" />
                 </Window>
                 <Window name="EffectsCheckbox" type="MenuWidgets/Checkbox">
@@ -93,5 +93,5 @@
                     <Property name="MaxSize" value="{{1,0},{1,0}}" />
                     <Property name="Area" value="{{0.775,0},{0.45,0},{0.96,0},{0.9,0}}" />
-                    <Event function="AudioMenu.AudioMuteEffectsCheckbox_clicked" name="CheckStateChanged" />
+                    <Event function="AudioMenu.AudioMuteEffectsCheckbox_clicked" name="SelectStateChanged" />
                 </Window>
             </Window>
@@ -106,5 +106,5 @@
                     <Property name="MaxSize" value="{{1,0},{1,0}}" />
                     <Property name="Area" value="{{0.05,0},{0.225,0},{0.95,0},{0.92,0}}" />
-                    <Event function="AudioMenu.AudioThemeListbox_changed" name="ItemSelectionChanged" />
+                    <Event function="AudioMenu.AudioThemeListbox_changed" name="SelectionChanged" />
                 </Window>
             </Window>
Index: code/branches/cegui0.8_ogre1.9/data/gui/layouts/GraphicsMenu.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/GraphicsMenu.layout	(revision 11799)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/GraphicsMenu.layout	(revision 11800)
@@ -34,5 +34,5 @@
                             <Property name="MaxSize" value="{{1,0},{1,0}}" />
                             <Property name="Area" value="{{0.05,0},{0.15,0},{0.95,0},{0.27,0}}" />
-                            <Event function="GraphicsMenu.callback_FullscreenCheckbox_CheckStateChanged" name="CheckStateChanged" />
+                            <Event function="GraphicsMenu.callback_FullscreenCheckbox_SelectStateChanged" name="SelectStateChanged" />
                         </Window>
                         <Window name="Combobox" type="MenuWidgets/Combobox">
@@ -40,5 +40,4 @@
                             <Property name="ClippedByParent" value="False" />
                             <Property name="Area" value="{{0.05,0},{0.3,0},{0.95,0},{1.2,0}}" />
-                            <Property name="MaxEditTextLength" value="1073741823" />
                             <Event function="GraphicsMenu.callback_ResolutionCombobox_ListSelectionAccepted" name="ListSelectionAccepted" />
                         </Window>
@@ -93,5 +92,4 @@
                             <Property name="ClippedByParent" value="False" />
                             <Property name="Area" value="{{0.05,0},{0.5,0},{0.95,0},{1.6,0}}" />
-                            <Property name="MaxEditTextLength" value="1073741823" />
                             <Event function="GraphicsMenu.callback_ThemeCombobox_ListSelectionAccepted" name="ListSelectionAccepted" />
                         </Window>
@@ -104,5 +102,5 @@
                             <Property name="MaxSize" value="{{1,0},{1,0}}" />
                             <Property name="Area" value="{{0.05,0},{0.1,0},{0.95,0},{0.45,0}}" />
-                            <Event function="GraphicsMenu.callback_VSyncCheckbox_CheckStateChanged" name="CheckStateChanged" />
+                            <Event function="GraphicsMenu.callback_VSyncCheckbox_SelectStateChanged" name="SelectStateChanged" />
                         </Window>
                         <Window name="FSAALabel" type="MenuWidgets/StaticText">
@@ -117,5 +115,4 @@
                             <Property name="ClippedByParent" value="False" />
                             <Property name="Area" value="{{0.3,0},{0.55,0},{0.95,0},{2.1,0}}" />
-                            <Property name="MaxEditTextLength" value="1073741823" />
                             <Event function="GraphicsMenu.callback_FSAACombobox_ListSelectionAccepted" name="ListSelectionAccepted" />
                         </Window>
@@ -178,5 +175,4 @@
                         <Property name="ClippedByParent" value="False" />
                         <Property name="Area" value="{{0.5,0},{0.29,0},{0.7,0},{0.725,0}}" />
-                        <Property name="MaxEditTextLength" value="1073741823" />
                     </Window>
                     <Window name="MeshLodCheckbox" type="MenuWidgets/Checkbox">
Index: code/branches/cegui0.8_ogre1.9/data/gui/layouts/KeyBindMenu.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/KeyBindMenu.layout	(revision 11799)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/KeyBindMenu.layout	(revision 11800)
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="Background" type="DefaultWindow">
+    <Window name="KeyBindBackground" type="DefaultWindow">
         <Property name="InheritsAlpha" value="False" />
         <Property name="MaxSize" value="{{1,0},{1,0}}" />
Index: code/branches/cegui0.8_ogre1.9/data/gui/layouts/MiscConfigMenu.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/MiscConfigMenu.layout	(revision 11799)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/MiscConfigMenu.layout	(revision 11800)
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="Background" type="MenuWidgets/StaticImage">
+    <Window name="MiscConfigBackground" type="MenuWidgets/StaticImage">
         <Property name="FrameEnabled" value="False" />
         <Property name="InheritsAlpha" value="False" />
Index: code/branches/cegui0.8_ogre1.9/data/gui/layouts/MouseControlsMenu.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/MouseControlsMenu.layout	(revision 11799)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/MouseControlsMenu.layout	(revision 11800)
@@ -33,5 +33,5 @@
                     <Event function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_started" name="ThumbTrackStarted" />
                     <Event function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_ended" name="ThumbTrackEnded" />
-                    <Event function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_changed" name="ScrollPosChanged" />
+                    <Event function="MouseControlsMenu.MouseControlsMouseNormalScrollbar_changed" name="ScrollPositionChanged" />
                 </Window>
                 <Window name="MouseNormalButton" type="MenuWidgets/RadioButton">
@@ -60,5 +60,5 @@
                     <Event function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_started" name="ThumbTrackStarted" />
                     <Event function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_ended" name="ThumbTrackEnded" />
-                    <Event function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_changed" name="ScrollPosChanged" />
+                    <Event function="MouseControlsMenu.MouseControlsMouseDeriveScrollbar_changed" name="ScrollPositionChanged" />
                 </Window>
                 <Window name="MouseDeriveButton" type="MenuWidgets/RadioButton">
@@ -74,5 +74,5 @@
                 <Property name="MaxSize" value="{{1,0},{1,0}}" />
                 <Property name="Area" value="{{0.39,0},{0.85,0},{0.61,0},{0.95,0}}" />
-                <Event function="MouseControlsMenu.MouseInvertCheckbox_clicked" name="CheckStateChanged" />
+                <Event function="MouseControlsMenu.MouseInvertCheckbox_clicked" name="SelectStateChanged" />
             </Window>
         </Window>
Index: code/branches/cegui0.8_ogre1.9/data/gui/layouts/SettingsMenu.layout
===================================================================
--- code/branches/cegui0.8_ogre1.9/data/gui/layouts/SettingsMenu.layout	(revision 11799)
+++ code/branches/cegui0.8_ogre1.9/data/gui/layouts/SettingsMenu.layout	(revision 11800)
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <GUILayout version="4">
-    <Window name="Background" type="MenuWidgets/StaticImage">
+    <Window name="SettingsBackground" type="MenuWidgets/StaticImage">
         <Property name="InheritsAlpha" value="False" />
         <Property name="FrameEnabled" value="False" />
