4 files changed, 17 insertions, 13 deletions

diff --git a/samples/daytimeclnt.lua b/samples/daytimeclnt.lua
index 1107c6a..000dfd5 100644
--- a/samples/daytimeclnt.lua
+++ b/samples/daytimeclnt.lua
@@ -4,11 +4,11 @@ if arg then
     host = arg[1] or host
     port = arg[2] or port
 end
-host = toip(host)
-udp = udpsocket()
+host = socket.toip(host)
+udp = socket.udp()
 print("Using host '" ..host.. "' and port " ..port.. "...")
 err = udp:sendto("anything", host, port)
 if err then print(err) exit() end
 dgram, err = udp:receive()
 if not dgram then print(err) exit() end
-write(dgram)
+io.write(dgram)
diff --git a/samples/echoclnt.lua b/samples/echoclnt.lua
index 043b2f0..cd8b450 100644
--- a/samples/echoclnt.lua
+++ b/samples/echoclnt.lua
@@ -4,18 +4,18 @@ if arg then
     host = arg[1] or host
     port = arg[2] or port
 end
-host = toip(host)
-udp, err = udpsocket()
+host = socket.toip(host)
+udp, err = socket.udp()
 if not udp then print(err) exit() end
 err = udp:setpeername(host, port)
 if err then print(err) exit() end
 print("Using host '" ..host.. "' and port " .. port .. "...")
 while 1 do
-        line = read()
-        if not line then exit() end
+        line = io.read()
+        if not line then os.exit() end
         err = udp:send(line)
-        if err then print(err) exit() end
+        if err then print(err) os.exit() end
         dgram, err = udp:receive()
-        if not dgram then print(err) exit() end
+        if not dgram then print(err) os.exit() end
         print(dgram)
 end
diff --git a/samples/echosrvr.lua b/samples/echosrvr.lua
index 330f9e6..6117557 100644
--- a/samples/echosrvr.lua
+++ b/samples/echosrvr.lua
@@ -5,10 +5,10 @@ if arg then
     port = arg[2] or port
 end
 print("Binding to host '" ..host.. "' and port " ..port.. "...")
-udp, err = udpsocket()
-if not udp then print(err) exit() end
+udp, err = socket.udp()
+if not udp then print(err) os.exit() end
 err = udp:setsockname(host, port)
-if err then print(err) exit() end
+if err then print(err) os.exit() end
 udp:timeout(5)
 ip, port = udp:getsockname()
 print("Waiting packets on " .. ip .. ":" .. port .. "...")
diff --git a/samples/listener.lua b/samples/listener.lua
index 8e2c7ce..c035ab2 100644
--- a/samples/listener.lua
+++ b/samples/listener.lua
@@ -1,3 +1,7 @@
+-----------------------------------------------------------------------------

+-- Little program to dump lines received at a given port

+-- LuaSocket 1.5 sample files

+-----------------------------------------------------------------------------

 host = host or "*"

 port = port or 8080

 if arg then

@@ -5,7 +9,7 @@ if arg then
         port = arg[2] or port

 end

 print("Binding to host '" ..host.. "' and port " ..port.. "...")

-s, e = bind(host, port)

+s, e = socket.bind(host, port)

 if not s then

         print(e)

         exit()