diff --git a/src/rustc/middle/lint.rs b/src/rustc/middle/lint.rs
index a10504a987a..889bd085e33 100644
--- a/src/rustc/middle/lint.rs
+++ b/src/rustc/middle/lint.rs
@@ -156,7 +156,7 @@ fn get_lint_dict() -> lint_dict {
 
         (~"non_camel_case_types",
          @{lint: non_camel_case_types,
-           desc: ~"types, variants and traits must have camel case names",
+           desc: ~"types, variants and traits should have camel case names",
            default: warn}),
 
         (~"managed_heap_memory",
@@ -605,7 +605,8 @@ fn check_item_non_camel_case_types(cx: ty::ctxt, it: @ast::item) {
         if !is_camel_case(cx, ident) {
             cx.sess.span_lint(
                 non_camel_case_types, expr_id, item_id, span,
-                ~"type, variant, or trait must be camel case");
+                ~"type, variant, or trait should have \
+                  a camel case identifier");
         }
     }
 
diff --git a/src/test/compile-fail/lint-non-camel-case-types.rs b/src/test/compile-fail/lint-non-camel-case-types.rs
index 04dc2cebdb6..6d9777fda42 100644
--- a/src/test/compile-fail/lint-non-camel-case-types.rs
+++ b/src/test/compile-fail/lint-non-camel-case-types.rs
@@ -1,24 +1,24 @@
 #[forbid(non_camel_case_types)];
 
-struct foo { //~ ERROR type, variant, or trait must be camel case
+struct foo { //~ ERROR type, variant, or trait should have a camel case identifier
     bar: int,
 }
 
-enum foo2 { //~ ERROR type, variant, or trait must be camel case
+enum foo2 { //~ ERROR type, variant, or trait should have a camel case identifier
     Bar
 }
 
-struct foo3 { //~ ERROR type, variant, or trait must be camel case
+struct foo3 { //~ ERROR type, variant, or trait should have a camel case identifier
     bar: int
 }
 
-type foo4 = int; //~ ERROR type, variant, or trait must be camel case
+type foo4 = int; //~ ERROR type, variant, or trait should have a camel case identifier
 
 enum Foo5 {
-    bar //~ ERROR type, variant, or trait must be camel case
+    bar //~ ERROR type, variant, or trait should have a camel case identifier
 }
 
-trait foo6 { //~ ERROR type, variant, or trait must be camel case
+trait foo6 { //~ ERROR type, variant, or trait should have a camel case identifier
 }
 
 fn main() { }
\ No newline at end of file