diff --git a/IDL/structures.idl b/IDL/structures.idl
index d46b4f7..13fca40 100644
--- a/IDL/structures.idl
+++ b/IDL/structures.idl
@@ -170,51 +170,51 @@ struct StructShortBis
     short var_short;
 };
 
-struct ContentSeqStruct {
+struct ContentStructSeqStruct {
   sequence<StructShort> var_seq;
 };
 
-struct ContentSeqStructBis {
+struct ContentStructSeqStructBis {
   sequence<StructShortBis> var_seq;
 };
 
-struct ContentBigSeqStruct {
+struct ContentStructBigSeqStruct {
   sequence<StructShort, 1000> var_seq;
 };
 
-struct ContentBigSeqStructBis {
+struct ContentStructBigSeqStructBis {
   sequence<StructShortBis, 1000> var_seq;
 };
 
-struct ContentMapStruct {
+struct ContentStructMapStruct {
   map<short, StructShort> var_map;
 };
 
-struct ContentMapStructBis {
+struct ContentStructMapStructBis {
   map<short, StructShortBis> var_map;
 };
 
-struct ContentBigMapStruct {
+struct ContentStructBigMapStruct {
   map<short, StructShort, 1000> var_map;
 };
 
-struct ContentBigMapStructBis {
+struct ContentStructBigMapStructBis {
   map<short, StructShortBis, 1000> var_map;
 };
 
-struct ContentArrayStruct {
+struct ContentStructArrayStruct {
   StructShort var_array[10];
 };
 
-struct ContentArrayStructBis {
+struct ContentStructArrayStructBis {
   StructShortBis var_array[10];
 };
 
-struct ContentBigArrayStruct {
+struct ContentStructBigArrayStruct {
   StructShort var_array[1000];
 };
 
-struct ContentBigArrayStructBis {
+struct ContentStructBigArrayStructBis {
   StructShortBis var_array[1000];
 };
 
diff --git a/IDL/unions.idl b/IDL/unions.idl
index ad9ac3f..6f3d523 100644
--- a/IDL/unions.idl
+++ b/IDL/unions.idl
@@ -497,3 +497,57 @@ struct UnionSeveralFieldsWithDefault
 {
     Union_Several_Fields_With_Default var_union_several_fields_with_default;
 };
+
+union Union_ShortBis switch (long)
+{
+    case 0:
+        short a;
+};
+
+struct ContentUnionSeqStruct {
+  sequence<Union_Short> var_seq;
+};
+
+struct ContentUnionSeqStructBis {
+  sequence<Union_ShortBis> var_seq;
+};
+
+struct ContentUnionBigSeqStruct {
+  sequence<Union_Short, 1000> var_seq;
+};
+
+struct ContentUnionBigSeqStructBis {
+  sequence<Union_ShortBis, 1000> var_seq;
+};
+
+struct ContentUnionMapStruct {
+  map<short, Union_Short> var_map;
+};
+
+struct ContentUnionMapStructBis {
+  map<short, Union_ShortBis> var_map;
+};
+
+struct ContentUnionBigMapStruct {
+  map<short, Union_Short, 1000> var_map;
+};
+
+struct ContentUnionBigMapStructBis {
+  map<short, Union_ShortBis, 1000> var_map;
+};
+
+struct ContentUnionArrayStruct {
+  Union_Short var_array[10];
+};
+
+struct ContentUnionArrayStructBis {
+  Union_ShortBis var_array[10];
+};
+
+struct ContentUnionBigArrayStruct {
+  Union_Short var_array[1000];
+};
+
+struct ContentUnionBigArrayStructBis {
+  Union_ShortBis var_array[1000];
+};