diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 3d47b1141ddd..c9d61be6b0eb 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -436,7 +436,7 @@ fn mk_fresh_ident_interner() -> @ident_interner {
         "blk",                // 26
         "static",             // 27
         "__foreign_mod__",    // 28
-        "__field__",          // 29
+        "<unnamed_field>",    // 29
         "C",                  // 30
         "Self",               // 31
 
diff --git a/src/test/debug-info/tuple-struct.rs b/src/test/debug-info/tuple-struct.rs
index 1368053f48cb..762b8dcb38f4 100644
--- a/src/test/debug-info/tuple-struct.rs
+++ b/src/test/debug-info/tuple-struct.rs
@@ -34,7 +34,8 @@
 
 
 // This test case mainly makes sure that no field names are generated for tuple structs (as opposed
-// to all fields having the name "__field__"). Otherwise they are handled the same a normal structs.
+// to all fields having the name "<unnamed_field>"). Otherwise they are handled the same a normal
+// structs.
 
 struct NoPadding16(u16, i16);
 struct NoPadding32(i32, f32, u32);