@@ -29,11 +29,11 @@
 /**
  * @class OFStdIOStream OFStdIOStream.h ObjFW/OFStdIOStream.h
  *
  * @brief A class for providing standard input, output and error as OFStream.
  *
- * The global variables @ref of_stdin, @ref of_stdout and @ref of_stderr are
+ * The global variables @ref OFStdIn, @ref OFStdOut and @ref OFStdErr are
  * instances of this class and need no initialization.
  */
 #ifdef OF_STDIO_STREAM_WIN32_CONSOLE_H
 OF_SUBCLASSING_RESTRICTED
 #endif
@@ -116,19 +116,19 @@
  * @brief Moves the cursor to the specified absolute position. Does nothing if
  *	  there is no underlying terminal.
  *
  * @param position The position to move the cursor to
  */
-- (void)setCursorPosition: (of_point_t)position;
+- (void)setCursorPosition: (OFPoint)position;
 
 /**
  * @brief Moves the cursor to the specified relative position. Does nothing if
  *	  there is no underlying terminal.
  *
  * @param position The position to move the cursor to
  */
-- (void)setRelativeCursorPosition: (of_point_t)position;
+- (void)setRelativeCursorPosition: (OFPoint)position;
 @end
 
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -135,29 +135,29 @@
 /** @file */
 
 /**
  * @brief The standard input as an OFStream.
  */
-extern OFStdIOStream *_Nullable of_stdin;
+extern OFStdIOStream *_Nullable OFStdIn;
 
 /**
  * @brief The standard output as an OFStream.
  */
-extern OFStdIOStream *_Nullable of_stdout;
+extern OFStdIOStream *_Nullable OFStdOut;
 
 /**
  * @brief The standard error as an OFStream.
  */
-extern OFStdIOStream *_Nullable of_stderr;
+extern OFStdIOStream *_Nullable OFStdErr;
 
 /**
- * @brief Log the specified printf-style format to @ref of_stderr.
+ * @brief Log the specified printf-style format to @ref OFStdErr.
  *
  * This prefixes the output with the date, timestamp, process name and PID and
  * allows `%@` as a printf-style formatted to print objects.
  */
-extern void of_log(OFConstantString *format, ...);
+extern void OFLog(OFConstantString *format, ...);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END