diff --git a/test/Sema/bitfield.c b/test/Sema/bitfield.c
index 655f741..581af6d 100644
--- a/test/Sema/bitfield.c
+++ b/test/Sema/bitfield.c
@@ -21,7 +21,7 @@
   int g : (_Bool)1;
   
   // PR4017  
-  char : 10;      // expected-error {{size of anonymous bitfield exceeds size of its type (8 bits)}}
+  char : 10;      // expected-error {{size of anonymous bit-field exceeds size of its type (8 bits)}}
   unsigned : -2;  // expected-error {{anonymous bit-field has negative width (-2)}}
   float : 12;     // expected-error {{anonymous bit-field has non-integral type 'float'}}
 };
diff --git a/test/Sema/exprs.c b/test/Sema/exprs.c
index faa6c28..69a2320 100644
--- a/test/Sema/exprs.c
+++ b/test/Sema/exprs.c
@@ -60,9 +60,9 @@
 struct f { int x : 4;  float y[]; };
 int test9(struct f *P) {
   int R;
-  R = __alignof(P->x);  // expected-error {{invalid application of '__alignof' to bitfield}}
+  R = __alignof(P->x);  // expected-error {{invalid application of '__alignof' to bit-field}}
   R = __alignof(P->y);   // ok.
-  R = sizeof(P->x); // expected-error {{invalid application of 'sizeof' to bitfield}}
+  R = sizeof(P->x); // expected-error {{invalid application of 'sizeof' to bit-field}}
   return R;
 }
 
diff --git a/test/SemaObjC/class-bitfield.m b/test/SemaObjC/class-bitfield.m
index 01b5324..8220912 100644
--- a/test/SemaObjC/class-bitfield.m
+++ b/test/SemaObjC/class-bitfield.m
@@ -20,7 +20,7 @@
 }
 @end
 
-@interface WithBitfields: Base {
+@interface WithBitFields: Base {
   void *isa; // expected-note {{previous definition is here}}
   unsigned a: 5;
   signed b: 4;
@@ -28,10 +28,10 @@
 }
 @end
 
-@implementation WithBitfields {
+@implementation WithBitFields {
   char *isa;  // expected-error {{instance variable 'isa' has conflicting type: 'char *' vs 'void *'}}
   unsigned a: 5;  
   signed b: 4; 
-  int c: 3;  // expected-error {{instance variable 'c' has conflicting bitfield width}}
+  int c: 3;  // expected-error {{instance variable 'c' has conflicting bit-field width}}
 }
 @end