diff --git a/src/test/debug-info/simple-struct.rs b/src/test/debug-info/simple-struct.rs
index 64cfe4a4e23..49e7bc255c1 100644
--- a/src/test/debug-info/simple-struct.rs
+++ b/src/test/debug-info/simple-struct.rs
@@ -16,22 +16,22 @@
 // debugger:run
 // debugger:finish
 
-// debugger:print noPadding16
+// debugger:print no_padding16
 // check:$1 = {x = 10000, y = -10001}
 
-// debugger:print noPadding32
+// debugger:print no_padding32
 // check:$2 = {x = -10002, y = -10003.5, z = 10004}
 
-// debugger:print noPadding64
+// debugger:print no_padding64
 // check:$3 = {x = -10005.5, y = 10006, z = 10007}
 
-// debugger:print noPadding163264
+// debugger:print no_padding163264
 // check:$4 = {a = -10008, b = 10009, c = 10010, d = 10011}
 
-// debugger:print internalPadding
+// debugger:print internal_padding
 // check:$5 = {x = 10012, y = -10013}
 
-// debugger:print paddingAtEnd
+// debugger:print padding_at_end
 // check:$6 = {x = -10014, y = 10015}
 
 
@@ -39,7 +39,7 @@ struct NoPadding16 {
     x: u16,
     y: i16
 }
