diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 290fee2afe..8eb979722f 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -207,7 +207,7 @@ void MyFrame::TestFlexSizers(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) )
 {
-    MySizerDialog dialog( this, "Notebook Sizer Test Dialog" );
+    MyNotebookWithSizerDialog dialog( this, "Notebook Sizer Test Dialog" );
 
     dialog.ShowModal();
 }
@@ -396,10 +396,10 @@ MyFlexSizerFrame::MyFlexSizerFrame(wxFrame* parent)
 }
 
 // ----------------------------------------------------------------------------
-// MySizerDialog
+// MyNotebookWithSizerDialog
 // ----------------------------------------------------------------------------
 
-MySizerDialog::MySizerDialog(wxWindow *parent, const wxString &title)
+MyNotebookWithSizerDialog::MyNotebookWithSizerDialog(wxWindow *parent, const wxString &title)
              : wxDialog(parent, wxID_ANY, wxString(title))
 {
     // Begin with first hierarchy: a notebook at the top and
diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index fdfd4a0c5f..3a7a78ce5a 100644
--- a/samples/layout/layout.h
+++ b/samples/layout/layout.h
@@ -64,11 +64,11 @@ private:
 };
 
 
-// a dialog using notebook sizer for layout
-class MySizerDialog : public wxDialog
+// a dialog using notebook and sizers for layout
+class MyNotebookWithSizerDialog : public wxDialog
 {
 public:
-    MySizerDialog(wxWindow *parent, const wxString &title );
+    MyNotebookWithSizerDialog(wxWindow *parent, const wxString &title );
 };