diff --git a/samples/help/help.bkl b/samples/help/help.bkl
index 5a5b09c4b4..1c933f1c60 100644
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -7,7 +7,7 @@
         <sources>demo.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>help.rc</win32-res>
+        <win32-res>demo.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/png/png.bkl b/samples/png/png.bkl
index 531d63893d..e947e8a954 100644
--- a/samples/png/png.bkl
+++ b/samples/png/png.bkl
@@ -4,10 +4,10 @@
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <exe id="png" template="wx_sample" template_append="wx_append">
-        <sources>png.cpp</sources>
+        <sources>pngdemo.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>png.rc</win32-res>
+        <win32-res>pngdemo.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/sockets/sockets.bkl b/samples/sockets/sockets.bkl
index 34d0a3b937..27bd0bc01e 100644
--- a/samples/sockets/sockets.bkl
+++ b/samples/sockets/sockets.bkl
@@ -3,11 +3,18 @@
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
-    <exe id="sockets" template="wx_sample" template_append="wx_append">
-        <sources>sockets.cpp</sources>
+    <exe id="client" template="wx_sample" template_append="wx_append">
+        <sources>client.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>sockets.rc</win32-res>
+        <win32-res>client.rc</win32-res>
+    </exe>
+
+    <exe id="server" template="wx_sample" template_append="wx_append">
+        <sources>server.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
+        <win32-res>server.rc</win32-res>
     </exe>
 
 </makefile>
diff --git a/samples/taskbar/taskbar.bkl b/samples/taskbar/taskbar.bkl
index c702684725..757893e10b 100644
--- a/samples/taskbar/taskbar.bkl
+++ b/samples/taskbar/taskbar.bkl
@@ -4,10 +4,10 @@
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <exe id="taskbar" template="wx_sample" template_append="wx_append">
-        <sources>taskbar.cpp</sources>
+        <sources>tbtest.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        <win32-res>taskbar.rc</win32-res>
+        <win32-res>tbtest.rc</win32-res>
     </exe>
 
 </makefile>