diff --git a/cr_generate_id_private.h b/cr_generate_id_private.h
index fa53abd..a56d7c8 100644
--- a/cr_generate_id_private.h
+++ b/cr_generate_id_private.h
@@ -122,8 +122,6 @@ extern "C" {
 #include "nfkm.h"
 #include "rqcard-applic.h"
 #include "rqcard-fips.h"
-// nShield optional
-#include "simplebignum.h"
 #endif // USE_HSM
 
 #include <openssl/err.h>
diff --git a/cr_hsm_alloc.c b/cr_hsm_alloc.c
index bbe770d..f4bfd0c 100644
--- a/cr_hsm_alloc.c
+++ b/cr_hsm_alloc.c
@@ -13,7 +13,7 @@
 
 #include "nfastapp.h"
 #include "nfutil.h"
-#include "my_hsm_alloc.h"
+#include "cr_hsm_alloc.h"
 
 /* --------------------- */
 
diff --git a/cr_hsm_alloc.h b/cr_hsm_alloc.h
index 91a39ff..c7c85a6 100644
--- a/cr_hsm_alloc.h
+++ b/cr_hsm_alloc.h
@@ -1,9 +1,9 @@
 /*
-*	my_hsm_alloc.h
+*	cr_hsm_alloc.h
 */
 
-#ifndef MY_HSM_ALLOC_H
-#define MY_HSM_ALLOC_H
+#ifndef CR_HSM_ALLOC_H
+#define CR_HSM_ALLOC_H
 
 #include "nfastapp.h"
 
@@ -26,5 +26,5 @@ void my_hsm_free( void *ptr,
 }
 #endif
 
-#endif	// MY_HSM_ALLOC_H
+#endif	// CR_HSM_ALLOC_H
 
diff --git a/cr_hsm_bignum.c b/cr_hsm_bignum.c
index b535776..2727a07 100644
--- a/cr_hsm_bignum.c
+++ b/cr_hsm_bignum.c
@@ -26,7 +26,7 @@
 
 #include "nfastapp.h"
 #include "nfutil.h"
-#include "my_hsm_bignum.h"
+#include "cr_hsm_bignum.h"
 
 /* --------------------- */
 
diff --git a/cr_hsm_bignum.h b/cr_hsm_bignum.h
index c029d8a..21b098a 100644
--- a/cr_hsm_bignum.h
+++ b/cr_hsm_bignum.h
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef MY_ALLOC_H
-#define MY_ALLOC_H
+#ifndef CR_HSM_BIGNUM_H
+#define CR_HSM_BIGNUM_H
 
 #include "nfastapp.h"
 
@@ -174,5 +174,4 @@ extern int my_compare ( const struct NFast_Bignum *pA,
 }
 #endif
 
-#endif
-
+#endif	// CR_HSM_BIGNUM_H
diff --git a/cr_hsm_code.c b/cr_hsm_code.c
index 415fdd3..fc24df0 100644
--- a/cr_hsm_code.c
+++ b/cr_hsm_code.c
@@ -119,6 +119,7 @@
 
 #ifdef USE_HSM
 #include "cr_hsm_code.h"
+#include "cr_hsm_bignum.h"
 #include "cr_generate_id.h"
 #include "cr_generate_id_private.h"
 
@@ -127,8 +128,6 @@
 #include "nfkm.h"
 #include "rqcard-applic.h"
 #include "rqcard-fips.h"
-// nShield optional
-#include "cr_hsm_bignum.h"
 
 // TORIAEZU : nFast variables
 NFast_AppHandle hsmHandle;
@@ -176,11 +175,11 @@ int hsm_initialize( void )
 	// set BigNum upcalls for HSM
 	ret_code = NFastApp_SetBignumUpcalls(
 					hsmHandle,
-					sbn_bignumreceiveupcall,
-					sbn_bignumsendlenupcall,
-					sbn_bignumsendupcall,
-					sbn_bignumfreeupcall,
-					sbn_bignumformatupcall,
+					my_bignumreceiveupcall,
+					my_bignumsendlenupcall,
+					my_bignumsendupcall,
+					my_bignumfreeupcall,
+					my_bignumformatupcall,
 					NULL );
 	if ( ret_code != CR_GENID_SUCCESS )
 	{