@@ -26,20 +26,20 @@
  *
  * @brief A class for representing an HTTP request reply as a stream.
  */
 @interface OFHTTPResponse: OFStream
 {
-	of_http_request_protocol_version_t _protocolVersion;
+	OFHTTPRequestProtocolVersion _protocolVersion;
 	short _statusCode;
 	OFDictionary OF_GENERIC(OFString *, OFString *) *_headers;
 	OF_RESERVE_IVARS(OFHTTPResponse, 4)
 }
 
 /**
  * @brief The protocol version of the HTTP request reply.
  */
-@property (nonatomic) of_http_request_protocol_version_t protocolVersion;
+@property (nonatomic) OFHTTPRequestProtocolVersion protocolVersion;
 
 /**
  * @brief The protocol version of the HTTP request reply as a string.
  */
 @property (copy, nonatomic) OFString *protocolVersionString;
@@ -64,11 +64,11 @@
  * @brief Returns the reply as a string, trying to detect the encoding and
  *	  falling back to the specified encoding if not detectable.
  *
  * @return The reply as a string
  */
-- (OFString *)stringWithEncoding: (of_string_encoding_t)encoding;
+- (OFString *)stringWithEncoding: (OFStringEncoding)encoding;
 @end
 
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -76,11 +76,11 @@
  * @brief Returns a description string for the specified HTTP status code.
  *
  * @param code The HTTP status code to return a description string for
  * @return A description string for the specified HTTP status code
  */
-extern OFString *_Nonnull of_http_status_code_to_string(short code);
+extern OFString *_Nonnull OFHTTPStatusCodeString(short code);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END