7 files changed, 13 insertions, 13 deletions
diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs
index e2c8ad31344..7a8946d02a6 100644
--- a/src/libstd/base64.rs
+++ b/src/libstd/base64.rs
@@ -1,6 +1,6 @@
 import io::{reader, reader_util};
 
-iface to_base64 {
+trait to_base64 {
     fn to_base64() -> ~str;
 }
 
@@ -58,7 +58,7 @@ impl of to_base64 for ~str {
     }
 }
 
-iface from_base64 {
+trait from_base64 {
     fn from_base64() -> ~[u8];
 }
 
diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs
index f71f991c9f8..408a8ca20c2 100644
--- a/src/libstd/deque.rs
+++ b/src/libstd/deque.rs
@@ -3,7 +3,7 @@
 import option::{some, none};
 import dvec::{dvec, extensions};
 
-iface t<T> {
+trait t<T> {
     fn size() -> uint;
     fn add_front(T);
     fn add_back(T);
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index ee265269872..6a08bb5d9e1 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -510,7 +510,7 @@ fn eq(value0: json, value1: json) -> bool {
     }
 }
 
-iface to_json { fn to_json() -> json; }
+trait to_json { fn to_json() -> json; }
 
 impl of to_json for json {
     fn to_json() -> json { self }
diff --git a/src/libstd/map.rs b/src/libstd/map.rs
index c660adc527f..846a2bfc700 100644
--- a/src/libstd/map.rs
+++ b/src/libstd/map.rs
@@ -24,7 +24,7 @@ type set<K> = hashmap<K, ()>;
 
 type hashmap<K, V> = chained::t<K, V>;
 
-iface map<K, V: copy> {
+trait map<K, V: copy> {
     /// Return the number of elements in the map
     fn size() -> uint;
 
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index d70d9b40de8..8bf35c8ee16 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -54,7 +54,7 @@ class tcp_socket {
  * A buffered wrapper for `net::tcp::tcp_socket`
  *
  * It is created with a call to `net::tcp::socket_buf()` and has impls that
- * satisfy both the `io::reader` and `io::writer` ifaces.
+ * satisfy both the `io::reader` and `io::writer` traits.
  */
 class tcp_socket_buf {
   let data: @tcp_buffered_socket_data;
@@ -764,7 +764,7 @@ impl tcp_socket for tcp_socket {
     }
 }
 
-/// Implementation of `io::reader` iface for a buffered `net::tcp::tcp_socket`
+/// Implementation of `io::reader` trait for a buffered `net::tcp::tcp_socket`
 impl tcp_socket_buf of io::reader for @tcp_socket_buf {
     fn read(buf: &[mut u8], len: uint) -> uint {
         // Loop until our buffer has enough data in it for us to read from.
@@ -817,7 +817,7 @@ impl tcp_socket_buf of io::reader for @tcp_socket_buf {
     }
 }
 
-/// Implementation of `io::reader` iface for a buffered `net::tcp::tcp_socket`
+/// Implementation of `io::reader` trait for a buffered `net::tcp::tcp_socket`
 impl tcp_socket_buf of io::writer for @tcp_socket_buf {
     fn write(data: &[const u8]) unsafe {
         let socket_data_ptr =
@@ -1083,11 +1083,11 @@ enum tcp_read_result {
     tcp_read_err(tcp_err_data)
 }
 
-iface to_tcp_err_iface {
+trait to_tcp_err {
     fn to_tcp_err() -> tcp_err_data;
 }
 
-impl of to_tcp_err_iface for uv::ll::uv_err_data {
+impl of to_tcp_err for uv::ll::uv_err_data {
     fn to_tcp_err() -> tcp_err_data {
         { err_name: self.err_name, err_msg: self.err_msg }
     }
diff --git a/src/libstd/serialization.rs b/src/libstd/serialization.rs
index ed9cf5570ce..5be0ac26d23 100644
--- a/src/libstd/serialization.rs
+++ b/src/libstd/serialization.rs
@@ -6,7 +6,7 @@ use core;
 Core serialization interfaces.
 */
 
-iface serializer {
+trait serializer {
     // Primitive types:
     fn emit_nil();
     fn emit_uint(v: uint);
@@ -39,7 +39,7 @@ iface serializer {
     fn emit_tup_elt(idx: uint, f: fn());
 }
 
-iface deserializer {
+trait deserializer {
     // Primitive types:
     fn read_nil() -> ();
 
diff --git a/src/libstd/sha1.rs b/src/libstd/sha1.rs
index 71f8fff2857..eef757f4516 100644
--- a/src/libstd/sha1.rs
+++ b/src/libstd/sha1.rs
@@ -20,7 +20,7 @@
 export sha1;
 
 /// The SHA-1 interface
-iface sha1 {
+trait sha1 {
     /// Provide message input as bytes
     fn input(~[u8]);
     /// Provide message input as string