diff --git a/hpvm/lib/Transforms/GenVISC/CMakeLists.txt b/hpvm/lib/Transforms/GenVISC/CMakeLists.txt
index 710e8f2729fc3149f744d0b5665ba3d5ea58121a..fc4c9fc5a98007dd700973c598b6731edcd61e14 100644
--- a/hpvm/lib/Transforms/GenVISC/CMakeLists.txt
+++ b/hpvm/lib/Transforms/GenVISC/CMakeLists.txt
@@ -2,8 +2,11 @@ if(WIN32 OR CYGWIN)
   set(LLVM_LINK_COMPONENTS Core Support)
 endif()
 
-add_llvm_loadable_module( LLVMGenVISC
-  GenVISC.cpp
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_BUILD_DIR=${PROJECT_BINARY_DIR}")
+
+add_llvm_library( LLVMGenHPVM
+  MODULE
+  GenHPVM.cpp
 
   DEPENDS
   intrinsics_gen
diff --git a/hpvm/lib/Transforms/GenVISC/GenVISC.cpp b/hpvm/lib/Transforms/GenVISC/GenHPVM.cpp
similarity index 100%
rename from hpvm/lib/Transforms/GenVISC/GenVISC.cpp
rename to hpvm/lib/Transforms/GenVISC/GenHPVM.cpp
diff --git a/hpvm/lib/Transforms/GenVISC/GenVISC.exports b/hpvm/lib/Transforms/GenVISC/GenHPVM.exports
similarity index 100%
rename from hpvm/lib/Transforms/GenVISC/GenVISC.exports
rename to hpvm/lib/Transforms/GenVISC/GenHPVM.exports
diff --git a/hpvm/lib/Transforms/GenVISC/LLVMBuild.txt b/hpvm/lib/Transforms/GenVISC/LLVMBuild.txt
index 9266b2c5972984a179beba227946964182761239..94ef73ac07ca5c1ff23a05e404b0ea1f751ef36c 100644
--- a/hpvm/lib/Transforms/GenVISC/LLVMBuild.txt
+++ b/hpvm/lib/Transforms/GenVISC/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Transforms/GenVISC/LLVMBuild.txt -------------------*- Conf -*--===;
+;===- ./lib/Transforms/GenHPVM/LLVMBuild.txt -------------------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,5 +17,5 @@
 
 [component_0]
 type = Library
-name = GenVISC
+name = GenHPVM
 parent = Transforms