- 
+
 struct NoPadding32 {
     x: i32,
     y: f32,
@@ -70,13 +70,13 @@ struct PaddingAtEnd {
 }
 
 fn main() {
-    let noPadding16 = NoPadding16 { x: 10000, y: -10001 };
-    let noPadding32 = NoPadding32 { x: -10002, y: -10003.5, z: 10004 };
-    let noPadding64 = NoPadding64 { x: -10005.5, y: 10006, z: 10007 };
-    let noPadding163264 = NoPadding163264 { a: -10008, b: 10009, c: 10010, d: 10011 };
- 
-    let internalPadding = InternalPadding { x: 10012, y: -10013 };
-    let paddingAtEnd = PaddingAtEnd { x: -10014, y: 10015 };
+    let no_padding16 = NoPadding16 { x: 10000, y: -10001 };
+    let no_padding32 = NoPadding32 { x: -10002, y: -10003.5, z: 10004 };
+    let no_padding64 = NoPadding64 { x: -10005.5, y: 10006, z: 10007 };
+    let no_padding163264 = NoPadding163264 { a: -10008, b: 10009, c: 10010, d: 10011 };
+
+    let internal_padding = InternalPadding { x: 10012, y: -10013 };
+    let padding_at_end = PaddingAtEnd { x: -10014, y: 10015 };
 
     zzz();
 }
diff --git a/src/test/debug-info/struct-in-struct.rs b/src/test/debug-info/struct-in-struct.rs
index a74eb727dc0..cfd8c24caa2 100644
--- a/src/test/debug-info/struct-in-struct.rs
+++ b/src/test/debug-info/struct-in-struct.rs
@@ -55,7 +55,7 @@ struct InternalPaddingParent {
 struct PaddingAtEndParent {
     x: PaddingAtEnd,
     y: PaddingAtEnd,
-    z: PaddingAtEnd   
+    z: PaddingAtEnd
 }
 
 struct Mixed {
@@ -84,7 +84,7 @@ struct Tree {
 }
 
 fn main() {
-   
+
     let three_simple_structs = ThreeSimpleStructs {
         x: Simple { x: 1 },
         y: Simple { x: 2 },
@@ -100,7 +100,7 @@ fn main() {
     let padding_at_end_parent = PaddingAtEndParent {
         x: PaddingAtEnd { x: 10, y: 11 },
         y: PaddingAtEnd { x: 12, y: 13 },
-        z: PaddingAtEnd { x: 14, y: 15 }   
+        z: PaddingAtEnd { x: 14, y: 15 }
     };
 
     let mixed = Mixed {
@@ -111,22 +111,22 @@ fn main() {
     };
 
     let bag = Bag { x: Simple { x: 22 } };
-    let bag_in_bag = BagInBag 
+    let bag_in_bag = BagInBag
     {
-        x: Bag 
+        x: Bag
         {
-            x: Simple { x: 23 } 
-        } 
+            x: Simple { x: 23 }
+        }
     };
 
-    let tjo = ThatsJustOverkill 
+    let tjo = ThatsJustOverkill
     {
-        x: BagInBag 
+        x: BagInBag
         {
-            x: Bag 
+            x: Bag
             {
-                x: Simple { x: 24 } 
-            } 
+                x: Simple { x: 24 }
+            }
         }
     };
 
@@ -138,12 +138,12 @@ fn main() {
             y: InternalPadding { x: 28, y: 29 },
             z: InternalPadding { x: 30, y: 31 }
         },
-        z: BagInBag 
+        z: BagInBag
         {
-            x: Bag 
+            x: Bag
             {
-                x: Simple { x: 32 } 
-            } 
+                x: Simple { x: 32 }
+            }
         }
     };
 
diff --git a/src/test/debug-info/tuple-in-struct.rs b/src/test/debug-info/tuple-in-struct.rs
index 1ad4d7c069e..369c9fd28cc 100644
--- a/src/test/debug-info/tuple-in-struct.rs
+++ b/src/test/debug-info/tuple-in-struct.rs
@@ -16,29 +16,29 @@
 // debugger:run
 // debugger:finish
 
-// debugger:print noPadding1
+// debugger:print no_padding1
 // check:$1 = {x = {0, 1}, y = 2, z = {3, 4, 5}}
-// debugger:print noPadding2
+// debugger:print no_padding2
 // check:$2 = {x = {6, 7}, y = {{8, 9}, 10}}
 
-// debugger:print tupleInternalPadding
+// debugger:print tuple_internal_padding
 // check:$3 = {x = {11, 12}, y = {13, 14}}
-// debugger:print structInternalPadding
+// debugger:print struct_internal_padding
 // check:$4 = {x = {15, 16}, y = {17, 18}}
-// debugger:print bothInternallyPadded
+// debugger:print both_internally_padded
 // check:$5 = {x = {19, 20, 21}, y = {22, 23}}
 
-// debugger:print singleTuple
+// debugger:print single_tuple
 // check:$6 = {x = {24, 25, 26}}
 
-// debugger:print tuplePaddedAtEnd
+// debugger:print tuple_padded_at_end
 // check:$7 = {x = {27, 28}, y = {29, 30}}
-// debugger:print structPaddedAtEnd
+// debugger:print struct_padded_at_end
 // check:$8 = {x = {31, 32}, y = {33, 34}}
-// debugger:print bothPaddedAtEnd
+// debugger:print both_padded_at_end
 // check:$9 = {x = {35, 36, 37}, y = {38, 39}}
 
-// debugger:print mixedPadding
+// debugger:print mixed_padding
 // check:$10 = {x = {{40, 41, 42}, {43, 44}}, y = {45, 46, 47, 48}}
 
 struct NoPadding1 {
@@ -95,52 +95,52 @@ struct MixedPadding {
 
 
 fn main() {
-    let noPadding1 = NoPadding1 {
+    let no_padding1 = NoPadding1 {
         x: (0, 1),
         y: 2,
         z: (3, 4, 5)
     };
 
-    let noPadding2 = NoPadding2 {
+    let no_padding2 = NoPadding2 {
         x: (6, 7),
         y: ((8, 9), 10)
     };
 
-    let tupleInternalPadding = TupleInternalPadding {
+    let tuple_internal_padding = TupleInternalPadding {
         x: (11, 12),
         y: (13, 14)
     };
 
-    let structInternalPadding = StructInternalPadding {
+    let struct_internal_padding = StructInternalPadding {
         x: (15, 16),
         y: (17, 18)
     };
 
-    let bothInternallyPadded = BothInternallyPadded {
+    let both_internally_padded = BothInternallyPadded {
         x: (19, 20, 21),
         y: (22, 23)
     };
 
-    let singleTuple = SingleTuple {
+    let single_tuple = SingleTuple {
         x: (24, 25, 26)
     };
 
-    let tuplePaddedAtEnd = TuplePaddedAtEnd {
+    let tuple_padded_at_end = TuplePaddedAtEnd {
         x: (27, 28),
         y: (29, 30)
     };
 
-    let structPaddedAtEnd = StructPaddedAtEnd {
+    let struct_padded_at_end = StructPaddedAtEnd {
         x: (31, 32),
         y: (33, 34)
     };
 
-    let bothPaddedAtEnd = BothPaddedAtEnd {
+    let both_padded_at_end = BothPaddedAtEnd {
         x: (35, 36, 37),
         y: (38, 39)
     };
 
-    let mixedPadding = MixedPadding {
+    let mixed_padding = MixedPadding {
         x: ((40, 41, 42), (43, 44)),
         y: (45, 46, 47, 48)
     };
diff --git a/src/test/debug-info/tuple-in-tuple.rs b/src/test/debug-info/tuple-in-tuple.rs
index f500ecef132..13f8719694e 100644
--- a/src/test/debug-info/tuple-in-tuple.rs
+++ b/src/test/debug-info/tuple-in-tuple.rs
@@ -16,33 +16,33 @@
 // debugger:run
 // debugger:finish
 
-// debugger:print noPadding1
+// debugger:print no_padding1
 // check:$1 = {{0, 1}, 2, 3}
-// debugger:print noPadding2
+// debugger:print no_padding2
 // check:$2 = {4, {5, 6}, 7}
-// debugger:print noPadding3
+// debugger:print no_padding3
 // check:$3 = {8, 9, {10, 11}}
 
-// debugger:print internalPadding1
+// debugger:print internal_padding1
 // check:$4 = {12, {13, 14}}
-// debugger:print internalPadding2
+// debugger:print internal_padding2
 // check:$5 = {15, {16, 17}}
 
-// debugger:print paddingAtEnd1
+// debugger:print padding_at_end1
 // check:$6 = {18, {19, 20}}
-// debugger:print paddingAtEnd2
+// debugger:print padding_at_end2
 // check:$7 = {{21, 22}, 23}
 
 fn main() {
-    let noPadding1 : ((u32, u32), u32, u32) = ((0, 1), 2, 3);
-    let noPadding2 : (u32, (u32, u32), u32) = (4, (5, 6), 7);
-    let noPadding3 : (u32, u32, (u32, u32)) = (8, 9, (10, 11));
+    let no_padding1 : ((u32, u32), u32, u32) = ((0, 1), 2, 3);
+    let no_padding2 : (u32, (u32, u32), u32) = (4, (5, 6), 7);
+    let no_padding3 : (u32, u32, (u32, u32)) = (8, 9, (10, 11));
 
-    let internalPadding1 : (i16, (i32, i32)) = (12, (13, 14));
-    let internalPadding2 : (i16, (i16, i32)) = (15, (16, 17));
+    let internal_padding1 : (i16, (i32, i32)) = (12, (13, 14));
+    let internal_padding2 : (i16, (i16, i32)) = (15, (16, 17));
 
-    let paddingAtEnd1 : (i32, (i32, i16)) = (18, (19, 20));
-    let paddingAtEnd2 : ((i32, i16), i32) = ((21, 22), 23);
+    let padding_at_end1 : (i32, (i32, i16)) = (18, (19, 20));
+    let padding_at_end2 : ((i32, i16), i32) = ((21, 22), 23);
 
     zzz();
 }