diff --git a/hpvm/test/regressionTests/BuildDFG/CreateNode.genvisc.ll b/hpvm/test/regressionTests/BuildDFG/CreateNode.ll
similarity index 100%
rename from hpvm/test/regressionTests/BuildDFG/CreateNode.genvisc.ll
rename to hpvm/test/regressionTests/BuildDFG/CreateNode.ll
diff --git a/hpvm/test/regressionTests/BuildDFG/CreateNodeAndEdge.genvisc.ll b/hpvm/test/regressionTests/BuildDFG/CreateNodeAndEdge.ll
similarity index 100%
rename from hpvm/test/regressionTests/BuildDFG/CreateNodeAndEdge.genvisc.ll
rename to hpvm/test/regressionTests/BuildDFG/CreateNodeAndEdge.ll
diff --git a/hpvm/test/regressionTests/BuildDFG/LeafBindEdge.genvisc.ll b/hpvm/test/regressionTests/BuildDFG/LeafBindEdge.ll
similarity index 100%
rename from hpvm/test/regressionTests/BuildDFG/LeafBindEdge.genvisc.ll
rename to hpvm/test/regressionTests/BuildDFG/LeafBindEdge.ll
diff --git a/hpvm/test/regressionTests/BuildDFG/LeafNodeGetters.genvisc.ll b/hpvm/test/regressionTests/BuildDFG/LeafNodeGetters.ll
similarity index 100%
rename from hpvm/test/regressionTests/BuildDFG/LeafNodeGetters.genvisc.ll
rename to hpvm/test/regressionTests/BuildDFG/LeafNodeGetters.ll
diff --git a/hpvm/test/regressionTests/BuildDFG/ThreeLevel.genvisc.ll b/hpvm/test/regressionTests/BuildDFG/ThreeLevel.ll
similarity index 100%
rename from hpvm/test/regressionTests/BuildDFG/ThreeLevel.genvisc.ll
rename to hpvm/test/regressionTests/BuildDFG/ThreeLevel.ll
diff --git a/hpvm/test/regressionTests/BuildDFG/TwoLaunch.genvisc.ll b/hpvm/test/regressionTests/BuildDFG/TwoLaunch.ll
similarity index 100%
rename from hpvm/test/regressionTests/BuildDFG/TwoLaunch.genvisc.ll
rename to hpvm/test/regressionTests/BuildDFG/TwoLaunch.ll
diff --git a/hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.atomic.genvisc.ll b/hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.atomic.ll
similarity index 100%
rename from hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.atomic.genvisc.ll
rename to hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.atomic.ll
diff --git a/hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.opt.genvisc.ll b/hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.constmem.ll
similarity index 100%
rename from hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.opt.genvisc.ll
rename to hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.constmem.ll
diff --git a/hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.genvisc.ll b/hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.ll
similarity index 100%
rename from hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.genvisc.ll
rename to hpvm/test/regressionTests/DFG2LLVM_NVPTX/ThreeLevel.ll
diff --git a/hpvm/test/regressionTests/DFG2LLVM_X86/CreateNode.dfg.ll b/hpvm/test/regressionTests/DFG2LLVM_X86/OneLevel.codeGen.ll
similarity index 100%
rename from hpvm/test/regressionTests/DFG2LLVM_X86/CreateNode.dfg.ll
rename to hpvm/test/regressionTests/DFG2LLVM_X86/OneLevel.codeGen.ll
diff --git a/hpvm/test/regressionTests/DFG2LLVM_X86/oneLaunchAlloca.dfg.ll b/hpvm/test/regressionTests/DFG2LLVM_X86/OneRootBasic.ll
similarity index 100%
rename from hpvm/test/regressionTests/DFG2LLVM_X86/oneLaunchAlloca.dfg.ll
rename to hpvm/test/regressionTests/DFG2LLVM_X86/OneRootBasic.ll
diff --git a/hpvm/test/regressionTests/DFG2LLVM_X86/ThreeLevel.dfg.ll b/hpvm/test/regressionTests/DFG2LLVM_X86/ThreeLevel.codeGen.ll
similarity index 100%
rename from hpvm/test/regressionTests/DFG2LLVM_X86/ThreeLevel.dfg.ll
rename to hpvm/test/regressionTests/DFG2LLVM_X86/ThreeLevel.codeGen.ll
diff --git a/hpvm/test/regressionTests/DFG2LLVM_X86/TwoLevel.dfg.ll b/hpvm/test/regressionTests/DFG2LLVM_X86/TwoLevel.codeGen.ll
similarity index 100%
rename from hpvm/test/regressionTests/DFG2LLVM_X86/TwoLevel.dfg.ll
rename to hpvm/test/regressionTests/DFG2LLVM_X86/TwoLevel.codeGen.ll
diff --git a/hpvm/test/regressionTests/DFG2LLVM_X86/TwoLaunch.dfg.ll b/hpvm/test/regressionTests/DFG2LLVM_X86/TwoRoot.ll
similarity index 100%
rename from hpvm/test/regressionTests/DFG2LLVM_X86/TwoLaunch.dfg.ll
rename to hpvm/test/regressionTests/DFG2LLVM_X86/TwoRoot.ll
diff --git a/hpvm/test/regressionTests/GenVISC/AllocationNode.ll b/hpvm/test/regressionTests/GenHPVM/AllocationNode.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/AllocationNode.ll
rename to hpvm/test/regressionTests/GenHPVM/AllocationNode.ll
diff --git a/hpvm/test/regressionTests/GenVISC/CreateNode.ll b/hpvm/test/regressionTests/GenHPVM/CreateNode.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/CreateNode.ll
rename to hpvm/test/regressionTests/GenHPVM/CreateNode.ll
diff --git a/hpvm/test/regressionTests/GenVISC/CreateNodeAndEdge.ll b/hpvm/test/regressionTests/GenHPVM/CreateNodeAndEdge.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/CreateNodeAndEdge.ll
rename to hpvm/test/regressionTests/GenHPVM/CreateNodeAndEdge.ll
diff --git a/hpvm/test/regressionTests/GenVISC/LeafBindEdge.ll b/hpvm/test/regressionTests/GenHPVM/LeafBindEdge.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/LeafBindEdge.ll
rename to hpvm/test/regressionTests/GenHPVM/LeafBindEdge.ll
diff --git a/hpvm/test/regressionTests/GenVISC/LeafNodeGetters.ll b/hpvm/test/regressionTests/GenHPVM/LeafNodeGetters.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/LeafNodeGetters.ll
rename to hpvm/test/regressionTests/GenHPVM/LeafNodeGetters.ll
diff --git a/hpvm/test/regressionTests/GenVISC/PopAndPush.ll b/hpvm/test/regressionTests/GenHPVM/PopAndPush.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/PopAndPush.ll
rename to hpvm/test/regressionTests/GenHPVM/PopAndPush.ll
diff --git a/hpvm/test/regressionTests/GenVISC/ThreeLevel.ll b/hpvm/test/regressionTests/GenHPVM/ThreeLevel.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/ThreeLevel.ll
rename to hpvm/test/regressionTests/GenHPVM/ThreeLevel.ll
diff --git a/hpvm/test/regressionTests/GenVISC/ThreeLevelEdge.ll b/hpvm/test/regressionTests/GenHPVM/ThreeLevelEdge.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/ThreeLevelEdge.ll
rename to hpvm/test/regressionTests/GenHPVM/ThreeLevelEdge.ll
diff --git a/hpvm/test/regressionTests/GenVISC/TwoLaunch.ll b/hpvm/test/regressionTests/GenHPVM/TwoLaunch.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/TwoLaunch.ll
rename to hpvm/test/regressionTests/GenHPVM/TwoLaunch.ll
diff --git a/hpvm/test/regressionTests/GenVISC/TwoLevel.ll b/hpvm/test/regressionTests/GenHPVM/TwoLevel.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/TwoLevel.ll
rename to hpvm/test/regressionTests/GenHPVM/TwoLevel.ll
diff --git a/hpvm/test/regressionTests/GenVISC/oneLaunchAlloca.ll b/hpvm/test/regressionTests/GenHPVM/oneLaunchAlloca.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/oneLaunchAlloca.ll
rename to hpvm/test/regressionTests/GenHPVM/oneLaunchAlloca.ll
diff --git a/hpvm/test/regressionTests/GenVISC/oneLaunchMalloc.ll b/hpvm/test/regressionTests/GenHPVM/oneLaunchMalloc.ll
similarity index 100%
rename from hpvm/test/regressionTests/GenVISC/oneLaunchMalloc.ll
rename to hpvm/test/regressionTests/GenHPVM/oneLaunchMalloc.ll