diff --git a/qemu/scripts/qapi-event.py b/qemu/scripts/qapi-event.py
index d55d622f..7e2da61f 100644
--- a/qemu/scripts/qapi-event.py
+++ b/qemu/scripts/qapi-event.py
@@ -84,7 +84,7 @@ def generate_event_implement(api_name, event_name, params):
     /* Fake visit, as if all members are under a structure */
     visit_start_struct(v, NULL, "", "%(event_name)s", 0, &err);
     if (err) {
-        goto clean;
+        goto out;
     }
 
 """,
@@ -106,7 +106,7 @@ def generate_event_implement(api_name, event_name, params):
             ret += mcgen("""
     visit_type_%(type)s(v, %(var_type)s&%(var)s, "%(name)s", &err);
     if (err) {
-        goto clean;
+        goto out;
     }
 """,
                          var_type = var_type,
@@ -124,7 +124,7 @@ def generate_event_implement(api_name, event_name, params):
 
     visit_end_struct(v, &err);
     if (err) {
-        goto clean;
+        goto out;
     }
 
     obj = qmp_output_get_qobject(qov);
@@ -143,7 +143,7 @@ def generate_event_implement(api_name, event_name, params):
     # step 5: clean up
     if params and params.members:
         ret += mcgen("""
- clean:
+ out:
     qmp_output_visitor_cleanup(qov);
 """)
     ret += mcgen("""
diff --git a/qemu/scripts/qapi-visit.py b/qemu/scripts/qapi-visit.py
index b3615937..3aee107a 100644
--- a/qemu/scripts/qapi-visit.py
+++ b/qemu/scripts/qapi-visit.py
@@ -207,7 +207,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error
     }
     visit_get_next_type(v, (int*) &(*obj)->kind, %(c_name)s_qtypes, name, &err);
     if (err) {
-        goto out_end;
+        goto out_obj;
     }
     switch ((*obj)->kind) {
 ''',
@@ -228,7 +228,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error
     default:
         abort();
     }
-out_end:
+out_obj:
     error_propagate(errp, err);
     err = NULL;
     visit_end_implicit_struct(v);