virtualbox-com 0.10.4 → 0.10.5

data/ext/virtualbox-com/4.1/vbox.c

@@ -50,6 +50,7 @@ static VALUE oMin_s16		= Qundef;
 static VALUE oMin_s32		= Qundef;
 static VALUE oMin_s64		= Qundef;
 static VALUE oExceptionMap      = Qundef;
+static VALUE oUUIDparser	= Qnil;
 
 static VALUE sYes		= Qundef;
 static VALUE sNo		= Qundef;
@@ -78,6 +79,7 @@ static ID _symbol;
 static ID _value;
 static ID _const_get;
 static ID _new;
+static ID _call;
 
 static rb_encoding * _UTF8;
 
@@ -105,12 +107,40 @@ static void ns_check(uint32_t rcode) {
     }
 }
 
+
+static VALUE with_uuid_parser(VALUE self, VALUE val) {
+    if (!NIL_P(val) && 
+	rb_obj_is_instance_of(val, rb_cProc) != Qtrue)
+	rb_raise(rb_eArgError, "nil, proc, or lambda expected");
+    return oUUIDparser = val;
+}
+
+static VALUE uuid_parser_calling(VALUE arg) {
+    return rb_funcall(oUUIDparser, _call, 1, arg);
+}
+
+static VALUE to_uuid(VALUE val) {
+    int state = 0;
+
+    StringValue(val);
+    if (oUUIDparser != Qnil && oUUIDparser != Qundef) {
+	val = rb_protect(uuid_parser_calling, val, &state);
+	if (state) {
+	    rb_warn("Returning nil for uuid and discarding exception raised during uuid parsing to avoid memory leak. Fix the parser so that no exception is raised.");
+	}
+    }
+    return val;
+}
+
 /* Forward definition */
 static void nsISupports_free(struct obj *ptr);
 
 
 
 
+
+
+
 /*======================================================================*
  * Internal classes
  *  They are an intermediate to
@@ -118,10 +148,11 @@ static void nsISupports_free(struct obj *ptr);
  *   - perform garbage collection
  *======================================================================*/
 
+
 /* Class: IID
  */
 #define IID_STR_MAX 36  /* 8+1+4+1+4+1+4+1+12 */
