diff --git a/Zend/tests/closures/closure_016.phpt b/Zend/tests/closures/closure_016.phpt
index 0f87f20f435aa..33860189a57ea 100644
--- a/Zend/tests/closures/closure_016.phpt
+++ b/Zend/tests/closures/closure_016.phpt
@@ -42,9 +42,9 @@ Foo::__invoke
 bool(true)
 Foo::__invoke
 bool(true)
-Closure::__invoke
+{closure:foo():9}
 bool(true)
-Closure::__invoke
+{closure:foo():9}
 bool(true)
 Closure::__invoke
 bool(true)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index df8b4252c42ad..e05422395ec19 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -4160,13 +4160,10 @@ ZEND_API zend_string *zend_get_callable_name_ex(zval *callable, zend_object *obj
 			if (ce == zend_ce_closure) {
 				const zend_function *fn = zend_get_closure_method_def(Z_OBJ_P(callable));
 
-				if (fn->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) {
-					if (fn->common.scope) {
-						return zend_create_member_string(fn->common.scope->name, fn->common.function_name);
-					} else {
-						return zend_string_copy(fn->common.function_name);
-					}
+				if ((fn->common.fn_flags & ZEND_ACC_FAKE_CLOSURE) && fn->common.scope) {
+					return zend_create_member_string(fn->common.scope->name, fn->common.function_name);
 				}
+				return zend_string_copy(fn->common.function_name);
 			}
 
 			return zend_string_concat2(
diff --git a/ext/random/randomizer.c b/ext/random/randomizer.c
index 2b5c98ae03313..fc3c93fc2b053 100644
--- a/ext/random/randomizer.c
+++ b/ext/random/randomizer.c
@@ -43,16 +43,9 @@ static inline void randomizer_common_init(php_random_randomizer *randomizer, zen
 			.state = state,
 		};
 
-		zend_string *mname;
-		zend_function *generate_method;
-
-		mname = ZSTR_INIT_LITERAL("generate", 0);
-		generate_method = zend_hash_find_ptr(&engine_object->ce->function_table, mname);
-		zend_string_release(mname);
-
 		/* Create compatible state */
 		state->object = engine_object;
-		state->generate_method = generate_method;
+		state->generate_method = zend_hash_str_find_ptr(&engine_object->ce->function_table, "generate", strlen("generate"));
 
 		/* Mark self-allocated for memory management */
 		randomizer->is_userland_algo = true;
diff --git a/tests/output/ob_013.phpt b/tests/output/ob_013.phpt
index b42f443ad28cb..c1f9f090b7b31 100644
--- a/tests/output/ob_013.phpt
+++ b/tests/output/ob_013.phpt
@@ -57,11 +57,11 @@ Array
     [5] => E::f
     [6] => E::g
     [7] => E::__invoke
-    [8] => Closure::__invoke
+    [8] => {closure:%s:%d}
 )
 Array
 (
-    [name] => Closure::__invoke
+    [name] => {closure:%s:%d}
     [type] => 1
     [flags] => 20593
     [level] => 8
@@ -161,7 +161,7 @@ Array
 
     [8] => Array
         (
-            [name] => Closure::__invoke
+            [name] => {closure:%s:%d}
             [type] => 1
             [flags] => 20593
             [level] => 8