9 files changed, 15 insertions, 16 deletions
diff --git a/src/chdebug.c b/src/chdebug.c
index 238071cc4..41a0adc62 100644
--- a/src/chdebug.c
+++ b/src/chdebug.c
@@ -26,7 +26,7 @@ char *panicmsg;
 /**
  * @brief Debug subsystem initialization.
  */
-void chDbgInit(void) {
+void debug_init(void) {
 
 #ifdef CH_USE_TRACE
   dbgtb.tb_size = TRACE_BUFFER_SIZE;
diff --git a/src/chheap.c b/src/chheap.c
index 8ba55f9ad..c07212226 100644
--- a/src/chheap.c
+++ b/src/chheap.c
@@ -65,10 +65,9 @@ static struct {
 /**
  * @brief Initializes the allocator subsystem.
  *
- * @note It is internally invoked, this function should not normally be
- *       invoked from the user code.
+ * @note Internal use only.
  */
-void chHeapInit(void) {
+void heap_init(void) {
   struct header *hp;
 
 #if CH_HEAP_SIZE == 0
diff --git a/src/chschd.c b/src/chschd.c
index cc89682a8..2de941f0a 100644
--- a/src/chschd.c
+++ b/src/chschd.c
@@ -32,7 +32,7 @@ ReadyList rlist;
  * @brief Scheduler initialization.
  * @note Internally invoked by the @p chSysInit().
  */
-void chSchInit(void) {
+void scheduler_init(void) {
 
   queue_init(&rlist);
   rlist.r_prio = NOPRIO;
diff --git a/src/chsys.c b/src/chsys.c
index 1629796dd..807e2590f 100644
--- a/src/chsys.c
+++ b/src/chsys.c
@@ -57,17 +57,17 @@ void chSysInit(void) {
   static Thread mainthread;
 
   port_init();
-  chSchInit();
-  chDbgInit();
-  chVTInit();
+  scheduler_init();
+  debug_init();
+  vt_init();
 #ifdef CH_USE_HEAP
-  chHeapInit();
+  heap_init();
 #endif
+
   /*
    * Now this instructions flow becomes the main thread.
    */
   (currp = init_thread(&mainthread, NORMALPRIO))->p_state = PRCURR;
-
   chSysEnable();
 
   /*
diff --git a/src/chvt.c b/src/chvt.c
index 7f63437ad..63bfd219e 100644
--- a/src/chvt.c
+++ b/src/chvt.c
@@ -31,7 +31,7 @@ VTList vtlist;
  *
  * @note Internal use only.
  */
-void chVTInit(void) {
+void vt_init(void) {
 
   vtlist.vt_next = vtlist.vt_prev = (void *)&vtlist;
   vtlist.vt_time = (systime_t)-1;
diff --git a/src/include/debug.h b/src/include/debug.h
index 631882fad..71a2613eb 100644
--- a/src/include/debug.h
+++ b/src/include/debug.h
@@ -62,7 +62,7 @@ extern char *dbglastmsg;
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void chDbgInit(void);
+  void debug_init(void);
   void chDbgPanic(char *msg);
 #ifdef __cplusplus
 }
@@ -83,7 +83,7 @@ extern "C" {
 
 #else /* !CH_USE_DEBUG */
 
-#define chDbgInit()
+#define debug_init()
 #define chDbgPanic(msg) {}
 #define chDbgAssert(c, m) {(void)(c);}
 
diff --git a/src/include/heap.h b/src/include/heap.h
index b303fde1a..b8633f5cf 100644
--- a/src/include/heap.h
+++ b/src/include/heap.h
@@ -28,7 +28,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void chHeapInit(void);
+  void heap_init(void);
   void *chHeapAlloc(size_t size);
   void chHeapFree(void *p);
   size_t chHeapStatus(size_t *sizep);
diff --git a/src/include/scheduler.h b/src/include/scheduler.h
index fde23a0ce..3d2f46e5e 100644
--- a/src/include/scheduler.h
+++ b/src/include/scheduler.h
@@ -75,7 +75,7 @@ extern ReadyList rlist;
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void chSchInit(void);
+  void scheduler_init(void);
   Thread *chSchReadyI(Thread *tp);
   void chSchGoSleepS(tstate_t newstate);
   msg_t chSchGoSleepTimeoutS(tstate_t newstate, systime_t time);
diff --git a/src/include/vt.h b/src/include/vt.h
index 73f2881a3..1e718da3a 100644
--- a/src/include/vt.h
+++ b/src/include/vt.h
@@ -99,7 +99,7 @@ extern VTList vtlist;
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void chVTInit(void);
+  void vt_init(void);
   void chVTSetI(VirtualTimer *vtp, systime_t time, vtfunc_t vtfunc, void *par);
   void chVTResetI(VirtualTimer *vtp);
   bool_t chSysInTimeWindow(systime_t start, systime_t end);