-static VALUE iid__new(iid_t *iid) {
+static VALUE iid_new(iid_t *iid) {
     iid_t *a_iid = ALLOC(iid_t);
     *a_iid = *iid;
     return Data_Wrap_Struct(cIID, 0, free, a_iid);
@@ -136,11 +167,16 @@ static VALUE iid__to_s(VALUE self) {
 	     iid->m3[4], iid->m3[5], iid->m3[6], iid->m3[7]);
     return rb_str_new(str, IID_STR_MAX);
 }
+static void iid__to_raw(VALUE self) {
+    iid_t *iid = DATA_PTR(self);
+    return rb_str_new((char *)iid, sizeof(iid_t));
+}
 static void iid_init(VALUE under) {
     cIID = rb_define_class_under(under, "IID", rb_cObject);
     no_instantiation(cIID);
-    rb_define_method(cIID, "to_s", iid__to_s, 0);
-    rb_define_method(cIID, "to_str", iid__to_s, 0);
+    rb_define_method(cIID, "to_s",   iid__to_s,   0);
+    rb_define_method(cIID, "to_str", iid__to_s,   0);
+    rb_define_method(cIID, "to_raw", iid__to_raw, 0);
 }
 
 
@@ -334,6 +370,10 @@ static inline VALUE prepare_wstring(VALUE val) {
     return wstring__new(cWString, val);
 }
 
+static inline VALUE prepare_uuid(val) {
+    return wstring__new(cWString, val);
+}
+
 static VALUE prepare_enum(VALUE val, VALUE klass) {
     switch(rb_type(val)) {
     case T_FIXNUM:
@@ -531,6 +571,25 @@ static VALUE prepare_array_wstring(VALUE ary) {
     return res;
 }
 
+static VALUE prepare_array_uuid(VALUE ary) {
+    VALUE       res  = Qundef;
+    wstring_t  *data = NULL;
+    long        len, i;
+
+    ary  = rb_ary_dup(ensure_array(ary));
+    len  = RARRAY_LEN(ary);
+    data = ALLOC_N(wstring_t, len);
+    res  = carray_new(len, data, ary);
+
+    for (i = 0 ; i < len ; i++) {
+	VALUE val = prepare_uuid(rb_ary_entry(ary, i));
+	rb_ary_store(ary, i, val);
+	data[i] = (wstring_t)DATA_PTR(val);
+    }
+    OBJ_FREEZE(ary);
+    return res;
+}
+
 static VALUE prepare_array_enum(VALUE ary, VALUE klass) {
     VALUE       res  = Qundef;
     uint32_t   *data = NULL;
@@ -587,9 +646,11 @@ static VALUE prepare_array_interface(VALUE ary, VALUE klass) {
 #define extract_bool(val, data) 	     *(data) = (val) == Qtrue ? ~0 : 0
 #define extract_ptr(val, data) 	             *(data) = NUM2PTR(val)
 #define extract_wstring(val, data) 	     *(data) = DATA_PTR(val)
+#define extract_uuid(val, data) 	     *(data) = DATA_PTR(val)
 #define extract_enum(val, data, klass)       *(data) = NUM2UINT32(val)
 #define extract_interface(val, data, klass)  *(data) = DATA_PTR(val)
 
+
 static inline void extract_blob(VALUE val, uint32_t *size, void **data) {
     struct blob_info   * bi = ((struct blob_info   *)DATA_PTR(val));
     *size = bi->size;
@@ -621,6 +682,7 @@ static inline void extract_carray(VALUE val, uint32_t *size, void **data) {
 #define convert_bool(v)    ((v) ? Qtrue : Qfalse)
 #define convert_blob(s,d)  ((d) ? rb_str_to_str(blob_new(s,d))  : Qnil)
 #define convert_wstring(v) ((v) ? rb_str_to_str(wstring_new(v)) : Qnil)
+#define convert_uuid(v)    ((v) ? to_uuid(wstring_new(v)) : Qnil)
 
 static inline VALUE convert_enum(uint32_t v, VALUE klass) {
     VALUE val = ULL2NUM(v);
@@ -712,6 +774,19 @@ static inline VALUE convert_array_wstring(uint32_t size, void **array) {
     }
 }
 
+static inline VALUE convert_array_uuid(uint32_t size, void **array) {
+    if (array) {
+	VALUE res = rb_ary_new2(size);
+	uint32_t i;
+	for (i = 0 ; i < size ; i++)
+	    rb_ary_push(res, convert_uuid(array[i]));
+	xpcom->unalloc_mem(array); 
+	return res;
+    } else {
+	return Qnil;
+    }
+}
+
 
 
 /*======================================================================*
@@ -792,6 +867,7 @@ void RUBY_VBOX_INIT(void) {
     _value      = rb_intern("value");
     _const_get  = rb_intern("const_get");
     _new	= rb_intern("new");
+    _call       = rb_intern("call");
 
     p15         = rb_funcall(oTwo, _pow,   1, INT2FIX(15));
     p16         = rb_funcall(oTwo, _pow,   1, INT2FIX(16));
@@ -830,6 +906,8 @@ void RUBY_VBOX_INIT(void) {
     mVirtualBox        = rb_define_module("VirtualBox");
     mCOM               = rb_define_module_under(mVirtualBox, "COM");
     mModel             = rb_define_module_under(mCOM, "Model");
+    rb_define_module_function(mCOM, "with_uuid_parser", with_uuid_parser, 1);
+
 
     /* Define abstract enumerations / interfaces */
     cAbstractModel

data/ext/virtualbox-com/4.2/generated.inc

@@ -1880,7 +1880,7 @@ static VALUE VirtualBoxErrorInfo__get_interface_i_d(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_interface_i_d(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -2217,8 +2217,8 @@ static VALUE VirtualBox__get_guest_os_type(VALUE self, VALUE i0) {
   struct VirtualBox *vtbl = obj->vtbl;
   wstring_t v1;
   void * v2;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->get_guest_os_type(obj, v1, &v2));
   res = rb_ary_new();
   rb_ary_push(res, convert_interface(v2, cGuestOSType));
@@ -3084,8 +3084,8 @@ static VALUE InternalMachineControl__capture_usb_device(VALUE self, VALUE i0) {
   struct obj *obj = DATA_PTR(self);
   struct InternalMachineControl *vtbl = obj->vtbl;
   wstring_t v1;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->capture_usb_device(obj, v1));
   res = rb_ary_new();
   return res;
@@ -3096,9 +3096,9 @@ static VALUE InternalMachineControl__detach_usb_device(VALUE self, VALUE i0, VAL
   struct InternalMachineControl *vtbl = obj->vtbl;
   wstring_t v1;
   bool_t v2;
-  i0 = prepare_wstring(i0);
+  i0 = prepare_uuid(i0);
   i1 = prepare_bool(i1);
-  extract_wstring(i0, &v1);
+  extract_uuid(i0, &v1);
   extract_bool(i1, &v2);
   NS_CHECK(vtbl->detach_usb_device(obj, v1, v2));
   res = rb_ary_new();
@@ -3222,12 +3222,12 @@ static VALUE InternalMachineControl__delete_snapshot(VALUE self, VALUE i0, VALUE
   uint32_t v5;
   void * v6;
   i0 = prepare_interface(i0, cConsole);
-  i1 = prepare_wstring(i1);
-  i2 = prepare_wstring(i2);
+  i1 = prepare_uuid(i1);
+  i2 = prepare_uuid(i2);
   i3 = prepare_bool(i3);
   extract_interface(i0, &v1, cConsole);
-  extract_wstring(i1, &v2);
-  extract_wstring(i2, &v3);
+  extract_uuid(i1, &v2);
+  extract_uuid(i2, &v3);
   extract_bool(i3, &v4);
   NS_CHECK(vtbl->delete_snapshot(obj, v1, v2, v3, v4, &v5, &v6));
   res = rb_ary_new();
@@ -4898,7 +4898,7 @@ static VALUE Machine__get_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -4977,7 +4977,7 @@ static VALUE Machine__get_hardware_uuid(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_hardware_uuid(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -4986,8 +4986,8 @@ static VALUE Machine__set_hardware_uuid(VALUE self, VALUE i0) {
   struct obj *obj = DATA_PTR(self);
   struct Machine *vtbl = obj->vtbl;
   wstring_t v1;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->set_hardware_uuid(obj, v1));
   res = rb_ary_new();
   return res;
@@ -6485,8 +6485,8 @@ static VALUE Console__attach_usb_device(VALUE self, VALUE i0) {
   struct obj *obj = DATA_PTR(self);
   struct Console *vtbl = obj->vtbl;
   wstring_t v1;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->attach_usb_device(obj, v1));
   res = rb_ary_new();
   return res;
@@ -6497,8 +6497,8 @@ static VALUE Console__detach_usb_device(VALUE self, VALUE i0) {
   struct Console *vtbl = obj->vtbl;
   wstring_t v1;
   void * v2;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->detach_usb_device(obj, v1, &v2));
   res = rb_ary_new();
   rb_ary_push(res, convert_interface(v2, cUSBDevice));
@@ -6525,8 +6525,8 @@ static VALUE Console__find_usb_device_by_id(VALUE self, VALUE i0) {
   struct Console *vtbl = obj->vtbl;
   wstring_t v1;
   void * v2;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->find_usb_device_by_id(obj, v1, &v2));
   res = rb_ary_new();
   rb_ary_push(res, convert_interface(v2, cUSBDevice));
@@ -6587,8 +6587,8 @@ static VALUE Console__delete_snapshot(VALUE self, VALUE i0) {
   struct Console *vtbl = obj->vtbl;
   wstring_t v1;
   void * v2;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->delete_snapshot(obj, v1, &v2));
   res = rb_ary_new();
   rb_ary_push(res, convert_interface(v2, cProgress));
@@ -6601,8 +6601,8 @@ static VALUE Console__delete_snapshot_and_all_children(VALUE self, VALUE i0) {
   struct Console *vtbl = obj->vtbl;
   wstring_t v1;
   void * v2;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->delete_snapshot_and_all_children(obj, v1, &v2));
   res = rb_ary_new();
   rb_ary_push(res, convert_interface(v2, cProgress));
@@ -6616,10 +6616,10 @@ static VALUE Console__delete_snapshot_range(VALUE self, VALUE i0, VALUE i1) {
   wstring_t v1;
   wstring_t v2;
   void * v3;
-  i0 = prepare_wstring(i0);
-  i1 = prepare_wstring(i1);
-  extract_wstring(i0, &v1);
-  extract_wstring(i1, &v2);
+  i0 = prepare_uuid(i0);
+  i1 = prepare_uuid(i1);
+  extract_uuid(i0, &v1);
+  extract_uuid(i1, &v2);
   NS_CHECK(vtbl->delete_snapshot_range(obj, v1, v2, &v3));
   res = rb_ary_new();
   rb_ary_push(res, convert_interface(v3, cProgress));
@@ -6894,7 +6894,7 @@ static VALUE HostNetworkInterface__get_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -7104,8 +7104,8 @@ static VALUE Host__remove_host_only_network_interface(VALUE self, VALUE i0) {
   struct Host *vtbl = obj->vtbl;
   wstring_t v1;
   void * v2;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->remove_host_only_network_interface(obj, v1, &v2));
   res = rb_ary_new();
   rb_ary_push(res, convert_interface(v2, cProgress));
@@ -7199,8 +7199,8 @@ static VALUE Host__find_host_network_interface_by_id(VALUE self, VALUE i0) {
   struct Host *vtbl = obj->vtbl;
   wstring_t v1;
   void * v2;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->find_host_network_interface_by_id(obj, v1, &v2));
   res = rb_ary_new();
   rb_ary_push(res, convert_interface(v2, cHostNetworkInterface));
@@ -7228,8 +7228,8 @@ static VALUE Host__find_usb_device_by_id(VALUE self, VALUE i0) {
   struct Host *vtbl = obj->vtbl;
   wstring_t v1;
   void * v2;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->find_usb_device_by_id(obj, v1, &v2));
   res = rb_ary_new();
   rb_ary_push(res, convert_interface(v2, cHostUSBDevice));
@@ -10077,7 +10077,7 @@ static VALUE Progress__get_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -10275,7 +10275,7 @@ static VALUE Snapshot__get_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -10509,13 +10509,13 @@ static VALUE Medium__set_ids(VALUE self, VALUE i0, VALUE i1, VALUE i2, VALUE i3)
   bool_t v3;
   wstring_t v4;
   i0 = prepare_bool(i0);
-  i1 = prepare_wstring(i1);
+  i1 = prepare_uuid(i1);
   i2 = prepare_bool(i2);
-  i3 = prepare_wstring(i3);
+  i3 = prepare_uuid(i3);
   extract_bool(i0, &v1);
-  extract_wstring(i1, &v2);
+  extract_uuid(i1, &v2);
   extract_bool(i2, &v3);
-  extract_wstring(i3, &v4);
+  extract_uuid(i3, &v4);
   NS_CHECK(vtbl->set_ids(obj, v1, v2, v3, v4));
   res = rb_ary_new();
   return res;
@@ -10538,11 +10538,11 @@ static VALUE Medium__get_snapshot_ids(VALUE self, VALUE i0) {
   wstring_t v1;
   uint32_t v2_size;
   void * v2;
-  i0 = prepare_wstring(i0);
-  extract_wstring(i0, &v1);
+  i0 = prepare_uuid(i0);
+  extract_uuid(i0, &v1);
   NS_CHECK(vtbl->get_snapshot_ids(obj, v1, &v2_size, &v2));
   res = rb_ary_new();
-  rb_ary_push(res, convert_array_wstring(v2_size, v2));
+  rb_ary_push(res, convert_array_uuid(v2_size, v2));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -10798,7 +10798,7 @@ static VALUE Medium__get_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -11065,7 +11065,7 @@ static VALUE Medium__get_machine_ids(VALUE self) {
   void * v1;
   NS_CHECK(vtbl->get_machine_ids(obj, &v1_size, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_array_wstring(v1_size, v1));
+  rb_ary_push(res, convert_array_uuid(v1_size, v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -13187,7 +13187,7 @@ static VALUE USBDevice__get_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -14154,9 +14154,9 @@ static VALUE InternalSessionControl__on_usb_device_detach(VALUE self, VALUE i0,
   struct InternalSessionControl *vtbl = obj->vtbl;
   wstring_t v1;
   void * v2;
-  i0 = prepare_wstring(i0);
+  i0 = prepare_uuid(i0);
   i1 = prepare_interface(i1, cVirtualBoxErrorInfo);
-  extract_wstring(i0, &v1);
+  extract_uuid(i0, &v1);
   extract_interface(i1, &v2, cVirtualBoxErrorInfo);
   NS_CHECK(vtbl->on_usb_device_detach(obj, v1, v2));
   res = rb_ary_new();
@@ -15677,7 +15677,7 @@ static VALUE MachineEvent__get_machine_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_machine_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -15710,7 +15710,7 @@ static VALUE MediumRegisteredEvent__get_medium_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_medium_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -15798,7 +15798,7 @@ static VALUE SnapshotEvent__get_snapshot_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_snapshot_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -16240,7 +16240,7 @@ static VALUE ExtraDataChangedEvent__get_machine_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_machine_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -16307,7 +16307,7 @@ static VALUE ExtraDataCanChangeEvent__get_machine_id(VALUE self) {
   wstring_t v1;
   NS_CHECK(vtbl->get_machine_id(obj, &v1));
   res = rb_ary_new();
-  rb_ary_push(res, convert_wstring(v1));
+  rb_ary_push(res, convert_uuid(v1));
   res = rb_ary_entry(res, 0);
   return res;
 }
@@ -16603,14 +16603,14 @@ static void comclass_init(VALUE under) {
     VALUE c    = cNSISupports
       = rb_define_class_under(under, "NSISupports", cAbstractInterface);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0xf3a8d3b4, 0xc424, 0x4edc, {0x8b, 0xf6, 0x89, 0x74, 0xc9, 0x83, 0xba, 0x78}};
     VALUE c    = cNSIException
       = rb_define_class_under(under, "NSIException", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "message", NSIException__get_message, 0);
     rb_define_method(c, "result", NSIException__get_result, 0);
     rb_define_method(c, "name", NSIException__get_name, 0);
@@ -16627,7 +16627,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSettingsVersion
       = rb_define_class_under(under, "SettingsVersion", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("v1_0"), ULL2NUM(1));
@@ -16653,7 +16653,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAccessMode
       = rb_define_class_under(under, "AccessMode", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("read_only"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("read_write"), ULL2NUM(2));
@@ -16664,7 +16664,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMachineState
       = rb_define_class_under(under, "MachineState", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("powered_off"), ULL2NUM(1));
@@ -16699,7 +16699,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSessionState
       = rb_define_class_under(under, "SessionState", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("unlocked"), ULL2NUM(1));
@@ -16713,7 +16713,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cCPUPropertyType
       = rb_define_class_under(under, "CPUPropertyType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("pae"), ULL2NUM(1));
@@ -16725,7 +16725,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cHWVirtExPropertyType
       = rb_define_class_under(under, "HWVirtExPropertyType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("enabled"), ULL2NUM(1));
@@ -16741,7 +16741,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cFaultToleranceState
       = rb_define_class_under(under, "FaultToleranceState", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("inactive"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("master"), ULL2NUM(2));
@@ -16753,7 +16753,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cLockType
       = rb_define_class_under(under, "LockType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("write"), ULL2NUM(2));
     rb_funcall(h, _bracketseq, 2, SYM("shared"), ULL2NUM(1));
@@ -16765,7 +16765,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSessionType
       = rb_define_class_under(under, "SessionType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("write_lock"), ULL2NUM(1));
@@ -16778,7 +16778,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDeviceType
       = rb_define_class_under(under, "DeviceType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("floppy"), ULL2NUM(1));
@@ -16794,7 +16794,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDeviceActivity
       = rb_define_class_under(under, "DeviceActivity", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("idle"), ULL2NUM(1));
@@ -16807,7 +16807,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cClipboardMode
       = rb_define_class_under(under, "ClipboardMode", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("disabled"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("host_to_guest"), ULL2NUM(1));
@@ -16820,7 +16820,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDragAndDropMode
       = rb_define_class_under(under, "DragAndDropMode", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("disabled"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("host_to_guest"), ULL2NUM(1));
@@ -16833,7 +16833,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cScope
       = rb_define_class_under(under, "Scope", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("global"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("machine"), ULL2NUM(1));
@@ -16845,7 +16845,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cBIOSBootMenuMode
       = rb_define_class_under(under, "BIOSBootMenuMode", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("disabled"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("menu_only"), ULL2NUM(1));
@@ -16857,7 +16857,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProcessorFeature
       = rb_define_class_under(under, "ProcessorFeature", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("hw_virt_ex"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("pae"), ULL2NUM(1));
@@ -16870,7 +16870,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cFirmwareType
       = rb_define_class_under(under, "FirmwareType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("bios"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("efi"), ULL2NUM(2));
@@ -16884,7 +16884,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cPointingHIDType
       = rb_define_class_under(under, "PointingHIDType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("ps2_mouse"), ULL2NUM(2));
@@ -16898,7 +16898,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cKeyboardHIDType
       = rb_define_class_under(under, "KeyboardHIDType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("ps2_keyboard"), ULL2NUM(2));
@@ -16911,7 +16911,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVFSType
       = rb_define_class_under(under, "VFSType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("file"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("cloud"), ULL2NUM(2));
@@ -16924,7 +16924,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVFSFileType
       = rb_define_class_under(under, "VFSFileType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("unknown"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("fifo"), ULL2NUM(2));
@@ -16942,7 +16942,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cImportOptions
       = rb_define_class_under(under, "ImportOptions", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("keep_all_macs"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("keep_nat_macs"), ULL2NUM(2));
@@ -16953,7 +16953,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVirtualSystemDescriptionType
       = rb_define_class_under(under, "VirtualSystemDescriptionType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("ignore"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("os"), ULL2NUM(2));
@@ -16986,7 +16986,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVirtualSystemDescriptionValueType
       = rb_define_class_under(under, "VirtualSystemDescriptionValueType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("reference"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("original"), ULL2NUM(2));
@@ -16999,7 +16999,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cCleanupMode
       = rb_define_class_under(under, "CleanupMode", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("unregister_only"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("detach_all_return_none"), ULL2NUM(2));
@@ -17012,7 +17012,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cCloneMode
       = rb_define_class_under(under, "CloneMode", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("machine_state"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("machine_and_child_states"), ULL2NUM(2));
@@ -17024,7 +17024,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cCloneOptions
       = rb_define_class_under(under, "CloneOptions", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("link"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("keep_all_macs"), ULL2NUM(2));
@@ -17037,7 +17037,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAutostopType
       = rb_define_class_under(under, "AutostopType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("disabled"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("save_state"), ULL2NUM(2));
@@ -17050,7 +17050,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cHostNetworkInterfaceMediumType
       = rb_define_class_under(under, "HostNetworkInterfaceMediumType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("unknown"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("ethernet"), ULL2NUM(1));
@@ -17063,7 +17063,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cHostNetworkInterfaceStatus
       = rb_define_class_under(under, "HostNetworkInterfaceStatus", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("unknown"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("up"), ULL2NUM(1));
@@ -17075,7 +17075,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cHostNetworkInterfaceType
       = rb_define_class_under(under, "HostNetworkInterfaceType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("bridged"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("host_only"), ULL2NUM(2));
@@ -17086,7 +17086,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAdditionsFacilityType
       = rb_define_class_under(under, "AdditionsFacilityType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("vbox_guest_driver"), ULL2NUM(20));
@@ -17103,7 +17103,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAdditionsFacilityClass
       = rb_define_class_under(under, "AdditionsFacilityClass", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("driver"), ULL2NUM(10));
@@ -17119,7 +17119,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAdditionsFacilityStatus
       = rb_define_class_under(under, "AdditionsFacilityStatus", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("inactive"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("paused"), ULL2NUM(1));
@@ -17137,7 +17137,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAdditionsRunLevelType
       = rb_define_class_under(under, "AdditionsRunLevelType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("system"), ULL2NUM(1));
@@ -17150,7 +17150,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAdditionsUpdateFlag
       = rb_define_class_under(under, "AdditionsUpdateFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("wait_for_update_start_only"), ULL2NUM(1));
@@ -17161,7 +17161,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cFileSeekType
       = rb_define_class_under(under, "FileSeekType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("set"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("current"), ULL2NUM(1));
@@ -17172,7 +17172,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProcessInputFlag
       = rb_define_class_under(under, "ProcessInputFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("end_of_file"), ULL2NUM(1));
@@ -17183,7 +17183,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProcessOutputFlag
       = rb_define_class_under(under, "ProcessOutputFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("std_err"), ULL2NUM(1));
@@ -17194,7 +17194,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProcessWaitForFlag
       = rb_define_class_under(under, "ProcessWaitForFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("start"), ULL2NUM(1));
@@ -17209,7 +17209,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProcessWaitResult
       = rb_define_class_under(under, "ProcessWaitResult", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("start"), ULL2NUM(1));
@@ -17228,7 +17228,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cCopyFileFlag
       = rb_define_class_under(under, "CopyFileFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("recursive"), ULL2NUM(1));
@@ -17241,7 +17241,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDirectoryCreateFlag
       = rb_define_class_under(under, "DirectoryCreateFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("parents"), ULL2NUM(1));
@@ -17252,7 +17252,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDirectoryRemoveRecFlag
       = rb_define_class_under(under, "DirectoryRemoveRecFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("content_and_dir"), ULL2NUM(1));
@@ -17264,7 +17264,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cPathRenameFlag
       = rb_define_class_under(under, "PathRenameFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("no_replace"), ULL2NUM(1));
@@ -17277,7 +17277,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProcessCreateFlag
       = rb_define_class_under(under, "ProcessCreateFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("wait_for_process_start_only"), ULL2NUM(1));
@@ -17294,7 +17294,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProcessPriority
       = rb_define_class_under(under, "ProcessPriority", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("invalid"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("default"), ULL2NUM(1));
@@ -17305,7 +17305,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSymlinkType
       = rb_define_class_under(under, "SymlinkType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("unknown"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("directory"), ULL2NUM(1));
@@ -17317,7 +17317,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSymlinkReadFlag
       = rb_define_class_under(under, "SymlinkReadFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("no_symlinks"), ULL2NUM(1));
@@ -17328,7 +17328,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProcessStatus
       = rb_define_class_under(under, "ProcessStatus", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("undefined"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("starting"), ULL2NUM(10));
@@ -17349,7 +17349,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cFsObjType
       = rb_define_class_under(under, "FsObjType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("undefined"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("fifo"), ULL2NUM(1));
@@ -17367,7 +17367,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDragAndDropAction
       = rb_define_class_under(under, "DragAndDropAction", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("ignore"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("copy"), ULL2NUM(1));
@@ -17380,7 +17380,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDirectoryOpenFlag
       = rb_define_class_under(under, "DirectoryOpenFlag", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("no_symlinks"), ULL2NUM(1));
@@ -17391,7 +17391,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMediumState
       = rb_define_class_under(under, "MediumState", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("not_created"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("created"), ULL2NUM(1));
@@ -17407,7 +17407,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMediumType
       = rb_define_class_under(under, "MediumType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("normal"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("immutable"), ULL2NUM(1));
@@ -17422,7 +17422,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMediumVariant
       = rb_define_class_under(under, "MediumVariant", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("standard"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("vmdk_split2g"), ULL2NUM(1));
@@ -17439,7 +17439,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDataType
       = rb_define_class_under(under, "DataType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("int32"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("int8"), ULL2NUM(1));
@@ -17451,7 +17451,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDataFlags
       = rb_define_class_under(under, "DataFlags", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("none"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("mandatory"), ULL2NUM(1));
@@ -17465,7 +17465,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMediumFormatCapabilities
       = rb_define_class_under(under, "MediumFormatCapabilities", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("uuid"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("create_fixed"), ULL2NUM(2));
@@ -17485,7 +17485,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMouseButtonState
       = rb_define_class_under(under, "MouseButtonState", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("left_button"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("right_button"), ULL2NUM(2));
@@ -17502,7 +17502,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cFramebufferPixelFormat
       = rb_define_class_under(under, "FramebufferPixelFormat", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("opaque"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("fourcc_rgb"), ULL2NUM(843204434));
@@ -17513,7 +17513,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cNetworkAttachmentType
       = rb_define_class_under(under, "NetworkAttachmentType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("nat"), ULL2NUM(1));
@@ -17528,7 +17528,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cNetworkAdapterType
       = rb_define_class_under(under, "NetworkAdapterType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("am79c970a"), ULL2NUM(1));
@@ -17544,7 +17544,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cNetworkAdapterPromiscModePolicy
       = rb_define_class_under(under, "NetworkAdapterPromiscModePolicy", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("deny"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("allow_network"), ULL2NUM(2));
@@ -17556,7 +17556,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cPortMode
       = rb_define_class_under(under, "PortMode", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("disconnected"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("host_pipe"), ULL2NUM(1));
@@ -17569,7 +17569,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cUSBDeviceState
       = rb_define_class_under(under, "USBDeviceState", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("not_supported"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("unavailable"), ULL2NUM(1));
@@ -17584,7 +17584,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cUSBDeviceFilterAction
       = rb_define_class_under(under, "USBDeviceFilterAction", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("ignore"), ULL2NUM(1));
@@ -17596,7 +17596,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAudioDriverType
       = rb_define_class_under(under, "AudioDriverType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("winmm"), ULL2NUM(1));
@@ -17614,7 +17614,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAudioControllerType
       = rb_define_class_under(under, "AudioControllerType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("ac97"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("sb16"), ULL2NUM(1));
@@ -17626,7 +17626,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAuthType
       = rb_define_class_under(under, "AuthType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("external"), ULL2NUM(1));
@@ -17638,7 +17638,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cStorageBus
       = rb_define_class_under(under, "StorageBus", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("ide"), ULL2NUM(1));
@@ -17653,7 +17653,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cStorageControllerType
       = rb_define_class_under(under, "StorageControllerType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("lsi_logic"), ULL2NUM(1));
@@ -17671,7 +17671,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cChipsetType
       = rb_define_class_under(under, "ChipsetType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("piix3"), ULL2NUM(1));
@@ -17683,7 +17683,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cNATAliasMode
       = rb_define_class_under(under, "NATAliasMode", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("alias_log"), ULL2NUM(1));
     rb_funcall(h, _bracketseq, 2, SYM("alias_proxy_only"), ULL2NUM(2));
@@ -17695,7 +17695,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cNATProtocol
       = rb_define_class_under(under, "NATProtocol", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("udp"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("tcp"), ULL2NUM(1));
@@ -17706,7 +17706,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cBandwidthGroupType
       = rb_define_class_under(under, "BandwidthGroupType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("null"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("disk"), ULL2NUM(1));
@@ -17718,7 +17718,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVBoxEventType
       = rb_define_class_under(under, "VBoxEventType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("invalid"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("any"), ULL2NUM(1));
@@ -17777,7 +17777,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestMonitorChangedEventType
       = rb_define_class_under(under, "GuestMonitorChangedEventType", cAbstractEnum);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     VALUE h    = rb_hash_new();
     rb_funcall(h, _bracketseq, 2, SYM("enabled"), ULL2NUM(0));
     rb_funcall(h, _bracketseq, 2, SYM("disabled"), ULL2NUM(1));
@@ -17789,7 +17789,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVirtualBoxErrorInfo
       = rb_define_class_under(under, "VirtualBoxErrorInfo", cNSIException);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "result_code", VirtualBoxErrorInfo__get_result_code, 0);
     rb_define_method(c, "interface_i_d", VirtualBoxErrorInfo__get_interface_i_d, 0);
     rb_define_method(c, "component", VirtualBoxErrorInfo__get_component, 0);
@@ -17801,7 +17801,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDHCPServer
       = rb_define_class_under(under, "DHCPServer", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "enabled", DHCPServer__get_enabled, 0);
     rb_define_method(c, "enabled=", DHCPServer__set_enabled, 1);
     rb_define_method(c, "ip_address", DHCPServer__get_ip_address, 0);
@@ -17818,7 +17818,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVirtualBox
       = rb_define_class_under(under, "VirtualBox", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "version", VirtualBox__get_version, 0);
     rb_define_method(c, "version_normalized", VirtualBox__get_version_normalized, 0);
     rb_define_method(c, "revision", VirtualBox__get_revision, 0);
@@ -17869,7 +17869,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVFSExplorer
       = rb_define_class_under(under, "VFSExplorer", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "path", VFSExplorer__get_path, 0);
     rb_define_method(c, "type", VFSExplorer__get_type, 0);
     rb_define_method(c, "update", VFSExplorer__update, 0);
@@ -17884,7 +17884,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAppliance
       = rb_define_class_under(under, "Appliance", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "path", Appliance__get_path, 0);
     rb_define_method(c, "disks", Appliance__get_disks, 0);
     rb_define_method(c, "virtual_system_descriptions", Appliance__get_virtual_system_descriptions, 0);
@@ -17901,7 +17901,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVirtualSystemDescription
       = rb_define_class_under(under, "VirtualSystemDescription", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "count", VirtualSystemDescription__get_count, 0);
     rb_define_method(c, "get_description", VirtualSystemDescription__get_description, 0);
     rb_define_method(c, "get_description_by_type", VirtualSystemDescription__get_description_by_type, 1);
@@ -17914,7 +17914,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cInternalMachineControl
       = rb_define_class_under(under, "InternalMachineControl", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "set_remove_saved_state_file", InternalMachineControl__set_remove_saved_state_file, 1);
     rb_define_method(c, "update_state", InternalMachineControl__update_state, 1);
     rb_define_method(c, "get_ipcid", InternalMachineControl__get_ipcid, 0);
@@ -17947,7 +17947,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cBIOSSettings
       = rb_define_class_under(under, "BIOSSettings", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "logo_fade_in", BIOSSettings__get_logo_fade_in, 0);
     rb_define_method(c, "logo_fade_in=", BIOSSettings__set_logo_fade_in, 1);
     rb_define_method(c, "logo_fade_out", BIOSSettings__get_logo_fade_out, 0);
@@ -17972,7 +17972,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cPCIAddress
       = rb_define_class_under(under, "PCIAddress", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "bus", PCIAddress__get_bus, 0);
     rb_define_method(c, "bus=", PCIAddress__set_bus, 1);
     rb_define_method(c, "device", PCIAddress__get_device, 0);
@@ -17987,7 +17987,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cPCIDeviceAttachment
       = rb_define_class_under(under, "PCIDeviceAttachment", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "name", PCIDeviceAttachment__get_name, 0);
     rb_define_method(c, "is_physical_device", PCIDeviceAttachment__get_is_physical_device, 0);
     rb_define_method(c, "host_address", PCIDeviceAttachment__get_host_address, 0);
@@ -17998,7 +17998,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMachine
       = rb_define_class_under(under, "Machine", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "parent", Machine__get_parent, 0);
     rb_define_method(c, "accessible", Machine__get_accessible, 0);
     rb_define_method(c, "access_error", Machine__get_access_error, 0);
@@ -18196,7 +18196,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVRDEServerInfo
       = rb_define_class_under(under, "VRDEServerInfo", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "active", VRDEServerInfo__get_active, 0);
     rb_define_method(c, "port", VRDEServerInfo__get_port, 0);
     rb_define_method(c, "number_of_clients", VRDEServerInfo__get_number_of_clients, 0);
@@ -18218,7 +18218,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cConsole
       = rb_define_class_under(under, "Console", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "machine", Console__get_machine, 0);
     rb_define_method(c, "state", Console__get_state, 0);
     rb_define_method(c, "guest", Console__get_guest, 0);
@@ -18266,7 +18266,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cHostNetworkInterface
       = rb_define_class_under(under, "HostNetworkInterface", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "name", HostNetworkInterface__get_name, 0);
     rb_define_method(c, "id", HostNetworkInterface__get_id, 0);
     rb_define_method(c, "network_name", HostNetworkInterface__get_network_name, 0);
@@ -18290,7 +18290,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cHost
       = rb_define_class_under(under, "Host", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "dvd_drives", Host__get_dvd_drives, 0);
     rb_define_method(c, "floppy_drives", Host__get_floppy_drives, 0);
     rb_define_method(c, "usb_devices", Host__get_usb_devices, 0);
@@ -18328,7 +18328,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSystemProperties
       = rb_define_class_under(under, "SystemProperties", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "min_guest_ram", SystemProperties__get_min_guest_ram, 0);
     rb_define_method(c, "max_guest_ram", SystemProperties__get_max_guest_ram, 0);
     rb_define_method(c, "min_guest_vram", SystemProperties__get_min_guest_vram, 0);
@@ -18380,7 +18380,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestOSType
       = rb_define_class_under(under, "GuestOSType", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "family_id", GuestOSType__get_family_id, 0);
     rb_define_method(c, "family_description", GuestOSType__get_family_description, 0);
     rb_define_method(c, "id", GuestOSType__get_id, 0);
@@ -18414,7 +18414,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAdditionsFacility
       = rb_define_class_under(under, "AdditionsFacility", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "class_type", AdditionsFacility__get_class_type, 0);
     rb_define_method(c, "last_updated", AdditionsFacility__get_last_updated, 0);
     rb_define_method(c, "name", AdditionsFacility__get_name, 0);
@@ -18426,7 +18426,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestSession
       = rb_define_class_under(under, "GuestSession", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "user", GuestSession__get_user, 0);
     rb_define_method(c, "domain", GuestSession__get_domain, 0);
     rb_define_method(c, "name", GuestSession__get_name, 0);
@@ -18475,7 +18475,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProcess
       = rb_define_class_under(under, "Process", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "pid", Process__get_pid, 0);
     rb_define_method(c, "status", Process__get_status, 0);
     rb_define_method(c, "exit_code", Process__get_exit_code, 0);
@@ -18495,14 +18495,14 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestProcess
       = rb_define_class_under(under, "GuestProcess", cProcess);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0x1b70dd03, 0x26d7, 0x483a, {0x88, 0x77, 0x89, 0xbb, 0xb0, 0xf8, 0x7b, 0x70}};
     VALUE c    = cDirectory
       = rb_define_class_under(under, "Directory", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "directory_name", Directory__get_directory_name, 0);
     rb_define_method(c, "filter", Directory__get_filter, 0);
     rb_define_method(c, "close", Directory__close, 0);
@@ -18513,14 +18513,14 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestDirectory
       = rb_define_class_under(under, "GuestDirectory", cDirectory);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0xb702a560, 0x6139, 0x4a8e, {0xa8, 0x92, 0xbb, 0xf1, 0x4b, 0x97, 0xbf, 0x97}};
     VALUE c    = cFile
       = rb_define_class_under(under, "File", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "creation_mode", File__get_creation_mode, 0);
     rb_define_method(c, "disposition", File__get_disposition, 0);
     rb_define_method(c, "file_name", File__get_file_name, 0);
@@ -18541,14 +18541,14 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestFile
       = rb_define_class_under(under, "GuestFile", cFile);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0x4047ba30, 0x7006, 0x4966, {0xae, 0x86, 0x94, 0x16, 0x4e, 0x5e, 0x20, 0xeb}};
     VALUE c    = cFsObjInfo
       = rb_define_class_under(under, "FsObjInfo", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "access_time", FsObjInfo__get_access_time, 0);
     rb_define_method(c, "allocated_size", FsObjInfo__get_allocated_size, 0);
     rb_define_method(c, "birth_time", FsObjInfo__get_birth_time, 0);
@@ -18574,14 +18574,14 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestFsObjInfo
       = rb_define_class_under(under, "GuestFsObjInfo", cFsObjInfo);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0x19c32350, 0x0618, 0x4ede, {0xb0, 0xc3, 0x2b, 0x43, 0x11, 0xbf, 0x0d, 0x9b}};
     VALUE c    = cGuest
       = rb_define_class_under(under, "Guest", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "os_type_id", Guest__get_os_type_id, 0);
     rb_define_method(c, "additions_run_level", Guest__get_additions_run_level, 0);
     rb_define_method(c, "additions_version", Guest__get_additions_version, 0);
@@ -18613,7 +18613,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cProgress
       = rb_define_class_under(under, "Progress", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "id", Progress__get_id, 0);
     rb_define_method(c, "description", Progress__get_description, 0);
     rb_define_method(c, "initiator", Progress__get_initiator, 0);
@@ -18643,7 +18643,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSnapshot
       = rb_define_class_under(under, "Snapshot", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "id", Snapshot__get_id, 0);
     rb_define_method(c, "name", Snapshot__get_name, 0);
     rb_define_method(c, "name=", Snapshot__set_name, 1);
@@ -18661,7 +18661,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMediumAttachment
       = rb_define_class_under(under, "MediumAttachment", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "medium", MediumAttachment__get_medium, 0);
     rb_define_method(c, "controller", MediumAttachment__get_controller, 0);
     rb_define_method(c, "port", MediumAttachment__get_port, 0);
@@ -18679,7 +18679,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMedium
       = rb_define_class_under(under, "Medium", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "id", Medium__get_id, 0);
     rb_define_method(c, "description", Medium__get_description, 0);
     rb_define_method(c, "description=", Medium__set_description, 1);
@@ -18732,7 +18732,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMediumFormat
       = rb_define_class_under(under, "MediumFormat", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "id", MediumFormat__get_id, 0);
     rb_define_method(c, "name", MediumFormat__get_name, 0);
     rb_define_method(c, "capabilities", MediumFormat__get_capabilities, 0);
@@ -18744,7 +18744,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cKeyboard
       = rb_define_class_under(under, "Keyboard", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "event_source", Keyboard__get_event_source, 0);
     rb_define_method(c, "put_scancode", Keyboard__put_scancode, 1);
     rb_define_method(c, "put_scancodes", Keyboard__put_scancodes, 1);
@@ -18755,7 +18755,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMouse
       = rb_define_class_under(under, "Mouse", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "absolute_supported", Mouse__get_absolute_supported, 0);
     rb_define_method(c, "relative_supported", Mouse__get_relative_supported, 0);
     rb_define_method(c, "needs_host_cursor", Mouse__get_needs_host_cursor, 0);
@@ -18768,7 +18768,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cFramebuffer
       = rb_define_class_under(under, "Framebuffer", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "address", Framebuffer__get_address, 0);
     rb_define_method(c, "width", Framebuffer__get_width, 0);
     rb_define_method(c, "height", Framebuffer__get_height, 0);
@@ -18793,7 +18793,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cFramebufferOverlay
       = rb_define_class_under(under, "FramebufferOverlay", cFramebuffer);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "x", FramebufferOverlay__get_x, 0);
     rb_define_method(c, "y", FramebufferOverlay__get_y, 0);
     rb_define_method(c, "visible", FramebufferOverlay__get_visible, 0);
@@ -18805,7 +18805,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDisplay
       = rb_define_class_under(under, "Display", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "get_screen_resolution", Display__get_screen_resolution, 1);
     rb_define_method(c, "set_framebuffer", Display__set_framebuffer, 2);
     rb_define_method(c, "get_framebuffer", Display__get_framebuffer, 1);
@@ -18825,7 +18825,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cNetworkAdapter
       = rb_define_class_under(under, "NetworkAdapter", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "adapter_type", NetworkAdapter__get_adapter_type, 0);
     rb_define_method(c, "adapter_type=", NetworkAdapter__set_adapter_type, 1);
     rb_define_method(c, "slot", NetworkAdapter__get_slot, 0);
@@ -18869,7 +18869,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSerialPort
       = rb_define_class_under(under, "SerialPort", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "slot", SerialPort__get_slot, 0);
     rb_define_method(c, "enabled", SerialPort__get_enabled, 0);
     rb_define_method(c, "enabled=", SerialPort__set_enabled, 1);
@@ -18889,7 +18889,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cParallelPort
       = rb_define_class_under(under, "ParallelPort", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "slot", ParallelPort__get_slot, 0);
     rb_define_method(c, "enabled", ParallelPort__get_enabled, 0);
     rb_define_method(c, "enabled=", ParallelPort__set_enabled, 1);
@@ -18905,7 +18905,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMachineDebugger
       = rb_define_class_under(under, "MachineDebugger", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "single_step", MachineDebugger__get_single_step, 0);
     rb_define_method(c, "single_step=", MachineDebugger__set_single_step, 1);
     rb_define_method(c, "recompile_user", MachineDebugger__get_recompile_user, 0);
@@ -18959,7 +18959,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cUSBController
       = rb_define_class_under(under, "USBController", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "enabled", USBController__get_enabled, 0);
     rb_define_method(c, "enabled=", USBController__set_enabled, 1);
     rb_define_method(c, "enabled_ehci", USBController__get_enabled_ehci, 0);
@@ -18976,7 +18976,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cUSBDevice
       = rb_define_class_under(under, "USBDevice", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "id", USBDevice__get_id, 0);
     rb_define_method(c, "vendor_id", USBDevice__get_vendor_id, 0);
     rb_define_method(c, "product_id", USBDevice__get_product_id, 0);
@@ -18995,7 +18995,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cUSBDeviceFilter
       = rb_define_class_under(under, "USBDeviceFilter", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "name", USBDeviceFilter__get_name, 0);
     rb_define_method(c, "name=", USBDeviceFilter__set_name, 1);
     rb_define_method(c, "active", USBDeviceFilter__get_active, 0);
@@ -19024,7 +19024,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cHostUSBDevice
       = rb_define_class_under(under, "HostUSBDevice", cUSBDevice);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "state", HostUSBDevice__get_state, 0);
   }
   {
@@ -19032,7 +19032,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cHostUSBDeviceFilter
       = rb_define_class_under(under, "HostUSBDeviceFilter", cUSBDeviceFilter);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "action", HostUSBDeviceFilter__get_action, 0);
     rb_define_method(c, "action=", HostUSBDeviceFilter__set_action, 1);
   }
@@ -19041,7 +19041,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAudioAdapter
       = rb_define_class_under(under, "AudioAdapter", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "enabled", AudioAdapter__get_enabled, 0);
     rb_define_method(c, "enabled=", AudioAdapter__set_enabled, 1);
     rb_define_method(c, "audio_controller", AudioAdapter__get_audio_controller, 0);
@@ -19054,7 +19054,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVRDEServer
       = rb_define_class_under(under, "VRDEServer", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "enabled", VRDEServer__get_enabled, 0);
     rb_define_method(c, "enabled=", VRDEServer__set_enabled, 1);
     rb_define_method(c, "auth_type", VRDEServer__get_auth_type, 0);
@@ -19078,7 +19078,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSharedFolder
       = rb_define_class_under(under, "SharedFolder", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "name", SharedFolder__get_name, 0);
     rb_define_method(c, "host_path", SharedFolder__get_host_path, 0);
     rb_define_method(c, "accessible", SharedFolder__get_accessible, 0);
@@ -19091,7 +19091,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cInternalSessionControl
       = rb_define_class_under(under, "InternalSessionControl", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "get_pid", InternalSessionControl__get_pid, 0);
     rb_define_method(c, "get_remote_console", InternalSessionControl__get_remote_console, 0);
     rb_define_method(c, "assign_machine", InternalSessionControl__assign_machine, 2);
@@ -19125,7 +19125,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSession
       = rb_define_class_under(under, "Session", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "state", Session__get_state, 0);
     rb_define_method(c, "type", Session__get_type, 0);
     rb_define_method(c, "machine", Session__get_machine, 0);
@@ -19137,7 +19137,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cStorageController
       = rb_define_class_under(under, "StorageController", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "name", StorageController__get_name, 0);
     rb_define_method(c, "max_devices_per_port_count", StorageController__get_max_devices_per_port_count, 0);
     rb_define_method(c, "min_port_count", StorageController__get_min_port_count, 0);
@@ -19158,7 +19158,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cPerformanceMetric
       = rb_define_class_under(under, "PerformanceMetric", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "metric_name", PerformanceMetric__get_metric_name, 0);
     rb_define_method(c, "object", PerformanceMetric__get_object, 0);
     rb_define_method(c, "description", PerformanceMetric__get_description, 0);
@@ -19173,7 +19173,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cPerformanceCollector
       = rb_define_class_under(under, "PerformanceCollector", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "metric_names", PerformanceCollector__get_metric_names, 0);
     rb_define_method(c, "get_metrics", PerformanceCollector__get_metrics, 2);
     rb_define_method(c, "setup_metrics", PerformanceCollector__setup_metrics, 4);
@@ -19186,7 +19186,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cNATEngine
       = rb_define_class_under(under, "NATEngine", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "network", NATEngine__get_network, 0);
     rb_define_method(c, "network=", NATEngine__set_network, 1);
     rb_define_method(c, "host_ip", NATEngine__get_host_ip, 0);
@@ -19216,7 +19216,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cExtPackPlugIn
       = rb_define_class_under(under, "ExtPackPlugIn", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "name", ExtPackPlugIn__get_name, 0);
     rb_define_method(c, "description", ExtPackPlugIn__get_description, 0);
     rb_define_method(c, "frontend", ExtPackPlugIn__get_frontend, 0);
@@ -19227,7 +19227,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cExtPackBase
       = rb_define_class_under(under, "ExtPackBase", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "name", ExtPackBase__get_name, 0);
     rb_define_method(c, "description", ExtPackBase__get_description, 0);
     rb_define_method(c, "version", ExtPackBase__get_version, 0);
@@ -19246,7 +19246,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cExtPack
       = rb_define_class_under(under, "ExtPack", cExtPackBase);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "query_object", ExtPack__query_object, 1);
   }
   {
@@ -19254,7 +19254,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cExtPackFile
       = rb_define_class_under(under, "ExtPackFile", cExtPackBase);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "file_path", ExtPackFile__get_file_path, 0);
     rb_define_method(c, "install", ExtPackFile__install, 2);
   }
@@ -19263,7 +19263,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cExtPackManager
       = rb_define_class_under(under, "ExtPackManager", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "installed_ext_packs", ExtPackManager__get_installed_ext_packs, 0);
     rb_define_method(c, "find", ExtPackManager__find, 1);
     rb_define_method(c, "open_ext_pack_file", ExtPackManager__open_ext_pack_file, 1);
@@ -19277,7 +19277,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cBandwidthGroup
       = rb_define_class_under(under, "BandwidthGroup", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "name", BandwidthGroup__get_name, 0);
     rb_define_method(c, "type", BandwidthGroup__get_type, 0);
     rb_define_method(c, "reference", BandwidthGroup__get_reference, 0);
@@ -19289,7 +19289,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cBandwidthControl
       = rb_define_class_under(under, "BandwidthControl", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "num_groups", BandwidthControl__get_num_groups, 0);
     rb_define_method(c, "create_bandwidth_group", BandwidthControl__create_bandwidth_group, 3);
     rb_define_method(c, "delete_bandwidth_group", BandwidthControl__delete_bandwidth_group, 1);
@@ -19301,7 +19301,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVirtualBoxClient
       = rb_define_class_under(under, "VirtualBoxClient", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "virtual_box", VirtualBoxClient__get_virtual_box, 0);
     rb_define_method(c, "session", VirtualBoxClient__get_session, 0);
     rb_define_method(c, "event_source", VirtualBoxClient__get_event_source, 0);
@@ -19311,7 +19311,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cEventSource
       = rb_define_class_under(under, "EventSource", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "create_listener", EventSource__create_listener, 0);
     rb_define_method(c, "create_aggregator", EventSource__create_aggregator, 1);
     rb_define_method(c, "register_listener", EventSource__register_listener, 3);
@@ -19325,7 +19325,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cEventListener
       = rb_define_class_under(under, "EventListener", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "handle_event", EventListener__handle_event, 1);
   }
   {
@@ -19333,7 +19333,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cEvent
       = rb_define_class_under(under, "Event", cNSISupports);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "type", Event__get_type, 0);
     rb_define_method(c, "source", Event__get_source, 0);
     rb_define_method(c, "waitable", Event__get_waitable, 0);
@@ -19345,7 +19345,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cReusableEvent
       = rb_define_class_under(under, "ReusableEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "generation", ReusableEvent__get_generation, 0);
     rb_define_method(c, "reuse", ReusableEvent__reuse, 0);
   }
@@ -19354,7 +19354,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMachineEvent
       = rb_define_class_under(under, "MachineEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "machine_id", MachineEvent__get_machine_id, 0);
   }
   {
@@ -19362,7 +19362,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMachineStateChangedEvent
       = rb_define_class_under(under, "MachineStateChangedEvent", cMachineEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "state", MachineStateChangedEvent__get_state, 0);
   }
   {
@@ -19370,7 +19370,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMachineDataChangedEvent
       = rb_define_class_under(under, "MachineDataChangedEvent", cMachineEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "temporary", MachineDataChangedEvent__get_temporary, 0);
   }
   {
@@ -19378,7 +19378,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMediumRegisteredEvent
       = rb_define_class_under(under, "MediumRegisteredEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "medium_id", MediumRegisteredEvent__get_medium_id, 0);
     rb_define_method(c, "medium_type", MediumRegisteredEvent__get_medium_type, 0);
     rb_define_method(c, "registered", MediumRegisteredEvent__get_registered, 0);
@@ -19388,7 +19388,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMachineRegisteredEvent
       = rb_define_class_under(under, "MachineRegisteredEvent", cMachineEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "registered", MachineRegisteredEvent__get_registered, 0);
   }
   {
@@ -19396,7 +19396,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSessionStateChangedEvent
       = rb_define_class_under(under, "SessionStateChangedEvent", cMachineEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "state", SessionStateChangedEvent__get_state, 0);
   }
   {
@@ -19404,7 +19404,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestPropertyChangedEvent
       = rb_define_class_under(under, "GuestPropertyChangedEvent", cMachineEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "name", GuestPropertyChangedEvent__get_name, 0);
     rb_define_method(c, "value", GuestPropertyChangedEvent__get_value, 0);
     rb_define_method(c, "flags", GuestPropertyChangedEvent__get_flags, 0);
@@ -19414,7 +19414,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSnapshotEvent
       = rb_define_class_under(under, "SnapshotEvent", cMachineEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "snapshot_id", SnapshotEvent__get_snapshot_id, 0);
   }
   {
@@ -19422,28 +19422,28 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSnapshotTakenEvent
       = rb_define_class_under(under, "SnapshotTakenEvent", cSnapshotEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0xc48f3401, 0x4a9e, 0x43f4, {0xb7, 0xa7, 0x54, 0xbd, 0x28, 0x5e, 0x22, 0xf4}};
     VALUE c    = cSnapshotDeletedEvent
       = rb_define_class_under(under, "SnapshotDeletedEvent", cSnapshotEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0x07541941, 0x8079, 0x447a, {0xa3, 0x3e, 0x47, 0xa6, 0x9c, 0x79, 0x80, 0xdb}};
     VALUE c    = cSnapshotChangedEvent
       = rb_define_class_under(under, "SnapshotChangedEvent", cSnapshotEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0xa6dcf6e8, 0x416b, 0x4181, {0x8c, 0x4a, 0x45, 0xec, 0x95, 0x17, 0x7a, 0xef}};
     VALUE c    = cMousePointerShapeChangedEvent
       = rb_define_class_under(under, "MousePointerShapeChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "visible", MousePointerShapeChangedEvent__get_visible, 0);
     rb_define_method(c, "alpha", MousePointerShapeChangedEvent__get_alpha, 0);
     rb_define_method(c, "xhot", MousePointerShapeChangedEvent__get_xhot, 0);
@@ -19457,7 +19457,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cMouseCapabilityChangedEvent
       = rb_define_class_under(under, "MouseCapabilityChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "supports_absolute", MouseCapabilityChangedEvent__get_supports_absolute, 0);
     rb_define_method(c, "supports_relative", MouseCapabilityChangedEvent__get_supports_relative, 0);
     rb_define_method(c, "needs_host_cursor", MouseCapabilityChangedEvent__get_needs_host_cursor, 0);
@@ -19467,7 +19467,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cKeyboardLedsChangedEvent
       = rb_define_class_under(under, "KeyboardLedsChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "num_lock", KeyboardLedsChangedEvent__get_num_lock, 0);
     rb_define_method(c, "caps_lock", KeyboardLedsChangedEvent__get_caps_lock, 0);
     rb_define_method(c, "scroll_lock", KeyboardLedsChangedEvent__get_scroll_lock, 0);
@@ -19477,7 +19477,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cStateChangedEvent
       = rb_define_class_under(under, "StateChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "state", StateChangedEvent__get_state, 0);
   }
   {
@@ -19485,14 +19485,14 @@ static void comclass_init(VALUE under) {
     VALUE c    = cAdditionsStateChangedEvent
       = rb_define_class_under(under, "AdditionsStateChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0x08889892, 0x1EC6, 0x4883, {0x80, 0x1D, 0x77, 0xF5, 0x6C, 0xFD, 0x01, 0x03}};
     VALUE c    = cNetworkAdapterChangedEvent
       = rb_define_class_under(under, "NetworkAdapterChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "network_adapter", NetworkAdapterChangedEvent__get_network_adapter, 0);
   }
   {
@@ -19500,7 +19500,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSerialPortChangedEvent
       = rb_define_class_under(under, "SerialPortChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "serial_port", SerialPortChangedEvent__get_serial_port, 0);
   }
   {
@@ -19508,7 +19508,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cParallelPortChangedEvent
       = rb_define_class_under(under, "ParallelPortChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "parallel_port", ParallelPortChangedEvent__get_parallel_port, 0);
   }
   {
@@ -19516,14 +19516,14 @@ static void comclass_init(VALUE under) {
     VALUE c    = cStorageControllerChangedEvent
       = rb_define_class_under(under, "StorageControllerChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0x0FE2DA40, 0x5637, 0x472A, {0x97, 0x36, 0x72, 0x01, 0x9E, 0xAB, 0xD7, 0xDE}};
     VALUE c    = cMediumChangedEvent
       = rb_define_class_under(under, "MediumChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "medium_attachment", MediumChangedEvent__get_medium_attachment, 0);
   }
   {
@@ -19531,7 +19531,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cClipboardModeChangedEvent
       = rb_define_class_under(under, "ClipboardModeChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "clipboard_mode", ClipboardModeChangedEvent__get_clipboard_mode, 0);
   }
   {
@@ -19539,7 +19539,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cDragAndDropModeChangedEvent
       = rb_define_class_under(under, "DragAndDropModeChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "drag_and_drop_mode", DragAndDropModeChangedEvent__get_drag_and_drop_mode, 0);
   }
   {
@@ -19547,7 +19547,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cCPUChangedEvent
       = rb_define_class_under(under, "CPUChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "cpu", CPUChangedEvent__get_cpu, 0);
     rb_define_method(c, "add", CPUChangedEvent__get_add, 0);
   }
@@ -19556,7 +19556,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cCPUExecutionCapChangedEvent
       = rb_define_class_under(under, "CPUExecutionCapChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "execution_cap", CPUExecutionCapChangedEvent__get_execution_cap, 0);
   }
   {
@@ -19564,7 +19564,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestKeyboardEvent
       = rb_define_class_under(under, "GuestKeyboardEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "scancodes", GuestKeyboardEvent__get_scancodes, 0);
   }
   {
@@ -19572,7 +19572,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestMouseEvent
       = rb_define_class_under(under, "GuestMouseEvent", cReusableEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "absolute", GuestMouseEvent__get_absolute, 0);
     rb_define_method(c, "x", GuestMouseEvent__get_x, 0);
     rb_define_method(c, "y", GuestMouseEvent__get_y, 0);
@@ -19585,28 +19585,28 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVRDEServerChangedEvent
       = rb_define_class_under(under, "VRDEServerChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0xdd6a1080, 0xe1b7, 0x4339, {0xa5, 0x49, 0xf0, 0x87, 0x81, 0x15, 0x59, 0x6e}};
     VALUE c    = cVRDEServerInfoChangedEvent
       = rb_define_class_under(under, "VRDEServerInfoChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0x93BADC0C, 0x61D9, 0x4940, {0xA0, 0x84, 0xE6, 0xBB, 0x29, 0xAF, 0x3D, 0x83}};
     VALUE c    = cUSBControllerChangedEvent
       = rb_define_class_under(under, "USBControllerChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0x806da61b, 0x6679, 0x422a, {0xb6, 0x29, 0x51, 0xb0, 0x6b, 0x0c, 0x6d, 0x93}};
     VALUE c    = cUSBDeviceStateChangedEvent
       = rb_define_class_under(under, "USBDeviceStateChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "device", USBDeviceStateChangedEvent__get_device, 0);
     rb_define_method(c, "attached", USBDeviceStateChangedEvent__get_attached, 0);
     rb_define_method(c, "error", USBDeviceStateChangedEvent__get_error, 0);
@@ -19616,7 +19616,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cSharedFolderChangedEvent
       = rb_define_class_under(under, "SharedFolderChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "scope", SharedFolderChangedEvent__get_scope, 0);
   }
   {
@@ -19624,7 +19624,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cRuntimeErrorEvent
       = rb_define_class_under(under, "RuntimeErrorEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "fatal", RuntimeErrorEvent__get_fatal, 0);
     rb_define_method(c, "id", RuntimeErrorEvent__get_id, 0);
     rb_define_method(c, "message", RuntimeErrorEvent__get_message, 0);
@@ -19634,7 +19634,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cEventSourceChangedEvent
       = rb_define_class_under(under, "EventSourceChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "listener", EventSourceChangedEvent__get_listener, 0);
     rb_define_method(c, "add", EventSourceChangedEvent__get_add, 0);
   }
@@ -19643,7 +19643,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cExtraDataChangedEvent
       = rb_define_class_under(under, "ExtraDataChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "machine_id", ExtraDataChangedEvent__get_machine_id, 0);
     rb_define_method(c, "key", ExtraDataChangedEvent__get_key, 0);
     rb_define_method(c, "value", ExtraDataChangedEvent__get_value, 0);
@@ -19653,7 +19653,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVetoEvent
       = rb_define_class_under(under, "VetoEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "add_veto", VetoEvent__add_veto, 1);
     rb_define_method(c, "is_vetoed", VetoEvent__is_vetoed, 0);
     rb_define_method(c, "get_vetos", VetoEvent__get_vetos, 0);
@@ -19663,7 +19663,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cExtraDataCanChangeEvent
       = rb_define_class_under(under, "ExtraDataCanChangeEvent", cVetoEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "machine_id", ExtraDataCanChangeEvent__get_machine_id, 0);
     rb_define_method(c, "key", ExtraDataCanChangeEvent__get_key, 0);
     rb_define_method(c, "value", ExtraDataCanChangeEvent__get_value, 0);
@@ -19673,14 +19673,14 @@ static void comclass_init(VALUE under) {
     VALUE c    = cCanShowWindowEvent
       = rb_define_class_under(under, "CanShowWindowEvent", cVetoEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
   }
   {
     iid_t iid  = {0xB0A0904D, 0x2F05, 0x4D28, {0x85, 0x5F, 0x48, 0x8F, 0x96, 0xBA, 0xD2, 0xB2}};
     VALUE c    = cShowWindowEvent
       = rb_define_class_under(under, "ShowWindowEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "win_id", ShowWindowEvent__get_win_id, 0);
     rb_define_method(c, "win_id=", ShowWindowEvent__set_win_id, 1);
   }
@@ -19689,7 +19689,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cNATRedirectEvent
       = rb_define_class_under(under, "NATRedirectEvent", cMachineEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "slot", NATRedirectEvent__get_slot, 0);
     rb_define_method(c, "remove", NATRedirectEvent__get_remove, 0);
     rb_define_method(c, "name", NATRedirectEvent__get_name, 0);
@@ -19704,7 +19704,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cHostPCIDevicePlugEvent
       = rb_define_class_under(under, "HostPCIDevicePlugEvent", cMachineEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "plugged", HostPCIDevicePlugEvent__get_plugged, 0);
     rb_define_method(c, "success", HostPCIDevicePlugEvent__get_success, 0);
     rb_define_method(c, "attachment", HostPCIDevicePlugEvent__get_attachment, 0);
@@ -19715,7 +19715,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cVBoxSVCAvailabilityChangedEvent
       = rb_define_class_under(under, "VBoxSVCAvailabilityChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "available", VBoxSVCAvailabilityChangedEvent__get_available, 0);
   }
   {
@@ -19723,7 +19723,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cBandwidthGroupChangedEvent
       = rb_define_class_under(under, "BandwidthGroupChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "bandwidth_group", BandwidthGroupChangedEvent__get_bandwidth_group, 0);
   }
   {
@@ -19731,7 +19731,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cGuestMonitorChangedEvent
       = rb_define_class_under(under, "GuestMonitorChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "change_type", GuestMonitorChangedEvent__get_change_type, 0);
     rb_define_method(c, "screen_id", GuestMonitorChangedEvent__get_screen_id, 0);
     rb_define_method(c, "origin_x", GuestMonitorChangedEvent__get_origin_x, 0);
@@ -19744,7 +19744,7 @@ static void comclass_init(VALUE under) {
     VALUE c    = cStorageDeviceChangedEvent
       = rb_define_class_under(under, "StorageDeviceChangedEvent", cEvent);
     no_instantiation(c);
-    rb_const_set(c, _IID, iid__new(&iid));
+    rb_const_set(c, _IID, iid_new(&iid));
     rb_define_method(c, "storage_device", StorageDeviceChangedEvent__get_storage_device, 0);
     rb_define_method(c, "removed", StorageDeviceChangedEvent__get_removed, 0);
   }