diff --git a/llvm/test/Regression/CodeGen/X86/loop-hoist.ll b/llvm/test/Regression/CodeGen/X86/loop-hoist.ll
index 32ed381d57ba..f85b5f89833f 100644
--- a/llvm/test/Regression/CodeGen/X86/loop-hoist.ll
+++ b/llvm/test/Regression/CodeGen/X86/loop-hoist.ll
@@ -1,9 +1,9 @@
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 |\
-; RUN:   grep L_Arr.s.non_lazy_ptr &&
+; RUN:   grep L_Arr.non_lazy_ptr &&
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   llc -relocation-model=dynamic-no-pic -mtriple=i686-apple-darwin8.7.2 |\
-; RUN:   %prcontext L_Arr.s.non_lazy_ptr 1 | grep '4(%esp)'
+; RUN:   %prcontext L_Arr.non_lazy_ptr 1 | grep '4(%esp)'
 
 %Arr = external global [0 x int]                ; <[0 x int]*> [#uses=2]
 
diff --git a/llvm/test/Regression/CodeGen/X86/packed_struct.ll b/llvm/test/Regression/CodeGen/X86/packed_struct.ll
index c0aa64661675..172d0812b9a9 100644
--- a/llvm/test/Regression/CodeGen/X86/packed_struct.ll
+++ b/llvm/test/Regression/CodeGen/X86/packed_struct.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos.s+5" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos.s+1" &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos.s+9" &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos+5" &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos+1" &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "foos+9" &&
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "bara+19" &&
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep "bara+4"
 
diff --git a/llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll b/llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll
index a55a2233a6a9..7aeffdf22b59 100644
--- a/llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll
+++ b/llvm/test/Regression/Linker/2005-12-06-AppendingZeroLengthArrays.ll
@@ -1,7 +1,7 @@
 ; RUN: echo "%G = appending global [0 x int] zeroinitializer" | llvm-upgrade |\
 ; RUN:   llvm-as > %t.out2.bc
 ; RUN: llvm-upgrade < %s | llvm-as > %t.out1.bc
-; RUN: llvm-link %t.out[12].bc | llvm-dis | grep '%G.s ='
+; RUN: llvm-link %t.out[12].bc | llvm-dis | grep '%G ='
 
 ; When linked, the globals should be merged, and the result should still 
 ; be named '%G'.
diff --git a/llvm/test/Regression/Linker/weakextern.ll b/llvm/test/Regression/Linker/weakextern.ll
index 882c6f7c1440..3bda535d0ca5 100644
--- a/llvm/test/Regression/Linker/weakextern.ll
+++ b/llvm/test/Regression/Linker/weakextern.ll
@@ -1,9 +1,9 @@
 ; RUN: llvm-upgrade < %s | llvm-as > %t.bc
 ; RUN: llvm-upgrade < `dirname %s`/testlink1.ll | llvm-as > %t2.bc
 ; RUN: llvm-link %t.bc %t.bc %t2.bc -o %t1.bc -f
-; RUN: llvm-dis < %t1.bc | grep "kallsyms_names.u = extern_weak" &&
-; RUN: llvm-dis < %t1.bc | grep "MyVar.s = external global i32" &&
-; RUN: llvm-dis < %t1.bc | grep "Inte.s = global i32"
+; RUN: llvm-dis < %t1.bc | grep "kallsyms_names = extern_weak" &&
+; RUN: llvm-dis < %t1.bc | grep "MyVar = external global i32" &&
+; RUN: llvm-dis < %t1.bc | grep "Inte = global i32"
 
 %kallsyms_names = extern_weak global [0 x ubyte]
 %MyVar     = extern_weak global int
diff --git a/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll b/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll
index 86b73365f217..ea4483f38618 100644
--- a/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll
+++ b/llvm/test/Regression/Transforms/GlobalOpt/memcpy.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | \
-; RUN:   grep 'G1.s = internal constant'
+; RUN:   grep 'G1 = internal constant'
 
 %G1 = internal global [58 x sbyte] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"