diff --git a/reference/Event/main.cpp b/reference/Event/main.cpp
index 0382b366f..9b92f546f 100644
--- a/reference/Event/main.cpp
+++ b/reference/Event/main.cpp
@@ -37,14 +37,13 @@ CONSOLE_APP_MAIN
 {
 	Foo a(10);
 
-	Event<> ev1, ev2;
+	Event<> ev1, ev2, ev4;
 	Event<int> ev3;
 
 	ev1 << [&] { a.Action(); };
 	ev2 << [] { Fn(); };
 	ev3 << [&](int x) { a.ActionWithParam(x); };
-	
-	Event<> ev4([&] { a.ActionWithParam(30); });
+	ev4 << [&] { a.ActionWithParam(30); };
 
 	ev1();
 	ev2();
diff --git a/reference/EventArgTarget/EventArgTarget.upp b/reference/EventArgTarget/EventArgTarget.upp
index a88a8a7d2..cd968972e 100644
--- a/reference/EventArgTarget/EventArgTarget.upp
+++ b/reference/EventArgTarget/EventArgTarget.upp
@@ -1,11 +1,11 @@
-description "\"value\" return callback for local MenuBar\377";
-
-uses
-	CtrlLib;
-
-file
-	main.cpp;
-
-mainconfig
-	"" = "GUI";
-
+description "\"value\" return callback for local MenuBar\377";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/EventArgTarget/init b/reference/EventArgTarget/init
new file mode 100644
index 000000000..2f58db064
--- /dev/null
+++ b/reference/EventArgTarget/init
@@ -0,0 +1,4 @@
+#ifndef _EventArgTarget_icpp_init_stub
+#define _EventArgTarget_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/reference/EventArgTarget/main.cpp b/reference/EventArgTarget/main.cpp
index 66dc5282d..e1535b07b 100644
--- a/reference/EventArgTarget/main.cpp
+++ b/reference/EventArgTarget/main.cpp
@@ -4,7 +4,7 @@ using namespace Upp;
 
 struct MyApp : TopWindow {
 	virtual void RightDown(Point p, dword keyflags) {
-		CallbackArgTarget<int> result;
+		EventArgTarget<int> result;
 		MenuBar menu;
 		for(int i = 0; i < 10; i++)
 			menu.Add(AsString(i), result[i]);
diff --git a/reference/EventPickClone/init b/reference/EventPickClone/init
index 317ccab1f..39b5cc715 100644
--- a/reference/EventPickClone/init
+++ b/reference/EventPickClone/init
@@ -1,4 +1,4 @@
-#ifndef _CallbackPickClone_icpp_init_stub
-#define _CallbackPickClone_icpp_init_stub
+#ifndef _EventPickClone_icpp_init_stub
+#define _EventPickClone_icpp_init_stub
 #include "Core/init"
 #endif
diff --git a/reference/EventProxy/CallbackProxy.cpp b/reference/EventProxy/CallbackProxy.cpp
index c366c44ac..1eb70c28b 100644
--- a/reference/EventProxy/CallbackProxy.cpp
+++ b/reference/EventProxy/CallbackProxy.cpp
@@ -14,7 +14,7 @@ void Bar()
 
 CONSOLE_APP_MAIN
 {
-	Callback a, b;
+	Event<> a, b;
 	a = Proxy(b);
 	b = callback(Foo);
 	a();
diff --git a/reference/EventProxy/EventProxy.upp b/reference/EventProxy/EventProxy.upp
index 69b6d8fc2..8f71fb2fc 100644
--- a/reference/EventProxy/EventProxy.upp
+++ b/reference/EventProxy/EventProxy.upp
@@ -1,11 +1,11 @@
-description "Callback to Callback";
-
-uses
-	Core;
-
-file
-	CallbackProxy.cpp;
-
-mainconfig
-	"" = "";
-
+description "Callback to Callback\377";
+
+uses
+	Core;
+
+file
+	CallbackProxy.cpp;
+
+mainconfig
+	"" = "";
+
diff --git a/reference/EventProxy/init b/reference/EventProxy/init
new file mode 100644
index 000000000..146a38a5f
--- /dev/null
+++ b/reference/EventProxy/init
@@ -0,0 +1,4 @@
+#ifndef _EventProxy_icpp_init_stub
+#define _EventProxy_icpp_init_stub
+#include "Core/init"
+#endif