diff --git a/Core/gb.h b/Core/gb.h
index 2089a19..4b41b34 100644
--- a/Core/gb.h
+++ b/Core/gb.h
@@ -723,8 +723,8 @@ struct GB_gameboy_internal_s {
         GB_boot_rom_load_callback_t boot_rom_load_callback;
         GB_print_image_callback_t printer_callback;
         GB_printer_done_callback_t printer_done_callback;
-        GB_workboy_set_time_callback workboy_set_time_callback;
-        GB_workboy_get_time_callback workboy_get_time_callback;
+        GB_workboy_set_time_callback_t workboy_set_time_callback;
+        GB_workboy_get_time_callback_t workboy_get_time_callback;
         GB_execution_callback_t execution_callback;
         GB_lcd_line_callback_t lcd_line_callback;
         GB_lcd_status_callback_t lcd_status_callback;
@@ -898,7 +898,7 @@ typedef enum {
     GB_DIRECT_ACCESS_CART_RAM,
     GB_DIRECT_ACCESS_VRAM,
     GB_DIRECT_ACCESS_HRAM,
-    GB_DIRECT_ACCESS_IO, /* Warning: Some registers can only be read/written correctly via GB_memory_read/write. */
+    GB_DIRECT_ACCESS_IO, /* Warning: Some registers can only be read/written correctly via GB_read/write_memory. */
     GB_DIRECT_ACCESS_BOOTROM,
     GB_DIRECT_ACCESS_OAM,
     GB_DIRECT_ACCESS_BGP,
diff --git a/Core/workboy.c b/Core/workboy.c
index c450825..d5e2b72 100644
--- a/Core/workboy.c
+++ b/Core/workboy.c
@@ -140,8 +140,8 @@ static bool serial_end(GB_gameboy_t *gb)
 }
 
 void GB_connect_workboy(GB_gameboy_t *gb,
-                        GB_workboy_set_time_callback set_time_callback,
-                        GB_workboy_get_time_callback get_time_callback)
+                        GB_workboy_set_time_callback_t set_time_callback,
+                        GB_workboy_get_time_callback_t get_time_callback)
 {
     memset(&gb->workboy, 0, sizeof(gb->workboy));
     GB_set_serial_transfer_bit_start_callback(gb, serial_start);
diff --git a/Core/workboy.h b/Core/workboy.h
index 71bdb44..c09a599 100644
--- a/Core/workboy.h
+++ b/Core/workboy.h
@@ -19,8 +19,8 @@ typedef struct {
     uint8_t buffer_index; // In nibbles during read, in bytes during write
 } GB_workboy_t;
 
-typedef void (*GB_workboy_set_time_callback)(GB_gameboy_t *gb, time_t time);
-typedef time_t (*GB_workboy_get_time_callback)(GB_gameboy_t *gb);
+typedef void (*GB_workboy_set_time_callback_t)(GB_gameboy_t *gb, time_t time);
+typedef time_t (*GB_workboy_get_time_callback_t)(GB_gameboy_t *gb);
 
 enum {
     GB_WORKBOY_NONE = 0xFF,
@@ -110,7 +110,7 @@ enum {
 
 
 void GB_connect_workboy(GB_gameboy_t *gb,
-                        GB_workboy_set_time_callback set_time_callback,
-                        GB_workboy_get_time_callback get_time_callback);
+                        GB_workboy_set_time_callback_t set_time_callback,
+                        GB_workboy_get_time_callback_t get_time_callback);
 bool GB_workboy_is_enabled(GB_gameboy_t *gb);
 void GB_workboy_set_key(GB_gameboy_t *gb, uint8_t key);