diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs
index 52945c6765f..4e20195e1f9 100644
--- a/src/libstd/arena.rs
+++ b/src/libstd/arena.rs
@@ -1,5 +1,4 @@
 // Dynamic arenas.
-#[warn(non_camel_case_types)];
 
 // Arenas are used to quickly allocate objects that share a
 // lifetime. The arena uses ~[u8] vectors as a backing store to
diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs
index d0552c64c99..c8df4ba6078 100644
--- a/src/libstd/base64.rs
+++ b/src/libstd/base64.rs
@@ -1,6 +1,5 @@
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
-#[deny(non_camel_case_types)];
 import io::Reader;
 
 trait ToBase64 {
diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs
index 40066a1144c..5d21461eb49 100644
--- a/src/libstd/bitv.rs
+++ b/src/libstd/bitv.rs
@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 import vec::{to_mut, from_elem};
 
 export Bitv;
diff --git a/src/libstd/c_vec.rs b/src/libstd/c_vec.rs
index 6af7f71cb30..a7291ec27da 100644
--- a/src/libstd/c_vec.rs
+++ b/src/libstd/c_vec.rs
@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 /*!
  * Library to interface with chunks of memory allocated in C.
  *
diff --git a/src/libstd/cmp.rs b/src/libstd/cmp.rs
index 6484bf298d2..9b094f9215c 100644
--- a/src/libstd/cmp.rs
+++ b/src/libstd/cmp.rs
@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 /// Additional general-purpose comparison functionality.
diff --git a/src/libstd/comm.rs b/src/libstd/comm.rs
index 1a07fa850d5..87ade69a5f3 100644
--- a/src/libstd/comm.rs
+++ b/src/libstd/comm.rs
@@ -8,9 +8,6 @@ Higher level communication abstractions.
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 
-// Make sure we follow the new conventions
-#[forbid(non_camel_case_types)];
-
 import pipes::{Channel, Recv, Chan, Port, Selectable};
 
 export DuplexStream;
diff --git a/src/libstd/dbg.rs b/src/libstd/dbg.rs
index bc016823b51..d75fc75839f 100644
--- a/src/libstd/dbg.rs
+++ b/src/libstd/dbg.rs
@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 //! Unsafe debugging functions for inspecting values.
diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs
index 8a8b778d83a..9f63d18c562 100644
--- a/src/libstd/deque.rs
+++ b/src/libstd/deque.rs
@@ -1,5 +1,3 @@
-#[deny(non_camel_case_types)];
-
 //! A deque. Untested as of yet. Likely buggy
 
 import option::{Some, None};
diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index 068ad608e68..8f9987be348 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -1,5 +1,3 @@
-#[deny(non_camel_case_types)];
-
 // Simple Extensible Binary Markup Language (ebml) reader and writer on a
 // cursor model. See the specification here:
 //     http://www.matroska.org/technical/specs/rfc/index.html
diff --git a/src/libstd/fun_treemap.rs b/src/libstd/fun_treemap.rs
index 2cd5f8e24d1..8ece067b904 100644
--- a/src/libstd/fun_treemap.rs
+++ b/src/libstd/fun_treemap.rs
@@ -1,4 +1,3 @@
-#[deny(non_camel_case_types)];
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 
diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs
index 8d003712d6d..1db21e0ef37 100644
--- a/src/libstd/getopts.rs
+++ b/src/libstd/getopts.rs
@@ -1,5 +1,3 @@
-#[deny(non_camel_case_types)];
-
 /*!
  * Simple getopt alternative.
  *
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 6dca7701bf7..a3f3ae9b70e 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -1,5 +1,3 @@
-#[deny(non_camel_case_types)];
-
 // Rust JSON serialization library
 // Copyright (c) 2011 Google Inc.
 
diff --git a/src/libstd/std.rc b/src/libstd/std.rc
index f8a61cda0de..76e0dc183b4 100644
--- a/src/libstd/std.rc
+++ b/src/libstd/std.rc
@@ -11,6 +11,8 @@
 #[no_core];
 
 #[allow(vecs_implicitly_copyable)];
+// XXX: deny after snapshot
+#[warn(non_camel_case_types)];
 
 use core(vers = "0.4");
 import core::*;
@@ -30,41 +32,28 @@ export cell;
 
 // General io and system-services modules
 
-#[warn(non_camel_case_types)]
 mod net;
-#[warn(non_camel_case_types)]
 mod net_ip;
-#[warn(non_camel_case_types)]
 mod net_tcp;
-#[warn(non_camel_case_types)]
 mod net_url;
 
 // libuv modules
-#[warn(non_camel_case_types)]
 mod uv;
 mod uv_ll;
-#[warn(non_camel_case_types)]
 mod uv_iotask;
-#[warn(non_camel_case_types)]
 mod uv_global_loop;
 
 
 // Utility modules
 
-#[warn(non_camel_case_types)]
 mod c_vec;
-#[warn(non_camel_case_types)]
 mod timer;
-#[warn(non_camel_case_types)]
 mod cell;
 
 // Concurrency
 
-#[warn(non_camel_case_types)]
 mod sync;
-#[warn(non_camel_case_types)]
 mod arc;
-#[warn(non_camel_case_types)]
 mod comm;
 
 // Collections
@@ -73,41 +62,32 @@ mod bitv;
 mod deque;
 mod fun_treemap;
 mod list;
+#[allow(non_camel_case_types)] // XXX
 mod map;
+#[allow(non_camel_case_types)] // XXX
 mod rope;
+#[allow(non_camel_case_types)] // XXX
 mod smallintmap;
+#[allow(non_camel_case_types)] // XXX
 mod sort;
+#[allow(non_camel_case_types)] // XXX
 mod treemap;
 
 // And ... other stuff
 
-#[warn(non_camel_case_types)]
 mod ebml;
-#[warn(non_camel_case_types)]
 mod dbg;
-#[warn(non_camel_case_types)]
 mod getopts;
-#[warn(non_camel_case_types)]
 mod json;
-#[warn(non_camel_case_types)]
 mod sha1;
-#[warn(non_camel_case_types)]
 mod md4;
-#[warn(non_camel_case_types)]
 mod tempfile;
-#[warn(non_camel_case_types)]
 mod term;
-#[warn(non_camel_case_types)]
 mod time;
-#[warn(non_camel_case_types)]
 mod prettyprint;
-#[warn(non_camel_case_types)]
 mod arena;
-#[warn(non_camel_case_types)]
 mod par;
-#[warn(non_camel_case_types)]
 mod cmp;
-#[warn(non_camel_case_types)]
 mod base64;
 
 #[cfg(unicode)]
@@ -116,7 +96,9 @@ mod unicode;
 
 // Compiler support modules
 
+#[allow(non_camel_case_types)] // XXX
 mod test;
+#[allow(non_camel_case_types)] // XXX
 mod serialization;
 
 // Local Variables:
diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index 589c36f4344..b9331ad254a 100644
--- a/src/libstd/uv_ll.rs
+++ b/src/libstd/uv_ll.rs
@@ -20,7 +20,7 @@
  * with per-platform, generated source files from rust-bindgen.
  */
 
-#[allow(non_camel_case_types)] // C types
+#[allow(non_camel_case_types)]; // C types
 
 import libc::size_t;
 import comm = core::comm;