diff --git a/tutorial/Gui07/main.cpp b/tutorial/Gui07/main.cpp
index e9432b566..9c8466ce8 100644
--- a/tutorial/Gui07/main.cpp
+++ b/tutorial/Gui07/main.cpp
@@ -18,8 +18,6 @@ struct MyAppWindow : TopWindow {
 		bar.Sub("Menu", [=](Bar& bar) { SubMenu(bar); });
 	}
 
-	typedef MyAppWindow CLASSNAME;
-
 	MyAppWindow() {
 		Title("My application with menu").Sizeable();
 		AddFrame(menu);
diff --git a/tutorial/Gui13/main.cpp b/tutorial/Gui13/main.cpp
index c7b78e077..1bac7ee65 100644
--- a/tutorial/Gui13/main.cpp
+++ b/tutorial/Gui13/main.cpp
@@ -5,8 +5,6 @@ using namespace Upp;
 struct MyAppWindow : TopWindow {
 	Button button;
 
-	typedef MyAppWindow CLASSNAME;
-
 	MyAppWindow() {
 		Title("My application with button");
 		Add(button.LeftPos(10, 100).TopPos(10, 30));
diff --git a/tutorial/Gui20a/main.cpp b/tutorial/Gui20a/main.cpp
index 53194000f..02a2a8080 100644
--- a/tutorial/Gui20a/main.cpp
+++ b/tutorial/Gui20a/main.cpp
@@ -9,12 +9,10 @@ struct MyApp : TopWindow {
 		Break(999);
 	}
 
-	typedef MyApp CLASSNAME;
-
 	MyApp() {
 		SetRect(0, 0, 100, 100);
 		Add(exit.SetLabel("exit").LeftPosZ(10, 64).TopPosZ(10, 24));
-		exit <<= THISBACK(Exit);
+		exit << [=] { Exit(); };
 	}
 };
 
diff --git a/tutorial/Gui22/main.cpp b/tutorial/Gui22/main.cpp
index 6ad845b5d..7b159dab3 100644
--- a/tutorial/Gui22/main.cpp
+++ b/tutorial/Gui22/main.cpp
@@ -9,12 +9,10 @@ struct NonModalDialog : public TopWindow {
 		Close();
 	}
 
-	typedef NonModalDialog CLASSNAME;
-
 	NonModalDialog() {
 		SetRect(0, 0, 200, 50);
 		Add(b.SetLabel("Close non-modal dialog").SizePos());
-		b <<= THISBACK(DoClose);
+		b << [=] { DoClose(); };
 	}
 };
 
@@ -29,12 +27,10 @@ struct MainWindow : public TopWindow {
 			dlg.Open(this);
 	}
 
-	typedef MainWindow CLASSNAME;
-
 	MainWindow() {
 		SetRect(0, 0, 400, 100);
 		Add(b.SetLabel("Open/close non-modal dialog").SizePos());
-		b <<= THISBACK(DoOpen);
+		b << [=] { DoOpen(); };
 	}
 };