diff --git a/hpvm/include/GenVISC/GenVISC.h b/hpvm/include/GenHPVM/GenHPVM.h
similarity index 100%
rename from hpvm/include/GenVISC/GenVISC.h
rename to hpvm/include/GenHPVM/GenHPVM.h
diff --git a/hpvm/include/SupportVISC/DFG2LLVM.h b/hpvm/include/SupportHPVM/DFG2LLVM.h
similarity index 100%
rename from hpvm/include/SupportVISC/DFG2LLVM.h
rename to hpvm/include/SupportHPVM/DFG2LLVM.h
diff --git a/hpvm/include/SupportVISC/DFGTreeTraversal.h b/hpvm/include/SupportHPVM/DFGTreeTraversal.h
similarity index 100%
rename from hpvm/include/SupportVISC/DFGTreeTraversal.h
rename to hpvm/include/SupportHPVM/DFGTreeTraversal.h
diff --git a/hpvm/include/SupportVISC/DFGraph.h b/hpvm/include/SupportHPVM/DFGraph.h
similarity index 100%
rename from hpvm/include/SupportVISC/DFGraph.h
rename to hpvm/include/SupportHPVM/DFGraph.h
diff --git a/hpvm/include/SupportVISC/VISCHint.h b/hpvm/include/SupportHPVM/HPVMHint.h
similarity index 100%
rename from hpvm/include/SupportVISC/VISCHint.h
rename to hpvm/include/SupportHPVM/HPVMHint.h
diff --git a/hpvm/include/SupportVISC/VISCTimer.h b/hpvm/include/SupportHPVM/HPVMTimer.h
similarity index 100%
rename from hpvm/include/SupportVISC/VISCTimer.h
rename to hpvm/include/SupportHPVM/HPVMTimer.h
diff --git a/hpvm/include/SupportVISC/VISCUtils.h b/hpvm/include/SupportHPVM/HPVMUtils.h
similarity index 100%
rename from hpvm/include/SupportVISC/VISCUtils.h
rename to hpvm/include/SupportHPVM/HPVMUtils.h
diff --git a/hpvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt b/hpvm/lib/Transforms/DFG2LLVM_CPU/CMakeLists.txt
similarity index 100%
rename from hpvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt
rename to hpvm/lib/Transforms/DFG2LLVM_CPU/CMakeLists.txt
diff --git a/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp b/hpvm/lib/Transforms/DFG2LLVM_CPU/DFG2LLVM_CPU.cpp
similarity index 100%
rename from hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
rename to hpvm/lib/Transforms/DFG2LLVM_CPU/DFG2LLVM_CPU.cpp
diff --git a/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports b/hpvm/lib/Transforms/DFG2LLVM_CPU/DFG2LLVM_CPU.exports
similarity index 100%
rename from hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports
rename to hpvm/lib/Transforms/DFG2LLVM_CPU/DFG2LLVM_CPU.exports
diff --git a/hpvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt b/hpvm/lib/Transforms/DFG2LLVM_CPU/LLVMBuild.txt
similarity index 100%
rename from hpvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt
rename to hpvm/lib/Transforms/DFG2LLVM_CPU/LLVMBuild.txt
diff --git a/hpvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt b/hpvm/lib/Transforms/DFG2LLVM_OpenCL/CMakeLists.txt
similarity index 100%
rename from hpvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt
rename to hpvm/lib/Transforms/DFG2LLVM_OpenCL/CMakeLists.txt
diff --git a/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp b/hpvm/lib/Transforms/DFG2LLVM_OpenCL/DFG2LLVM_OpenCL.cpp
similarity index 100%
rename from hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
rename to hpvm/lib/Transforms/DFG2LLVM_OpenCL/DFG2LLVM_OpenCL.cpp
diff --git a/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports b/hpvm/lib/Transforms/DFG2LLVM_OpenCL/DFG2LLVM_OpenCL.exports
similarity index 100%
rename from hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports
rename to hpvm/lib/Transforms/DFG2LLVM_OpenCL/DFG2LLVM_OpenCL.exports
diff --git a/hpvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt b/hpvm/lib/Transforms/DFG2LLVM_OpenCL/LLVMBuild.txt
similarity index 100%
rename from hpvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt
rename to hpvm/lib/Transforms/DFG2LLVM_OpenCL/LLVMBuild.txt