Index: src/amiga-glue.m
==================================================================
--- src/amiga-glue.m
+++ src/amiga-glue.m
@@ -72,25 +72,25 @@
 
 	return of_application_main(argc, argv, delegate);
 }
 
 void *__saveds
-glue_of_malloc PPC_PARAMS(size_t count, size_t size)
+glue_of_alloc PPC_PARAMS(size_t count, size_t size)
 {
 	M68K_ARG(size_t, count, d0)
 	M68K_ARG(size_t, size, d1)
 
-	return of_malloc(count, size);
+	return of_alloc(count, size);
 }
 
 void *__saveds
-glue_of_calloc PPC_PARAMS(size_t count, size_t size)
+glue_of_alloc_zeroed PPC_PARAMS(size_t count, size_t size)
 {
 	M68K_ARG(size_t, count, d0)
 	M68K_ARG(size_t, size, d1)
 
-	return of_calloc(count, size);
+	return of_alloc_zeroed(count, size);
 }
 
 void *__saveds
 glue_of_realloc PPC_PARAMS(void *pointer, size_t count, size_t size)
 {

Index: src/amiga-library.m
==================================================================
--- src/amiga-library.m
+++ src/amiga-library.m
@@ -68,12 +68,12 @@
 void __register_frame_info(const void *, void *);
 void *__deregister_frame_info(const void *);
 #endif
 
 extern bool glue_of_init(void);
-extern void *glue_of_malloc(void);
-extern void *glue_of_calloc(void);
+extern void *glue_of_alloc(void);
+extern void *glue_of_alloc_zeroed(void);
 extern void *glue_of_realloc(void);
 extern uint32_t *glue_of_hash_seed_ref(void);
 extern OFStdIOStream **glue_of_stdin_ref(void);
 extern OFStdIOStream **glue_of_stdout_ref(void);
 extern OFStdIOStream **glue_of_stderr_ref(void);
@@ -628,12 +628,12 @@
 #ifdef OF_MORPHOS
 	(CONST_APTR)-1,
 	(CONST_APTR)FUNCARRAY_32BIT_SYSTEMV,
 #endif
 	(CONST_APTR)glue_of_init,
-	(CONST_APTR)glue_of_malloc,
-	(CONST_APTR)glue_of_calloc,
+	(CONST_APTR)glue_of_alloc,
+	(CONST_APTR)glue_of_alloc_zeroed,
 	(CONST_APTR)glue_of_realloc,
 	(CONST_APTR)glue_of_hash_seed_ref,
 	(CONST_APTR)glue_of_stdin_ref,
 	(CONST_APTR)glue_of_stdout_ref,
 	(CONST_APTR)glue_of_stderr_ref,

Index: src/amigaos3.sfd
==================================================================
--- src/amigaos3.sfd
+++ src/amigaos3.sfd
@@ -3,12 +3,12 @@
 ==libname objfw68k.library
 ==bias 30
 ==public
 * The following function is only for the linklib.
 bool glue_of_init(unsigned int version, struct of_libc *_Nonnull libc, FILE *_Nonnull *_Nonnull sF)(d0,a0,a1)
-void *_Nullable glue_of_malloc(size_t count, size_t size)(d0,d1)
-void *_Nullable glue_of_calloc(size_t count, size_t size)(d0,d1)
+void *_Nullable glue_of_alloc(size_t count, size_t size)(d0,d1)
+void *_Nullable glue_of_alloc_zeroed(size_t count, size_t size)(d0,d1)
 void *_Nullable glue_of_realloc(void *_Nullable pointer, size_t count, size_t size)(a0,d0,d1)
 uint32_t *_Nonnull glue_of_hash_seed_ref(void)()
 OFStdIOStream *_Nonnull *_Nullable glue_of_stdin_ref(void)()
 OFStdIOStream *_Nonnull *_Nullable glue_of_stdout_ref(void)()
 OFStdIOStream *_Nonnull *_Nullable glue_of_stderr_ref(void)()

Index: src/linklib/linklib.m
==================================================================
--- src/linklib/linklib.m
+++ src/linklib/linklib.m
@@ -368,19 +368,19 @@
 	dtor();
 }
 #endif
 
 void *
-of_malloc(size_t count, size_t size)
+of_alloc(size_t count, size_t size)
 {
-	return glue_of_malloc(count, size);
+	return glue_of_alloc(count, size);
 }
 
 void *
-of_calloc(size_t count, size_t size)
+of_alloc_zeroed(size_t count, size_t size)
 {
-	return glue_of_calloc(count, size);
+	return glue_of_alloc_zeroed(count, size);
 }
 
 void *
 of_realloc(void *pointer, size_t count, size_t size)
 {