diff --git a/examples/nbproject/configs/1e.TcpExample4DispatchServer.properties b/examples/nbproject/configs/1e.TcpExample4DispatchServer.properties
new file mode 100644
index 0000000000000000000000000000000000000000..f06694a14ad288144b65ae1f9c3ed92f51294e65
--- /dev/null
+++ b/examples/nbproject/configs/1e.TcpExample4DispatchServer.properties
@@ -0,0 +1 @@
+main.class=TcpExamples.TcpExample4DispatchServer
diff --git a/examples/nbproject/configs/1e.TcpExample4ThreadServer.properties b/examples/nbproject/configs/1e.TcpExample4ThreadServer.properties
deleted file mode 100644
index 66983caea8e32d1d2c2e5c87ac5486788bd0bd6a..0000000000000000000000000000000000000000
--- a/examples/nbproject/configs/1e.TcpExample4ThreadServer.properties
+++ /dev/null
@@ -1 +0,0 @@
-main.class=TcpExamples.TcpExample4ThreadServer
diff --git a/examples/nbproject/configs/2a.UdpReceiver.properties b/examples/nbproject/configs/2a.UdpReceiver.properties
deleted file mode 100644
index 7e141722cfee4f7324f0b6f3afeba2c2f3dc2f11..0000000000000000000000000000000000000000
--- a/examples/nbproject/configs/2a.UdpReceiver.properties
+++ /dev/null
@@ -1 +0,0 @@
-main.class=UdpMulticastHttpExamples.UdpReceiver
diff --git a/examples/nbproject/configs/2a.UnicastUdpReceiver.properties b/examples/nbproject/configs/2a.UnicastUdpReceiver.properties
new file mode 100644
index 0000000000000000000000000000000000000000..15f1b276d88bc106ff2745b7f957fc67729595c9
--- /dev/null
+++ b/examples/nbproject/configs/2a.UnicastUdpReceiver.properties
@@ -0,0 +1 @@
+main.class=UdpExamples.UnicastUdpReceiver
diff --git a/examples/nbproject/configs/2b.UdpSender.properties b/examples/nbproject/configs/2b.UdpSender.properties
deleted file mode 100644
index 1f269057f07c225d19c0c7c2109f6788e84f5c06..0000000000000000000000000000000000000000
--- a/examples/nbproject/configs/2b.UdpSender.properties
+++ /dev/null
@@ -1 +0,0 @@
-main.class=UdpMulticastHttpExamples.UdpSender
diff --git a/examples/nbproject/configs/2b.UnicastUdpSender.properties b/examples/nbproject/configs/2b.UnicastUdpSender.properties
new file mode 100644
index 0000000000000000000000000000000000000000..314d802482b0b8bb141c6f5ee128cf3763f41300
--- /dev/null
+++ b/examples/nbproject/configs/2b.UnicastUdpSender.properties
@@ -0,0 +1 @@
+main.class=UdpExamples.UnicastUdpSender
diff --git a/examples/nbproject/configs/2c.MulticastReceiver.properties b/examples/nbproject/configs/2c.MulticastReceiver.properties
deleted file mode 100644
index 2856a0bef63b0651eaa480c640ac908c31a8685b..0000000000000000000000000000000000000000
--- a/examples/nbproject/configs/2c.MulticastReceiver.properties
+++ /dev/null
@@ -1 +0,0 @@
-main.class=UdpMulticastHttpExamples.MulticastReceiver
diff --git a/examples/nbproject/configs/2c.MulticastUdpReceiver.properties b/examples/nbproject/configs/2c.MulticastUdpReceiver.properties
new file mode 100644
index 0000000000000000000000000000000000000000..ce32eddfa0e4ec9d9f1415396efcffafec8c8ac9
--- /dev/null
+++ b/examples/nbproject/configs/2c.MulticastUdpReceiver.properties
@@ -0,0 +1 @@
+main.class=UdpExamples.MulticastUdpReceiver
diff --git a/examples/nbproject/configs/2d.MulticastSender.properties b/examples/nbproject/configs/2d.MulticastSender.properties
deleted file mode 100644
index e5deff8fb848f90cf60dc9747bc414c7c1a90a4d..0000000000000000000000000000000000000000
--- a/examples/nbproject/configs/2d.MulticastSender.properties
+++ /dev/null
@@ -1 +0,0 @@
-main.class=UdpMulticastHttpExamples.MulticastSender
diff --git a/examples/nbproject/configs/2d.MulticastUdpSender.properties b/examples/nbproject/configs/2d.MulticastUdpSender.properties
new file mode 100644
index 0000000000000000000000000000000000000000..9b2ae7908940a4746f59ab9ca59c8923988be0ad
--- /dev/null
+++ b/examples/nbproject/configs/2d.MulticastUdpSender.properties
@@ -0,0 +1 @@
+main.class=UdpExamples.MulticastUdpSender
diff --git a/examples/nbproject/configs/2e.HttpWebPageSource.properties b/examples/nbproject/configs/2e.HttpWebPageSource.properties
index c774a067cbce11056df1fa1221ab22e350f2866e..fa1b0dd09aa09cadb4c1de3e0ef276e17bb50e35 100644
--- a/examples/nbproject/configs/2e.HttpWebPageSource.properties
+++ b/examples/nbproject/configs/2e.HttpWebPageSource.properties
@@ -1 +1 @@
-main.class=UdpMulticastHttpExamples.HttpWebPageSource
+main.class=HttpServletExamples.HttpWebPageSource
diff --git a/examples/nbproject/configs/4a.PduReceiver.properties b/examples/nbproject/configs/4a.PduReceiver.properties
index 3287d23064745783e0c42fb39ecc2981eeb24627..3f1e6571efaee123c9a94018ca3fc51b83037b10 100644
--- a/examples/nbproject/configs/4a.PduReceiver.properties
+++ b/examples/nbproject/configs/4a.PduReceiver.properties
@@ -1 +1 @@
-main.class=DisExamples.PduReceiver
+main.class=OpenDis4Examples.PduReceiver
diff --git a/examples/nbproject/configs/4b.PduSender.properties b/examples/nbproject/configs/4b.PduSender.properties
index d187a543299b379613752ad396608d137215b694..3cf27c719b46cdaebdb6d4e1e6f3fe4779c2831e 100644
--- a/examples/nbproject/configs/4b.PduSender.properties
+++ b/examples/nbproject/configs/4b.PduSender.properties
@@ -1 +1 @@
-main.class=DisExamples.PduSender
+main.class=OpenDis4Examples.PduSender
diff --git a/examples/nbproject/configs/4c.EspduReceiver.properties b/examples/nbproject/configs/4c.EspduReceiver.properties
index a2f0ae311d50a16cececc02270b555389849d5d0..bd34c31859f1d526c0db27f1e3b4df2fcb16077e 100644
--- a/examples/nbproject/configs/4c.EspduReceiver.properties
+++ b/examples/nbproject/configs/4c.EspduReceiver.properties
@@ -1 +1 @@
-main.class=DisExamples.EspduReceiver
+main.class=OpenDis4Examples.EspduReceiver
diff --git a/examples/nbproject/configs/4d.EspduSender.properties b/examples/nbproject/configs/4d.EspduSender.properties
index d2ae67cc9bc09c15ae602437c228a9e246c35707..53479c09ba5798fd0810e1e3cfad1bb23c7923f3 100644
--- a/examples/nbproject/configs/4d.EspduSender.properties
+++ b/examples/nbproject/configs/4d.EspduSender.properties
@@ -1 +1 @@
-main.class=DisExamples.EspduSender
+main.class=OpenDis4Examples.EspduSender