@@ -27,22 +27,22 @@
 /**
  * @brief A response to a request.
  *
  * This is a typedef for `OFDictionary<OFString *, id> *`.
  */
-typedef OFDictionary<OFString *, id> *mtx_response_t;
+typedef OFDictionary<OFString *, id> *MTXResponse;
 
 /**
  * @brief A block called with the response for an MTXRequest.
  *
  * @param response The response to the request, as a dictionary parsed from JSON
  * @param statusCode The HTTP status code returned for the request
  * @param exception The first exception that occurred during the request,
  *		    or `nil` on success
  */
-typedef void (^mtx_request_block_t)(mtx_response_t _Nullable response,
-    int statusCode, id _Nullable exception);
+typedef void (^MTXRequestBlock)(MTXResponse _Nullable response, int statusCode,
+    id _Nullable exception);
 
 /**
  * @brief An internal class for performing a request on the Matrix server.
  */
 @interface MTXRequest: OFObject <OFHTTPClientDelegate>
@@ -61,11 +61,11 @@
 /**
  * @brief The HTTP request method.
  *
  * Defaults to `OF_HTTP_REQUEST_METHOD_GET`.
  */
-@property (nonatomic) of_http_request_method_t method;
+@property (nonatomic) OFHTTPRequestMethod method;
 
 /**
  * @brief The path of the request.
  */
 @property (copy, nonatomic) OFString *path;
@@ -110,9 +110,9 @@
  * @brief Performs the request and calls the specified block once the request
  *	  succeeded or failed.
  *
  * @param block The block to call once the request succeeded or failed
  */
-- (void)performWithBlock: (mtx_request_block_t)block;
+- (void)performWithBlock: (MTXRequestBlock)block;
 @end
 
 OF_ASSUME_NONNULL_END