diff --git a/src/libstd/rt/uv/net.rs b/src/libstd/rt/uv/net.rs
index 8c5f9fdbd4a5..dc766b2d7f88 100644
--- a/src/libstd/rt/uv/net.rs
+++ b/src/libstd/rt/uv/net.rs
@@ -37,7 +37,7 @@ pub fn ip4_as_uv_ip4<T>(addr: IpAddr, f: &fn(*sockaddr_in) -> T) -> T {
                 }
             }
         }
-        _ => fail!() // NOTE ipv6
+        _ => fail!() // TODO ipv6
     }
 }
 
@@ -279,7 +279,7 @@ impl UdpWatcher {
                     }
                 }
             }
-            _ => fail!() // NOTE ipv6
+            _ => fail!() // TODO ipv6
         }
     }
 
@@ -299,7 +299,7 @@ impl UdpWatcher {
             return (*alloc_cb)(suggested_size as uint);
         }
 
-        /* NOTE the socket address should actually be a pointer to
+        /* TODO the socket address should actually be a pointer to
            either a sockaddr_in or sockaddr_in6.
            In libuv, the udp_recv callback takes a struct *sockaddr */
         extern fn recv_cb(handle: *uvll::uv_udp_t, nread: ssize_t, buf: Buf,
@@ -336,7 +336,7 @@ impl UdpWatcher {
                     }
                 }
             }
-            _ => fail!() // NOTE ipv6
+            _ => fail!() // TODO ipv6
         }
 
         extern fn send_cb(req: *uvll::uv_udp_send_t, status: c_int) {
diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs
index 905087103fc0..1ae6cd8b17bb 100644
--- a/src/libstd/rt/uv/uvio.rs
+++ b/src/libstd/rt/uv/uvio.rs
@@ -481,7 +481,7 @@ impl RtioUdpSocket for UvUdpSocket {
             let task_cell = Cell::new(task);
             let alloc: AllocCallback = |_| unsafe { slice_to_uv_buf(*buf_ptr) };
             do self.recv_start(alloc) |watcher, nread, _buf, addr, flags, status| {
-                let _ = flags; // NOTE add handling for partials?
+                let _ = flags; // TODO add handling for partials?
 
                 watcher.recv_stop();