diff --git a/src/lib-http/test-http-client.c b/src/lib-http/test-http-client.c
index 46759d6924..f6f69b1cdb 100644
--- a/src/lib-http/test-http-client.c
+++ b/src/lib-http/test-http-client.c
@@ -343,7 +343,7 @@ int main(int argc, char *argv[])
 	struct ioloop *ioloop;
 
 	lib_init();
-	iostream_openssl_init();
+	ssl_iostream_openssl_init();
 
 	ioloop = io_loop_create();
 	io_loop_set_running(ioloop);
@@ -400,6 +400,6 @@ int main(int argc, char *argv[])
 	dns_client_deinit(&dns_client);
 
 	io_loop_destroy(&ioloop);
-	iostream_openssl_deinit();
+	ssl_iostream_openssl_deinit();
 	lib_deinit();
 }
diff --git a/src/lib-ssl-iostream/iostream-openssl.c b/src/lib-ssl-iostream/iostream-openssl.c
index 89dc15079c..6beb1eeba9 100644
--- a/src/lib-ssl-iostream/iostream-openssl.c
+++ b/src/lib-ssl-iostream/iostream-openssl.c
@@ -743,12 +743,12 @@ static const struct iostream_ssl_vfuncs ssl_vfuncs = {
 	openssl_iostream_get_last_error
 };
 
-void iostream_openssl_init(void)
+void ssl_iostream_openssl_init(void)
 {
 	iostream_ssl_module_init(&ssl_vfuncs);
 }
 
-void iostream_openssl_deinit(void)
+void ssl_iostream_openssl_deinit(void)
 {
 	openssl_iostream_global_deinit();
 }
diff --git a/src/lib-ssl-iostream/iostream-openssl.h b/src/lib-ssl-iostream/iostream-openssl.h
index 586f49754a..11913c8eb0 100644
--- a/src/lib-ssl-iostream/iostream-openssl.h
+++ b/src/lib-ssl-iostream/iostream-openssl.h
@@ -95,7 +95,7 @@ const char *
 openssl_iostream_use_certificate_error(const char *cert, const char *set_name);
 void openssl_iostream_clear_errors(void);
 
-void iostream_openssl_init(void);
-void iostream_openssl_deinit(void);
+void ssl_iostream_openssl_init(void);
+void ssl_iostream_openssl_deinit(void);
 
 #endif
diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c
index a02558b8e2..5630fc4e9a 100644
--- a/src/lib-ssl-iostream/iostream-ssl.c
+++ b/src/lib-ssl-iostream/iostream-ssl.c
@@ -45,6 +45,7 @@ static int ssl_module_load(const char **error_r)
 		module_dir_unload(&ssl_module);
 		return -1;
 	}
+	module_dir_init(ssl_module);
 
 	/* Destroy SSL module after (most of) the others. Especially lib-fs
 	   backends may still want to access SSL module in their own