Index: src/OFX509Certificate.h
==================================================================
--- src/OFX509Certificate.h
+++ src/OFX509Certificate.h
@@ -33,21 +33,21 @@
 {
 	OF_RESERVE_IVARS(OFX509Certificate, 4)
 }
 
 /**
- * @brief Returns a certificate chain from the specified IRI.
+ * @brief Returns the certificate chain from the PEM file at the specified IRI.
  *
- * @param IRI The IRI to retrieve the certificate chain from
- *
+ * @param IRI The IRI to the PEM file to retrieve the certificate chain from
+ * @return An array of @ref OFX509Certificate
  * @throw OFOpenItemFailedException Opening the item failed
  * @throw OFUnsupportedProtocolException The specified IRI is not supported
  * @throw OFReadFailedException Reading the item failed
  * @throw OFInvalidFormatException The format of the item is invalid
  */
 + (OFArray OF_GENERIC(OFX509Certificate *) *)
-    certificateChainFromIRI: (OFIRI *)IRI;
+    certificateChainFromPEMFileAtIRI: (OFIRI *)IRI;
 @end
 
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: src/OFX509Certificate.m
==================================================================
--- src/OFX509Certificate.m
+++ src/OFX509Certificate.m
@@ -38,14 +38,14 @@
 
 	return [super alloc];
 }
 
 + (OFArray OF_GENERIC(OFX509Certificate *) *)
-    certificateChainFromIRI: (OFIRI *)IRI
+    certificateChainFromPEMFileAtIRI: (OFIRI *)IRI
 {
 	if (OFX509CertificateImplementation != Nil)
 		return [OFX509CertificateImplementation
-		    certificateChainFromIRI: IRI];
+		    certificateChainFromPEMFileAtIRI: IRI];
 
 	OF_UNRECOGNIZED_SELECTOR
 }
 @end

Index: src/OFX509CertificatePrivateKey.h
==================================================================
--- src/OFX509CertificatePrivateKey.h
+++ src/OFX509CertificatePrivateKey.h
@@ -33,21 +33,21 @@
 {
 	OF_RESERVE_IVARS(OFX509Certificate, 4)
 }
 
 /**
- * @brief Returns a private key from the specified IRI.
+ * @brief Returns the private key from the PEM file at the specified IRI.
  *
  * @param IRI The IRI to retrieve the private key from
  *
  * @throw OFInitializationFailedException Initializing the private key failed
  * @throw OFOpenItemFailedException Opening the item failed
  * @throw OFUnsupportedProtocolException The specified IRI is not supported
  * @throw OFReadFailedException Reading the item failed
  * @throw OFInvalidFormatException The format of the item is invalid
  */
-+ (instancetype)privateKeyFromIRI: (OFIRI *)IRI;
++ (instancetype)privateKeyFromPEMFileAtIRI: (OFIRI *)IRI;
 @end
 
 #ifdef __cplusplus
 extern "C" {
 #endif

Index: src/OFX509CertificatePrivateKey.m
==================================================================
--- src/OFX509CertificatePrivateKey.m
+++ src/OFX509CertificatePrivateKey.m
@@ -38,14 +38,14 @@
 	}
 
 	return [super alloc];
 }
 
-+ (instancetype)privateKeyFromIRI: (OFIRI *)IRI
++ (instancetype)privateKeyFromPEMFileAtIRI: (OFIRI *)IRI
 {
 	if (OFX509CertificatePrivateKeyImplementation != Nil)
 		return [OFX509CertificatePrivateKeyImplementation
-		    privateKeyFromIRI: IRI];
+		    privateKeyFromPEMFileAtIRI: IRI];
 
 	OF_UNRECOGNIZED_SELECTOR
 }
 @end

Index: src/tls/OFGnuTLSX509Certificate.m
==================================================================
--- src/tls/OFGnuTLSX509Certificate.m
+++ src/tls/OFGnuTLSX509Certificate.m
@@ -34,11 +34,11 @@
 	if (OFX509CertificateImplementation == Nil)
 		OFX509CertificateImplementation = self;
 }
 
 + (OFArray OF_GENERIC(OFX509Certificate *) *)
-    certificateChainFromIRI: (OFIRI *)IRI
+    certificateChainFromPEMFileAtIRI: (OFIRI *)IRI
 {
 	OFMutableArray *chain = [OFMutableArray array];
 	void *pool = objc_autoreleasePoolPush();
 	OFData *data = [OFData dataWithContentsOfIRI: IRI];
 	gnutls_datum_t datum;

Index: src/tls/OFGnuTLSX509CertificatePrivateKey.m
==================================================================
--- src/tls/OFGnuTLSX509CertificatePrivateKey.m
+++ src/tls/OFGnuTLSX509CertificatePrivateKey.m
@@ -33,11 +33,11 @@
 {
 	if (OFX509CertificatePrivateKeyImplementation == Nil)
 		OFX509CertificatePrivateKeyImplementation = self;
 }
 
-+ (instancetype)privateKeyFromIRI: (OFIRI *)IRI
++ (instancetype)privateKeyFromPEMFileAtIRI: (OFIRI *)IRI
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFData *data = [OFData dataWithContentsOfIRI: IRI];
 	gnutls_datum_t datum;
 	gnutls_x509_privkey_t key;