@@ -23,11 +23,11 @@
 
 @class OFArray OF_GENERIC(ObjectType);
 @class OFMutableArray OF_GENERIC(ObjectType);
 @class OFString;
 
-#define OF_BACKTRACE_SIZE 16
+#define OFBacktraceSize 16
 
 #if defined(OF_WINDOWS) && defined(OF_HAVE_SOCKETS)
 # ifndef EADDRINUSE
 #  define EADDRINUSE WSAEADDRINUSE
 # endif
@@ -143,11 +143,11 @@
  * The OFException class is the base class for all exceptions in ObjFW, except
  * the OFAllocFailedException.
  */
 @interface OFException: OFObject
 {
-	void *_backtrace[OF_BACKTRACE_SIZE];
+	void *_backtrace[OFBacktraceSize];
 }
 
 /**
  * @brief Creates a new, autoreleased exception.
  *
@@ -172,14 +172,14 @@
 @end
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern OFString *of_strerror(int errNo);
+extern OFString *OFStrError(int errNo);
 #ifdef OF_WINDOWS
-extern OFString *of_windows_status_to_string(LSTATUS status);
+extern OFString *OFWindowsStatusToString(LSTATUS status);
 #endif
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END