@@ -299,20 +299,20 @@
 
 	exit(EXIT_FAILURE);
 }
 
 static int *
-get_errno(void)
+errNo(void)
 {
 	return &errno;
 }
 
 static void __attribute__((__used__))
 ctor(void)
 {
 	static bool initialized = false;
-	struct of_libc libc = {
+	struct OFLibC libC = {
 		.malloc = malloc,
 		.calloc = calloc,
 		.realloc = realloc,
 		.free = free,
 		.vfprintf = vfprintf,
@@ -344,11 +344,11 @@
 #endif
 #ifdef OF_MORPHOS
 		.__register_frame = __register_frame,
 		.__deregister_frame = __deregister_frame,
 #endif
-		.get_errno = get_errno,
+		.errNo = errNo,
 		.vsnprintf = vsnprintf,
 #ifdef OF_AMIGAOS_M68K
 		.vsscanf = vsscanf,
 #endif
 		.exit = exit,
@@ -363,11 +363,11 @@
 
 	if ((ObjFWBase = OpenLibrary(OBJFW_AMIGA_LIB, OBJFW_LIB_MINOR)) == NULL)
 		error("Failed to open " OBJFW_AMIGA_LIB " version %lu!",
 		    OBJFW_LIB_MINOR);
 
-	if (!of_init(1, &libc, __sF))
+	if (!OFInit(1, &libC, __sF))
 		error("Failed to initialize " OBJFW_AMIGA_LIB "!", 0);
 
 	initialized = true;
 }