diff --git a/src/c/cinit.d b/src/c/cinit.d
index 290156796..dcf9e53d9 100644
--- a/src/c/cinit.d
+++ b/src/c/cinit.d
@@ -65,7 +65,7 @@ clos_std_compute_applicable_methods(cl_object gf, cl_object arglist)
 extern cl_object
 si_bind_simple_restarts(cl_object tag, cl_object names)
 {
-  if (ECL_SYM_FUN(@'si::bind-simple-restarts') != Cnil)
+  if (ECL_SYM_FUN(@'si::bind-simple-restarts') != ECL_NIL)
     return _ecl_funcall3(@'si::bind-simple-restarts', tag, names);
   else
     return ECL_SYM_VAL(ecl_process_env(), @'si::*restart-clusters*');
@@ -74,7 +74,7 @@ si_bind_simple_restarts(cl_object tag, cl_object names)
 extern cl_object
 si_bind_simple_handlers(cl_object tag, cl_object names)
 {
-  if (ECL_SYM_FUN(@'si::bind-simple-handlers') != Cnil)
+  if (ECL_SYM_FUN(@'si::bind-simple-handlers') != ECL_NIL)
     return _ecl_funcall3(@'si::bind-simple-handlers', tag, names);
   else
     return ECL_SYM_VAL(ecl_process_env(), @'si::*handler-clusters*');
diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h
index 28c519dff..ed3337a86 100755
--- a/src/c/symbols_list.h
+++ b/src/c/symbols_list.h
@@ -106,8 +106,8 @@ cl_symbols[] = {
 {SYS_ "UNBOUND" ECL_FUN("si_unbound", si_unbound, 0) ECL_VAR(SI_CONSTANT, ECL_UNBOUND)},
 {SYS_ "PROTECT-TAG" ECL_FUN(NULL, NULL, -1) ECL_VAR(SI_ORDINARY, OBJNULL)},
 {SYS_ "DUMMY-TAG" ECL_FUN(NULL, NULL, -1) ECL_VAR(SI_ORDINARY, OBJNULL)},
-{SYS_ "*RESTART-CLUSTERS*" ECL_FUN(NULL, NULL, -1) ECL_VAR(SI_SPECIAL, Cnil)},
-{SYS_ "*HANDLER-CLUSTERS*" ECL_FUN(NULL, NULL, -1) ECL_VAR(SI_SPECIAL, Cnil)},
+{SYS_ "*RESTART-CLUSTERS*" ECL_FUN(NULL, NULL, -1) ECL_VAR(SI_SPECIAL, ECL_NIL)},
+{SYS_ "*HANDLER-CLUSTERS*" ECL_FUN(NULL, NULL, -1) ECL_VAR(SI_SPECIAL, ECL_NIL)},
 {EXT_ "*INTERRUPTS-ENABLED*" ECL_FUN(NULL, NULL, 1) ECL_VAR(EXT_SPECIAL, ECL_T)},
 
 /* LISP PACKAGE */
diff --git a/src/tests/normal-tests/embedding.lsp b/src/tests/normal-tests/embedding.lsp
index f6ef30b7c..a2ef7acb5 100644
--- a/src/tests/normal-tests/embedding.lsp
+++ b/src/tests/normal-tests/embedding.lsp
@@ -72,7 +72,7 @@
 int main (int argc, char **argv) {
   cl_object x;
   cl_boot(argc, argv);
-  si_safe_eval(3, x = c_string_to_object(~S), Cnil, Cnil);
+  si_safe_eval(3, x = c_string_to_object(~S), ECL_NIL, ECL_NIL);
   cl_shutdown();
   exit(0);
 }")