diff --git a/llvm/test/Linker/2003-05-15-TypeProblem.ll b/llvm/test/Linker/2003-05-15-TypeProblem.ll
index e914a69e34fb..18fcea00a13c 100644
--- a/llvm/test/Linker/2003-05-15-TypeProblem.ll
+++ b/llvm/test/Linker/2003-05-15-TypeProblem.ll
@@ -1,10 +1,10 @@
 ; This one fails because the LLVM runtime is allowing two null pointers of
 ; the same type to be created!
 
-; RUN: echo {%S = type \{ %T*\} %T = type opaque} | llvm-as > %t.2.bc
+; RUN: echo {%M = type \{ %N*\} %N = type opaque} | llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc
 
-%S = type { i32* }
-%T = type i32
+%M = type { i32* }
+%N = type i32
 
diff --git a/llvm/test/Linker/2003-08-20-OpaqueTypeResolve.ll b/llvm/test/Linker/2003-08-20-OpaqueTypeResolve.ll
index a4d4bd543abe..c0fc620cfa67 100644
--- a/llvm/test/Linker/2003-08-20-OpaqueTypeResolve.ll
+++ b/llvm/test/Linker/2003-08-20-OpaqueTypeResolve.ll
@@ -1,8 +1,8 @@
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo {%S = type \{ i32, i32* \} } | llvm-as > %t.out2.bc
+; RUN: echo {%M = type \{ i32, i32* \} } | llvm-as > %t.out2.bc
 ; RUN: llvm-link %t.out1.bc %t.out2.bc
 
-%S = type { i32, %T* }
-%T = type opaque
+%M = type { i32, %N* }
+%N = type opaque
 
-;%X = global { int, %T* } { int 5, %T* null }
+;%X = global { int, %N* } { int 5, %N* null }
diff --git a/llvm/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll b/llvm/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll
index 5041467604ae..ea8207530794 100644
--- a/llvm/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll
+++ b/llvm/test/Linker/2003-08-23-RecursiveOpaqueTypeResolve.ll
@@ -2,8 +2,8 @@
 ; net.
 
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type { %S*, i32* }" | llvm-as > %t.out2.bc
+; RUN: echo "%M = type { %M*, i32* }" | llvm-as > %t.out2.bc
 ; RUN: llvm-link %t.out1.bc %t.out2.bc
 
-%S = type { %S*, opaque* }
+%M = type { %M*, opaque* }
 
diff --git a/llvm/test/Linker/2003-08-28-TypeResolvesGlobal.ll b/llvm/test/Linker/2003-08-28-TypeResolvesGlobal.ll
index 5526b87ce77d..80b616269940 100644
--- a/llvm/test/Linker/2003-08-28-TypeResolvesGlobal.ll
+++ b/llvm/test/Linker/2003-08-28-TypeResolvesGlobal.ll
@@ -1,12 +1,12 @@
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type i32" | llvm-as > %t.out2.bc
+; RUN: echo "%M = type i32" | llvm-as > %t.out2.bc
 ; RUN: llvm-link %t.out2.bc %t.out1.bc
 
-%S = type opaque
+%M = type opaque
 
 define void @foo(i32* %V) {
 	ret void
 }
 
-declare void @foo.upgrd.1(%S*)
+declare void @foo.upgrd.1(%M*)
 
diff --git a/llvm/test/Linker/2003-08-28-TypeResolvesGlobal2.ll b/llvm/test/Linker/2003-08-28-TypeResolvesGlobal2.ll
index 3f306b167b1d..601b917210d5 100644
--- a/llvm/test/Linker/2003-08-28-TypeResolvesGlobal2.ll
+++ b/llvm/test/Linker/2003-08-28-TypeResolvesGlobal2.ll
@@ -1,17 +1,17 @@
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type i32" | llvm-as > %t.out2.bc
+; RUN: echo "%M = type i32" | llvm-as > %t.out2.bc
 ; RUN: llvm-link %t.out2.bc %t.out1.bc
 
-%S = type opaque
+%M = type opaque
 
 define void @foo(i32* %V) {
 	ret void
 }
 
-declare void @foo.upgrd.1(%S*)
+declare void @foo.upgrd.1(%M*)
 
 define void @other() {
-	call void @foo.upgrd.1( %S* null )
+	call void @foo.upgrd.1( %M* null )
 	call void @foo( i32* null )
 	ret void
 }
diff --git a/llvm/test/Linker/2003-08-28-TypeResolvesGlobal3.ll b/llvm/test/Linker/2003-08-28-TypeResolvesGlobal3.ll
index 38b7851ab860..f77d9e6d3b96 100644
--- a/llvm/test/Linker/2003-08-28-TypeResolvesGlobal3.ll
+++ b/llvm/test/Linker/2003-08-28-TypeResolvesGlobal3.ll
@@ -1,15 +1,15 @@
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo "%S = type i32" | llvm-as > %t.out2.bc
+; RUN: echo "%M = type i32" | llvm-as > %t.out2.bc
 ; RUN: llvm-link %t.out2.bc %t.out1.bc
 
-%S = type opaque
+%M = type opaque
 
 ; GLobal using the resolved function prototype
-global void (%S*)* @foo		; <void (%S*)**>:0 [#uses=0]
+global void (%M*)* @foo		; <void (%M*)**>:0 [#uses=0]
 
 define void @foo.upgrd.1(i32* %V) {
 	ret void
 }
 
-declare void @foo(%S*)
+declare void @foo(%M*)
 
diff --git a/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll b/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
index 4f98a2003253..c1f3fc45f757 100644
--- a/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
+++ b/llvm/test/Linker/2003-10-21-ConflictingTypesTolerance.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo { %S = type \[8 x i32\] external global %S } | llvm-as > %t.out2.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep %S | grep \\{
-%S = type { i32 }
+; RUN: echo { %M = type \[8 x i32\] external global %M } | llvm-as > %t.out2.bc
+; RUN: llvm-link %t.out1.bc %t.out2.bc | llvm-dis | grep %M | grep \\{
+%M = type { i32 }