@sapui5/types 1.115.0 → 1.116.0

package/types/sap.ui.vbm.d.ts

@@ -1,4 +1,4 @@
-// For Library Version: 1.115.0
+// For Library Version: 1.116.0
 
 declare module "sap/ui/vbm/library" {
   /**
@@ -81,18 +81,18 @@ declare module "sap/ui/vbm/library" {
 declare module "sap/ui/vbm/Adapter" {
   import { default as UI5Element, $ElementSettings } from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import { ID } from "sap/ui/core/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import GeoMap from "sap/ui/vbm/GeoMap";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * Provides the ability to load VBI JSON into {@link sap.ui.vbm.GeoMap sap.ui.vbm.GeoMap} control.
    */
-  class Adapter extends UI5Element {
+  export default class Adapter extends UI5Element {
     /**
      * Constructor for a new GeoMap Adapter.
      *
@@ -173,7 +173,7 @@ declare module "sap/ui/vbm/Adapter" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$AdapterSubmitEventParameters>) => void,
+      fnFunction: (p1: Adapter$SubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter` itself
        */
@@ -194,7 +194,7 @@ declare module "sap/ui/vbm/Adapter" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$AdapterSubmitEventParameters>) => void,
+      fnFunction: (p1: Adapter$SubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter` itself
        */
@@ -211,14 +211,14 @@ declare module "sap/ui/vbm/Adapter" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$AdapterSubmitEventParameters>) => void,
+      fnFunction: (p1: Adapter$SubmitEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:submit submit} to attached listeners.
      *
@@ -228,7 +228,7 @@ declare module "sap/ui/vbm/Adapter" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $AdapterSubmitEventParameters
+      mParameters?: Adapter$SubmitEventParameters
     ): this;
     /**
      * ID of the element which is the current target of the association {@link #getMap map}, or `null`.
@@ -258,7 +258,6 @@ declare module "sap/ui/vbm/Adapter" {
       oMap: ID | GeoMap
     ): this;
   }
-  export default Adapter;
 
   export interface $AdapterSettings extends $ElementSettings {
     /**
@@ -271,29 +270,31 @@ declare module "sap/ui/vbm/Adapter" {
      * The event is raised when a when the Adapter receives an event from GeoMap control. It is intended to
      * unify the various GeoMap events as provided by VBI.
      */
-    submit?: (oEvent: Event<$AdapterSubmitEventParameters>) => void;
+    submit?: (oEvent: Adapter$SubmitEvent) => void;
   }
 
-  export interface $AdapterSubmitEventParameters {
+  export interface Adapter$SubmitEventParameters {
     data?: string;
   }
+
+  export type Adapter$SubmitEvent = Event<Adapter$SubmitEventParameters>;
 }
 
 declare module "sap/ui/vbm/Adapter3D" {
   import { default as UI5Element, $ElementSettings } from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { ID } from "sap/ui/core/library";
 
   import Viewport from "sap/ui/vbm/Viewport";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * Provides the ability to load VBI JSON into {@link sap.ui.vbm.Viewport sap.ui.vbm.Viewport} control.
    */
-  class Adapter3D extends UI5Element {
+  export default class Adapter3D extends UI5Element {
     /**
      * Constructor for a new Visual Business Adapter 3D.
      *
@@ -373,7 +374,7 @@ declare module "sap/ui/vbm/Adapter3D" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$Adapter3DSubmitEventParameters>) => void,
+      fnFunction: (p1: Adapter3D$SubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter3D` itself
        */
@@ -393,7 +394,7 @@ declare module "sap/ui/vbm/Adapter3D" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$Adapter3DSubmitEventParameters>) => void,
+      fnFunction: (p1: Adapter3D$SubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter3D` itself
        */
@@ -410,14 +411,14 @@ declare module "sap/ui/vbm/Adapter3D" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$Adapter3DSubmitEventParameters>) => void,
+      fnFunction: (p1: Adapter3D$SubmitEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:submit submit} to attached listeners.
      *
@@ -427,7 +428,7 @@ declare module "sap/ui/vbm/Adapter3D" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $Adapter3DSubmitEventParameters
+      mParameters?: Adapter3D$SubmitEventParameters
     ): this;
     /**
      * ID of the element which is the current target of the association {@link #getViewport viewport}, or `null`.
@@ -459,7 +460,6 @@ declare module "sap/ui/vbm/Adapter3D" {
       oViewport: ID | Viewport
     ): this;
   }
-  export default Adapter3D;
 
   export interface $Adapter3DSettings extends $ElementSettings {
     /**
@@ -471,15 +471,17 @@ declare module "sap/ui/vbm/Adapter3D" {
     /**
      * This event is fired when interactions in the viewport happen.
      */
-    submit?: (oEvent: Event<$Adapter3DSubmitEventParameters>) => void;
+    submit?: (oEvent: Adapter3D$SubmitEvent) => void;
   }
 
-  export interface $Adapter3DSubmitEventParameters {
+  export interface Adapter3D$SubmitEventParameters {
     /**
      * A string in the VBI JSON format.
      */
     data?: string;
   }
+
+  export type Adapter3D$SubmitEvent = Event<Adapter3D$SubmitEventParameters>;
 }
 
 declare module "sap/ui/vbm/AnalyticMap" {
@@ -504,7 +506,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
    *  By adding Region elements to the regions aggregation it is possible to make feature from the GeoJSON
    * interactive. Region elements need to match by ISO code.
    */
-  class AnalyticMap extends GeoMap {
+  export default class AnalyticMap extends GeoMap {
     /**
      * Constructor for a new AnalyticMap.
      *
@@ -595,7 +597,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$AnalyticMapRegionClickEventParameters>) => void,
+      fnFunction: (p1: AnalyticMap$RegionClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
        */
@@ -615,7 +617,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$AnalyticMapRegionClickEventParameters>) => void,
+      fnFunction: (p1: AnalyticMap$RegionClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
        */
@@ -641,9 +643,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$AnalyticMapRegionContextMenuEventParameters>
-      ) => void,
+      fnFunction: (p1: AnalyticMap$RegionContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
        */
@@ -664,9 +664,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$AnalyticMapRegionContextMenuEventParameters>
-      ) => void,
+      fnFunction: (p1: AnalyticMap$RegionContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
        */
@@ -781,7 +779,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$AnalyticMapRegionClickEventParameters>) => void,
+      fnFunction: (p1: AnalyticMap$RegionClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -799,9 +797,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$AnalyticMapRegionContextMenuEventParameters>
-      ) => void,
+      fnFunction: (p1: AnalyticMap$RegionContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -843,7 +839,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:regionClick regionClick} to attached listeners.
      *
@@ -853,10 +849,10 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $AnalyticMapRegionClickEventParameters
+      mParameters?: AnalyticMap$RegionClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:regionContextMenu regionContextMenu} to attached listeners.
      *
@@ -866,10 +862,10 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $AnalyticMapRegionContextMenuEventParameters
+      mParameters?: AnalyticMap$RegionContextMenuEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:regionDeselect regionDeselect} to attached listeners.
      *
@@ -882,7 +878,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       mParameters?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:regionSelect regionSelect} to attached listeners.
      *
@@ -977,7 +973,6 @@ declare module "sap/ui/vbm/AnalyticMap" {
       oCorr: object
     ): void;
   }
-  export default AnalyticMap;
 
   export interface $AnalyticMapSettings extends $GeoMapSettings {
     /**
@@ -989,16 +984,12 @@ declare module "sap/ui/vbm/AnalyticMap" {
     /**
      * The event is raised when there is a click or a tap on a region.
      */
-    regionClick?: (
-      oEvent: Event<$AnalyticMapRegionClickEventParameters>
-    ) => void;
+    regionClick?: (oEvent: AnalyticMap$RegionClickEvent) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on a region.
      */
-    regionContextMenu?: (
-      oEvent: Event<$AnalyticMapRegionContextMenuEventParameters>
-    ) => void;
+    regionContextMenu?: (oEvent: AnalyticMap$RegionContextMenuEvent) => void;
 
     /**
      * Raised when regions get selected
@@ -1011,23 +1002,31 @@ declare module "sap/ui/vbm/AnalyticMap" {
     regionDeselect?: (oEvent: Event) => void;
   }
 
-  export interface $AnalyticMapRegionClickEventParameters {
+  export interface AnalyticMap$RegionClickEventParameters {
     /**
      * The regions code.
      */
     code?: string;
   }
 
-  export interface $AnalyticMapRegionContextMenuEventParameters {
+  export type AnalyticMap$RegionClickEvent = Event<AnalyticMap$RegionClickEventParameters>;
+
+  export interface AnalyticMap$RegionContextMenuEventParameters {
     /**
      * The regions code.
      */
     code?: string;
   }
 
-  export interface $AnalyticMapRegionDeselectEventParameters {}
+  export type AnalyticMap$RegionContextMenuEvent = Event<AnalyticMap$RegionContextMenuEventParameters>;
+
+  export interface AnalyticMap$RegionDeselectEventParameters {}
+
+  export type AnalyticMap$RegionDeselectEvent = Event<AnalyticMap$RegionDeselectEventParameters>;
+
+  export interface AnalyticMap$RegionSelectEventParameters {}
 
-  export interface $AnalyticMapRegionSelectEventParameters {}
+  export type AnalyticMap$RegionSelectEvent = Event<AnalyticMap$RegionSelectEventParameters>;
 }
 
 declare module "sap/ui/vbm/Area" {
@@ -1047,7 +1046,7 @@ declare module "sap/ui/vbm/Area" {
    *  Since the actual size of an area depends on the zoom level it might be only partly visible. Thus detail
    * windows will open at the click position.
    */
-  class Area extends VoBase {
+  export default class Area extends VoBase {
     /**
      * Constructor for a new Area.
      *
@@ -1236,7 +1235,7 @@ declare module "sap/ui/vbm/Area" {
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:edgeClick edgeClick} to attached listeners.
      *
@@ -1249,7 +1248,7 @@ declare module "sap/ui/vbm/Area" {
       mParameters?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:edgeContextMenu edgeContextMenu} to attached listeners.
      *
@@ -1364,7 +1363,6 @@ declare module "sap/ui/vbm/Area" {
       sPosition?: string
     ): this;
   }
-  export default Area;
 
   export interface $AreaSettings extends $VoBaseSettings {
     /**
@@ -1403,9 +1401,13 @@ declare module "sap/ui/vbm/Area" {
     edgeContextMenu?: (oEvent: Event) => void;
   }
 
-  export interface $AreaEdgeClickEventParameters {}
+  export interface Area$EdgeClickEventParameters {}
 
-  export interface $AreaEdgeContextMenuEventParameters {}
+  export type Area$EdgeClickEvent = Event<Area$EdgeClickEventParameters>;
+
+  export interface Area$EdgeContextMenuEventParameters {}
+
+  export type Area$EdgeContextMenuEvent = Event<Area$EdgeContextMenuEventParameters>;
 }
 
 declare module "sap/ui/vbm/Areas" {
@@ -1416,8 +1418,6 @@ declare module "sap/ui/vbm/Areas" {
 
   import Area from "sap/ui/vbm/Area";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import {
@@ -1425,10 +1425,12 @@ declare module "sap/ui/vbm/Areas" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * Type specific Visual Object aggregation for Area instances.
    */
-  class Areas extends VoAggregation {
+  export default class Areas extends VoAggregation {
     /**
      * Constructor for a new Areas.
      *
@@ -1519,7 +1521,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$AreasEdgeClickEventParameters>) => void,
+      fnFunction: (p1: Areas$EdgeClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
        */
@@ -1539,7 +1541,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$AreasEdgeClickEventParameters>) => void,
+      fnFunction: (p1: Areas$EdgeClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
        */
@@ -1565,7 +1567,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$AreasEdgeContextMenuEventParameters>) => void,
+      fnFunction: (p1: Areas$EdgeContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
        */
@@ -1586,7 +1588,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$AreasEdgeContextMenuEventParameters>) => void,
+      fnFunction: (p1: Areas$EdgeContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
        */
@@ -1609,7 +1611,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$AreasEdgeClickEventParameters>) => void,
+      fnFunction: (p1: Areas$EdgeClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -1627,14 +1629,14 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$AreasEdgeContextMenuEventParameters>) => void,
+      fnFunction: (p1: Areas$EdgeContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:edgeClick edgeClick} to attached listeners.
      *
@@ -1644,10 +1646,10 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $AreasEdgeClickEventParameters
+      mParameters?: Areas$EdgeClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:edgeContextMenu edgeContextMenu} to attached listeners.
      *
@@ -1657,7 +1659,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $AreasEdgeContextMenuEventParameters
+      mParameters?: Areas$EdgeContextMenuEventParameters
     ): this;
     /**
      * Gets content of aggregation {@link #getItems items}.
@@ -1743,7 +1745,6 @@ declare module "sap/ui/vbm/Areas" {
       bPosChangeable?: boolean
     ): this;
   }
-  export default Areas;
 
   export interface $AreasSettings extends $VoAggregationSettings {
     /**
@@ -1760,17 +1761,15 @@ declare module "sap/ui/vbm/Areas" {
     /**
      * This event is raised when the edge of an Area is clicked.
      */
-    edgeClick?: (oEvent: Event<$AreasEdgeClickEventParameters>) => void;
+    edgeClick?: (oEvent: Areas$EdgeClickEvent) => void;
 
     /**
      * This event is raised when the edge of an Area is right clicked.
      */
-    edgeContextMenu?: (
-      oEvent: Event<$AreasEdgeContextMenuEventParameters>
-    ) => void;
+    edgeContextMenu?: (oEvent: Areas$EdgeContextMenuEvent) => void;
   }
 
-  export interface $AreasEdgeClickEventParameters {
+  export interface Areas$EdgeClickEventParameters {
     /**
      * Clicked instance
      */
@@ -1783,7 +1782,9 @@ declare module "sap/ui/vbm/Areas" {
     edge?: int;
   }
 
-  export interface $AreasEdgeContextMenuEventParameters {
+  export type Areas$EdgeClickEvent = Event<Areas$EdgeClickEventParameters>;
+
+  export interface Areas$EdgeContextMenuEventParameters {
     /**
      * Clicked instance
      */
@@ -1795,6 +1796,8 @@ declare module "sap/ui/vbm/Areas" {
      */
     edge?: int;
   }
+
+  export type Areas$EdgeContextMenuEvent = Event<Areas$EdgeContextMenuEventParameters>;
 }
 
 declare module "sap/ui/vbm/Box" {
@@ -1811,7 +1814,7 @@ declare module "sap/ui/vbm/Box" {
    *  Since the actual size of a box may depend on the zoom level it might be only partly visible. Thus detail
    * windows will open at the click position.
    */
-  class Box extends VoBase {
+  export default class Box extends VoBase {
     /**
      * Constructor for a new Box.
      *
@@ -1981,7 +1984,6 @@ declare module "sap/ui/vbm/Box" {
       sScale?: string
     ): this;
   }
-  export default Box;
 
   export interface $BoxSettings extends $VoBaseSettings {
     /**
@@ -2024,7 +2026,7 @@ declare module "sap/ui/vbm/Boxes" {
   /**
    * Type specific Visual Object aggregation for Box instances.
    */
-  class Boxes extends VoAggregation {
+  export default class Boxes extends VoAggregation {
     /**
      * Constructor for a new Boxes.
      *
@@ -2215,7 +2217,6 @@ declare module "sap/ui/vbm/Boxes" {
       bScaleChangeable?: boolean
     ): this;
   }
-  export default Boxes;
 
   export interface $BoxesSettings extends $VoAggregationSettings {
     /**
@@ -2248,7 +2249,7 @@ declare module "sap/ui/vbm/Circle" {
    * Specific Visual Object element for an Circle. A Circle is positioned with its centerpoint at the
    * given position. The detail window will open at the center of the circle.
    */
-  class Circle extends VoBase {
+  export default class Circle extends VoBase {
     /**
      * Constructor for a new Circle.
      *
@@ -2441,7 +2442,6 @@ declare module "sap/ui/vbm/Circle" {
       sSlices?: string
     ): this;
   }
-  export default Circle;
 
   export interface $CircleSettings extends $VoBaseSettings {
     /**
@@ -2489,7 +2489,7 @@ declare module "sap/ui/vbm/Circles" {
   /**
    * Type specific Visual Object aggregation for Circle elements.
    */
-  class Circles extends VoAggregation {
+  export default class Circles extends VoAggregation {
     /**
      * Constructor for a new Circles.
      *
@@ -2680,7 +2680,6 @@ declare module "sap/ui/vbm/Circles" {
       bRadiusChangeable?: boolean
     ): this;
   }
-  export default Circles;
 
   export interface $CirclesSettings extends $VoAggregationSettings {
     /**
@@ -2723,7 +2722,7 @@ declare module "sap/ui/vbm/Cluster" {
    * defined and may overrule the semantic icon; if no icon is defined ( and no type) then the semantic icon
    * for type inactive is chosen.
    */
-  class Cluster extends Control {
+  export default class Cluster extends Control {
     /**
      * Constructor for a new Cluster.
      *
@@ -2883,7 +2882,6 @@ declare module "sap/ui/vbm/Cluster" {
       sType?: SemanticType | keyof typeof SemanticType
     ): this;
   }
-  export default Cluster;
 
   export interface $ClusterSettings extends $ControlSettings {
     /**
@@ -2915,8 +2913,6 @@ declare module "sap/ui/vbm/Cluster" {
 declare module "sap/ui/vbm/ClusterBase" {
   import { default as UI5Element, $ElementSettings } from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import { CSSColor } from "sap/ui/core/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
@@ -2931,6 +2927,8 @@ declare module "sap/ui/vbm/ClusterBase" {
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * Abtract base class for Clustering types. This element implements the common part for all specific Cluster
    * elements. It must not be used directly, but is the base for further extension.
@@ -2947,7 +2945,7 @@ declare module "sap/ui/vbm/ClusterBase" {
    * The actual color, font, size, and positioning of the text can be influence via property `textSettings`.
    * For interaction with the cluster you can use the events provided by the spot.
    */
-  class ClusterBase extends UI5Element {
+  export default class ClusterBase extends UI5Element {
     /**
      * Constructor for a new ClusterBase.
      *
@@ -3027,7 +3025,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ClusterBaseClickEventParameters>) => void,
+      fnFunction: (p1: ClusterBase$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
        */
@@ -3047,7 +3045,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ClusterBaseClickEventParameters>) => void,
+      fnFunction: (p1: ClusterBase$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
        */
@@ -3072,7 +3070,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ClusterBaseContextMenuEventParameters>) => void,
+      fnFunction: (p1: ClusterBase$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
        */
@@ -3092,7 +3090,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ClusterBaseContextMenuEventParameters>) => void,
+      fnFunction: (p1: ClusterBase$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
        */
@@ -3121,7 +3119,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ClusterBaseClickEventParameters>) => void,
+      fnFunction: (p1: ClusterBase$ClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -3138,14 +3136,14 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ClusterBaseContextMenuEventParameters>) => void,
+      fnFunction: (p1: ClusterBase$ContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -3155,10 +3153,10 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ClusterBaseClickEventParameters
+      mParameters?: ClusterBase$ClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:contextMenu contextMenu} to attached listeners.
      *
@@ -3168,7 +3166,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ClusterBaseContextMenuEventParameters
+      mParameters?: ClusterBase$ContextMenuEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getAreaAlwaysVisible areaAlwaysVisible}.
@@ -3402,7 +3400,6 @@ declare module "sap/ui/vbm/ClusterBase" {
       oVizVo: Spot
     ): this;
   }
-  export default ClusterBase;
 
   export interface $ClusterBaseSettings extends $ElementSettings {
     /**
@@ -3451,24 +3448,24 @@ declare module "sap/ui/vbm/ClusterBase" {
     /**
      * The event is raised when there is a click action on a Cluster Object.
      */
-    click?: (oEvent: Event<$ClusterBaseClickEventParameters>) => void;
+    click?: (oEvent: ClusterBase$ClickEvent) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on a Cluster.
      */
-    contextMenu?: (
-      oEvent: Event<$ClusterBaseContextMenuEventParameters>
-    ) => void;
+    contextMenu?: (oEvent: ClusterBase$ContextMenuEvent) => void;
   }
 
-  export interface $ClusterBaseClickEventParameters {
+  export interface ClusterBase$ClickEventParameters {
     /**
      * ID of the clicked cluster object. Can serve as input for GeoMap function getInfoForCluster
      */
     clusterID?: string;
   }
 
-  export interface $ClusterBaseContextMenuEventParameters {
+  export type ClusterBase$ClickEvent = Event<ClusterBase$ClickEventParameters>;
+
+  export interface ClusterBase$ContextMenuEventParameters {
     /**
      * ID of the clicked cluster object. Can serve as input for GeoMap function getInfoForCluster
      */
@@ -3479,6 +3476,8 @@ declare module "sap/ui/vbm/ClusterBase" {
      */
     menu?: Menu;
   }
+
+  export type ClusterBase$ContextMenuEvent = Event<ClusterBase$ContextMenuEventParameters>;
 }
 
 declare module "sap/ui/vbm/ClusterContainer" {
@@ -3498,7 +3497,7 @@ declare module "sap/ui/vbm/ClusterContainer" {
    * click may only be fired if the aggregated control is not handling them. The properties are not changeable
    * as well as the aggregated item. Only read access is possible**
    */
-  class ClusterContainer extends Container {
+  export default class ClusterContainer extends Container {
     /**
      * Constructor for a new ClusterContainer.
      *
@@ -3566,7 +3565,6 @@ declare module "sap/ui/vbm/ClusterContainer" {
      */
     static getMetadata(): ElementMetadata;
   }
-  export default ClusterContainer;
 
   export interface $ClusterContainerSettings extends $ContainerSettings {}
 }
@@ -3589,7 +3587,7 @@ declare module "sap/ui/vbm/ClusterDistance" {
    * of gravity of the covered objects. Thus the actual distance between them may vary.
    *  This clustering is fast, but the results may not be very convincing.
    */
-  class ClusterDistance extends ClusterBase {
+  export default class ClusterDistance extends ClusterBase {
     /**
      * Constructor for a new ClusterDistance.
      *
@@ -3682,7 +3680,6 @@ declare module "sap/ui/vbm/ClusterDistance" {
       iDistance?: int
     ): this;
   }
-  export default ClusterDistance;
 
   export interface $ClusterDistanceSettings extends $ClusterBaseSettings {
     /**
@@ -3709,7 +3706,7 @@ declare module "sap/ui/vbm/ClusterGrid" {
    * is possible to have multiple grid based clusters. The visualization object is placed in the center of
    * the grid cell plus a given offset.
    */
-  class ClusterGrid extends ClusterBase {
+  export default class ClusterGrid extends ClusterBase {
     /**
      * Constructor for a new ClusterGrid.
      *
@@ -3931,7 +3928,6 @@ declare module "sap/ui/vbm/ClusterGrid" {
       iOrderIndex?: int
     ): this;
   }
-  export default ClusterGrid;
 
   export interface $ClusterGridSettings extends $ClusterBaseSettings {
     /**
@@ -3982,7 +3978,7 @@ declare module "sap/ui/vbm/ClusterTree" {
    * clustering is based on the areas in the Voronoi diagram and cluster objects get aggregated to a hierarchy
    * over several levels of detail.
    */
-  class ClusterTree extends ClusterBase {
+  export default class ClusterTree extends ClusterBase {
     /**
      * Constructor for a new ClusterTree.
      *
@@ -4071,7 +4067,6 @@ declare module "sap/ui/vbm/ClusterTree" {
       bAnimateClusterSplit?: boolean
     ): this;
   }
-  export default ClusterTree;
 
   export interface $ClusterTreeSettings extends $ClusterBaseSettings {
     /**
@@ -4097,7 +4092,7 @@ declare module "sap/ui/vbm/Container" {
    * There is no label, no edit mode, and no drop support. Events like click will only be fired if the aggregated
    * control is not handling them.**
    */
-  class Container extends VoBase {
+  export default class Container extends VoBase {
     /**
      * Constructor for a new Container.
      *
@@ -4236,7 +4231,6 @@ declare module "sap/ui/vbm/Container" {
       sPosition?: string
     ): this;
   }
-  export default Container;
 
   export interface $ContainerSettings extends $VoBaseSettings {
     /**
@@ -4273,7 +4267,7 @@ declare module "sap/ui/vbm/Containers" {
   /**
    * Type specific Visual Object aggregation for Container instances.
    */
-  class Containers extends VoAggregation {
+  export default class Containers extends VoAggregation {
     /**
      * Constructor for a new Containers.
      *
@@ -4406,7 +4400,6 @@ declare module "sap/ui/vbm/Containers" {
       vItem: int | string | Container
     ): Container | null;
   }
-  export default Containers;
 
   export interface $ContainersSettings extends $VoAggregationSettings {
     /**
@@ -4426,7 +4419,7 @@ declare module "sap/ui/vbm/DragSource" {
   /**
    * DragSource Aggregation element
    */
-  class DragSource extends UI5Element {
+  export default class DragSource extends UI5Element {
     /**
      * Constructor for a new DragSource.
      *
@@ -4511,7 +4504,6 @@ declare module "sap/ui/vbm/DragSource" {
       sType?: string
     ): this;
   }
-  export default DragSource;
 
   export interface $DragSourceSettings extends $ElementSettings {
     /**
@@ -4531,7 +4523,7 @@ declare module "sap/ui/vbm/DropTarget" {
   /**
    * DropTarget Aggregation element
    */
-  class DropTarget extends UI5Element {
+  export default class DropTarget extends UI5Element {
     /**
      * Constructor for a new DropTarget.
      *
@@ -4616,7 +4608,6 @@ declare module "sap/ui/vbm/DropTarget" {
       sType?: string
     ): this;
   }
-  export default DropTarget;
 
   export interface $DropTargetSettings extends $ElementSettings {
     /**
@@ -4643,7 +4634,7 @@ declare module "sap/ui/vbm/Feature" {
    * The Feature element can be added to the items aggregation of a FeatureCollection. By matching
    * the id it allows to redefine the color of a GeoJSON feature and adds interactivity.
    */
-  class Feature extends UI5Element {
+  export default class Feature extends UI5Element {
     /**
      * Constructor for a new Feature.
      *
@@ -4768,7 +4759,7 @@ declare module "sap/ui/vbm/Feature" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeatureContextMenuEventParameters>) => void,
+      fnFunction: (p1: Feature$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Feature` itself
        */
@@ -4788,7 +4779,7 @@ declare module "sap/ui/vbm/Feature" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeatureContextMenuEventParameters>) => void,
+      fnFunction: (p1: Feature$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Feature` itself
        */
@@ -4822,14 +4813,14 @@ declare module "sap/ui/vbm/Feature" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeatureContextMenuEventParameters>) => void,
+      fnFunction: (p1: Feature$ContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -4842,7 +4833,7 @@ declare module "sap/ui/vbm/Feature" {
       mParameters?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:contextMenu contextMenu} to attached listeners.
      *
@@ -4852,7 +4843,7 @@ declare module "sap/ui/vbm/Feature" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeatureContextMenuEventParameters
+      mParameters?: Feature$ContextMenuEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getColor color}.
@@ -4927,7 +4918,6 @@ declare module "sap/ui/vbm/Feature" {
       sFeatureId?: string
     ): this;
   }
-  export default Feature;
 
   export interface $FeatureSettings extends $ElementSettings {
     /**
@@ -4948,35 +4938,39 @@ declare module "sap/ui/vbm/Feature" {
     /**
      * The event is raised when there is a right click or a tap and hold action on a Feature.
      */
-    contextMenu?: (oEvent: Event<$FeatureContextMenuEventParameters>) => void;
+    contextMenu?: (oEvent: Feature$ContextMenuEvent) => void;
   }
 
-  export interface $FeatureClickEventParameters {}
+  export interface Feature$ClickEventParameters {}
+
+  export type Feature$ClickEvent = Event<Feature$ClickEventParameters>;
 
-  export interface $FeatureContextMenuEventParameters {
+  export interface Feature$ContextMenuEventParameters {
     /**
      * Menu object to be used with openContextMenu().
      */
     menu?: Menu;
   }
+
+  export type Feature$ContextMenuEvent = Event<Feature$ContextMenuEventParameters>;
 }
 
 declare module "sap/ui/vbm/FeatureCollection" {
   import {
     default as GeoJsonLayer,
     $GeoJsonLayerSettings,
-    $GeoJsonLayerClickEventParameters,
-    $GeoJsonLayerContextMenuEventParameters,
+    GeoJsonLayer$ClickEventParameters,
+    GeoJsonLayer$ContextMenuEventParameters,
   } from "sap/ui/vbm/GeoJsonLayer";
 
   import Feature from "sap/ui/vbm/Feature";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { AggregationBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * FeatureCollection aggregation container. A FeatureCollection can render the content of an assigned GeoJSON.
    * The naming is associated to the GeoJSON standard. All features found in the GeoJSON are rendered as separated
@@ -4988,7 +4982,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
    *  By adding Feature elements to the items aggregation you can make the match (by id) feature from
    * the GeoJSON interactive and give it alternative colors.
    */
-  class FeatureCollection extends GeoJsonLayer {
+  export default class FeatureCollection extends GeoJsonLayer {
     /**
      * Constructor for a new FeatureCollection.
      *
@@ -5080,7 +5074,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeatureCollectionClickEventParameters>) => void,
+      fnFunction: (p1: FeatureCollection$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
        */
@@ -5101,7 +5095,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeatureCollectionClickEventParameters>) => void,
+      fnFunction: (p1: FeatureCollection$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
        */
@@ -5127,9 +5121,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$FeatureCollectionContextMenuEventParameters>
-      ) => void,
+      fnFunction: (p1: FeatureCollection$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
        */
@@ -5150,9 +5142,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$FeatureCollectionContextMenuEventParameters>
-      ) => void,
+      fnFunction: (p1: FeatureCollection$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
        */
@@ -5175,7 +5165,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeatureCollectionClickEventParameters>) => void,
+      fnFunction: (p1: FeatureCollection$ClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -5192,16 +5182,14 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$FeatureCollectionContextMenuEventParameters>
-      ) => void,
+      fnFunction: (p1: FeatureCollection$ContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -5211,10 +5199,10 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeatureCollectionClickEventParameters
+      mParameters?: FeatureCollection$ClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:contextMenu contextMenu} to attached listeners.
      *
@@ -5224,7 +5212,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeatureCollectionContextMenuEventParameters
+      mParameters?: FeatureCollection$ContextMenuEventParameters
     ): this;
     /**
      * Returns Properties for Features like name, bounding box, and midpoint
@@ -5294,7 +5282,6 @@ declare module "sap/ui/vbm/FeatureCollection" {
       vItem: int | string | Feature
     ): Feature | null;
   }
-  export default FeatureCollection;
 
   export interface $FeatureCollectionSettings extends $GeoJsonLayerSettings {
     /**
@@ -5306,22 +5293,24 @@ declare module "sap/ui/vbm/FeatureCollection" {
      * The event is raised when there is a click action on an aggregated Feature. Clicks on other Features from
      * the GeoJSON are ignored.
      */
-    click?: (oEvent: Event<$FeatureCollectionClickEventParameters>) => void;
+    click?: (oEvent: FeatureCollection$ClickEvent) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on an aggregated Feature. Clicks
      * on other Features from the GeoJSON are ignored.
      */
-    contextMenu?: (
-      oEvent: Event<$FeatureCollectionContextMenuEventParameters>
-    ) => void;
+    contextMenu?: (oEvent: FeatureCollection$ContextMenuEvent) => void;
   }
 
-  export interface $FeatureCollectionClickEventParameters
-    extends $GeoJsonLayerClickEventParameters {}
+  export interface FeatureCollection$ClickEventParameters
+    extends GeoJsonLayer$ClickEventParameters {}
 
-  export interface $FeatureCollectionContextMenuEventParameters
-    extends $GeoJsonLayerContextMenuEventParameters {}
+  export type FeatureCollection$ClickEvent = Event<FeatureCollection$ClickEventParameters>;
+
+  export interface FeatureCollection$ContextMenuEventParameters
+    extends GeoJsonLayer$ContextMenuEventParameters {}
+
+  export type FeatureCollection$ContextMenuEvent = Event<FeatureCollection$ContextMenuEventParameters>;
 }
 
 declare module "sap/ui/vbm/GeoCircle" {
@@ -5336,7 +5325,7 @@ declare module "sap/ui/vbm/GeoCircle" {
    * at the given position. Since the actual size of a geocircle may depend on the zoom level it might
    * be only partly visible. Thus detail windows will open at the click position.
    */
-  class GeoCircle extends VoBase {
+  export default class GeoCircle extends VoBase {
     /**
      * Constructor for a new GeoCircle.
      *
@@ -5533,7 +5522,6 @@ declare module "sap/ui/vbm/GeoCircle" {
       sSlices?: string
     ): this;
   }
-  export default GeoCircle;
 
   export interface $GeoCircleSettings extends $VoBaseSettings {
     /**
@@ -5581,7 +5569,7 @@ declare module "sap/ui/vbm/GeoCircles" {
   /**
    * Type specific Visual Object aggregation for GeoCircle elements.
    */
-  class GeoCircles extends VoAggregation {
+  export default class GeoCircles extends VoAggregation {
     /**
      * Constructor for a new GeoCircles.
      *
@@ -5772,7 +5760,6 @@ declare module "sap/ui/vbm/GeoCircles" {
       bRadiusChangeable?: boolean
     ): this;
   }
-  export default GeoCircles;
 
   export interface $GeoCirclesSettings extends $VoAggregationSettings {
     /**
@@ -5799,8 +5786,6 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
 
   import Feature from "sap/ui/vbm/Feature";
 
-  import Event from "sap/ui/base/Event";
-
   import { CSSColor } from "sap/ui/core/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
@@ -5810,6 +5795,8 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * GeoJsonLayer aggregation container. A GeoJsonLayer can render the content of an assigned GeoJSON. The
    * naming is associated to the GeoJSON standard. All features found in the GeoJSON are rendered as separated
@@ -5823,7 +5810,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
    *  The GeoJSON can be given as a URL using property srcURL, directly as object using property data,
    * or as a combination of both.
    */
-  class GeoJsonLayer extends UI5Element {
+  export default class GeoJsonLayer extends UI5Element {
     /**
      * Constructor for a new GeoJsonLayer.
      *
@@ -5924,7 +5911,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoJsonLayerClickEventParameters>) => void,
+      fnFunction: (p1: GeoJsonLayer$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
        */
@@ -5945,7 +5932,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoJsonLayerClickEventParameters>) => void,
+      fnFunction: (p1: GeoJsonLayer$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
        */
@@ -5971,7 +5958,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoJsonLayerContextMenuEventParameters>) => void,
+      fnFunction: (p1: GeoJsonLayer$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
        */
@@ -5992,7 +5979,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoJsonLayerContextMenuEventParameters>) => void,
+      fnFunction: (p1: GeoJsonLayer$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
        */
@@ -6015,7 +6002,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoJsonLayerClickEventParameters>) => void,
+      fnFunction: (p1: GeoJsonLayer$ClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -6032,14 +6019,14 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoJsonLayerContextMenuEventParameters>) => void,
+      fnFunction: (p1: GeoJsonLayer$ContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -6049,10 +6036,10 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoJsonLayerClickEventParameters
+      mParameters?: GeoJsonLayer$ClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:contextMenu contextMenu} to attached listeners.
      *
@@ -6062,7 +6049,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoJsonLayerContextMenuEventParameters
+      mParameters?: GeoJsonLayer$ContextMenuEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getData data}.
@@ -6300,7 +6287,6 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       sSrcURL?: string
     ): this;
   }
-  export default GeoJsonLayer;
 
   export interface $GeoJsonLayerSettings extends $ElementSettings {
     /**
@@ -6338,30 +6324,32 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
      * The event is raised when there is a click action on an aggregated Feature. Clicks on other Features from
      * the GeoJSON are ignored.
      */
-    click?: (oEvent: Event<$GeoJsonLayerClickEventParameters>) => void;
+    click?: (oEvent: GeoJsonLayer$ClickEvent) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on an aggregated Feature. Clicks
      * on other Features from the GeoJSON are ignored.
      */
-    contextMenu?: (
-      oEvent: Event<$GeoJsonLayerContextMenuEventParameters>
-    ) => void;
+    contextMenu?: (oEvent: GeoJsonLayer$ContextMenuEvent) => void;
   }
 
-  export interface $GeoJsonLayerClickEventParameters {
+  export interface GeoJsonLayer$ClickEventParameters {
     /**
      * Id of clicked Feature
      */
     featureId?: string;
   }
 
-  export interface $GeoJsonLayerContextMenuEventParameters {
+  export type GeoJsonLayer$ClickEvent = Event<GeoJsonLayer$ClickEventParameters>;
+
+  export interface GeoJsonLayer$ContextMenuEventParameters {
     /**
      * Id of clicked Feature
      */
     featureId?: string;
   }
+
+  export type GeoJsonLayer$ContextMenuEvent = Event<GeoJsonLayer$ContextMenuEventParameters>;
 }
 
 declare module "sap/ui/vbm/GeoMap" {
@@ -6408,7 +6396,7 @@ declare module "sap/ui/vbm/GeoMap" {
    * an arbitrary number of VO aggregations can be assigned to the vos aggregation.
    *  The second aggregation featureCollections allows the use of GeoJSON as source for visual objects.
    */
-  class GeoMap extends VBI {
+  export default class GeoMap extends VBI {
     /**
      * Constructor for a new GeoMap.
      *
@@ -6546,7 +6534,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapCenterChangedEventParameters>) => void,
+      fnFunction: (p1: GeoMap$CenterChangedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6566,7 +6554,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapCenterChangedEventParameters>) => void,
+      fnFunction: (p1: GeoMap$CenterChangedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6591,7 +6579,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapClickEventParameters>) => void,
+      fnFunction: (p1: GeoMap$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6611,7 +6599,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapClickEventParameters>) => void,
+      fnFunction: (p1: GeoMap$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6636,7 +6624,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapContextMenuEventParameters>) => void,
+      fnFunction: (p1: GeoMap$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6656,7 +6644,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapContextMenuEventParameters>) => void,
+      fnFunction: (p1: GeoMap$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6681,7 +6669,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapDropEventParameters>) => void,
+      fnFunction: (p1: GeoMap$DropEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6701,7 +6689,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapDropEventParameters>) => void,
+      fnFunction: (p1: GeoMap$DropEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6726,7 +6714,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapKeyDownEventParameters>) => void,
+      fnFunction: (p1: GeoMap$KeyDownEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6746,7 +6734,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapKeyDownEventParameters>) => void,
+      fnFunction: (p1: GeoMap$KeyDownEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6771,7 +6759,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapKeyPressEventParameters>) => void,
+      fnFunction: (p1: GeoMap$KeyPressEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6791,7 +6779,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapKeyPressEventParameters>) => void,
+      fnFunction: (p1: GeoMap$KeyPressEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6816,7 +6804,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapKeyUpEventParameters>) => void,
+      fnFunction: (p1: GeoMap$KeyUpEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6836,7 +6824,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapKeyUpEventParameters>) => void,
+      fnFunction: (p1: GeoMap$KeyUpEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6906,7 +6894,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapZoomChangedEventParameters>) => void,
+      fnFunction: (p1: GeoMap$ZoomChangedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6926,7 +6914,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapZoomChangedEventParameters>) => void,
+      fnFunction: (p1: GeoMap$ZoomChangedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6987,7 +6975,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapCenterChangedEventParameters>) => void,
+      fnFunction: (p1: GeoMap$CenterChangedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7004,7 +6992,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapClickEventParameters>) => void,
+      fnFunction: (p1: GeoMap$ClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7021,7 +7009,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapContextMenuEventParameters>) => void,
+      fnFunction: (p1: GeoMap$ContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7038,7 +7026,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapDropEventParameters>) => void,
+      fnFunction: (p1: GeoMap$DropEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7055,7 +7043,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapKeyDownEventParameters>) => void,
+      fnFunction: (p1: GeoMap$KeyDownEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7072,7 +7060,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapKeyPressEventParameters>) => void,
+      fnFunction: (p1: GeoMap$KeyPressEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7089,7 +7077,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapKeyUpEventParameters>) => void,
+      fnFunction: (p1: GeoMap$KeyUpEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7123,14 +7111,14 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$GeoMapZoomChangedEventParameters>) => void,
+      fnFunction: (p1: GeoMap$ZoomChangedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:centerChanged centerChanged} to attached listeners.
      *
@@ -7140,10 +7128,10 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoMapCenterChangedEventParameters
+      mParameters?: GeoMap$CenterChangedEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -7153,10 +7141,10 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoMapClickEventParameters
+      mParameters?: GeoMap$ClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:contextMenu contextMenu} to attached listeners.
      *
@@ -7166,10 +7154,10 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoMapContextMenuEventParameters
+      mParameters?: GeoMap$ContextMenuEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:drop drop} to attached listeners.
      *
@@ -7179,10 +7167,10 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoMapDropEventParameters
+      mParameters?: GeoMap$DropEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:keyDown keyDown} to attached listeners.
      *
@@ -7192,10 +7180,10 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoMapKeyDownEventParameters
+      mParameters?: GeoMap$KeyDownEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:keyPress keyPress} to attached listeners.
      *
@@ -7205,10 +7193,10 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoMapKeyPressEventParameters
+      mParameters?: GeoMap$KeyPressEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:keyUp keyUp} to attached listeners.
      *
@@ -7218,10 +7206,10 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoMapKeyUpEventParameters
+      mParameters?: GeoMap$KeyUpEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:select select} to attached listeners.
      *
@@ -7234,7 +7222,7 @@ declare module "sap/ui/vbm/GeoMap" {
       mParameters?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:zoomChanged zoomChanged} to attached listeners.
      *
@@ -7244,7 +7232,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $GeoMapZoomChangedEventParameters
+      mParameters?: GeoMap$ZoomChangedEventParameters
     ): this;
     /**
      * Retrieves the center position of the current map.
@@ -7379,7 +7367,7 @@ declare module "sap/ui/vbm/GeoMap" {
      */
     getNavcontrolVisible(): boolean;
     /**
-     * @EXPERIMENTAL (since 1.30.0) - This method is experimental and might be modified or removerd in future
+     * @experimental (since 1.30.0) - This method is experimental and might be modified or removerd in future
      * versions.
      *
      * Trigger the interactive creation mode to get a position or position array.
@@ -8061,7 +8049,6 @@ declare module "sap/ui/vbm/GeoMap" {
       correlationFactor: float
     ): GeoMap;
   }
-  export default GeoMap;
 
   export interface $GeoMapSettings extends $VBISettings {
     /**
@@ -8188,17 +8175,17 @@ declare module "sap/ui/vbm/GeoMap" {
     /**
      * Raised when the map is clicked.
      */
-    click?: (oEvent: Event<$GeoMapClickEventParameters>) => void;
+    click?: (oEvent: GeoMap$ClickEvent) => void;
 
     /**
      * Raised when the map is right clicked/longPressed(tap and hold).
      */
-    contextMenu?: (oEvent: Event<$GeoMapContextMenuEventParameters>) => void;
+    contextMenu?: (oEvent: GeoMap$ContextMenuEvent) => void;
 
     /**
      * Raised when something is dropped on the map.
      */
-    drop?: (oEvent: Event<$GeoMapDropEventParameters>) => void;
+    drop?: (oEvent: GeoMap$DropEvent) => void;
 
     /**
      * This event is raised when a multi selection of visual objects has occurred
@@ -8208,32 +8195,30 @@ declare module "sap/ui/vbm/GeoMap" {
     /**
      * this event is raised on zoom in or zoom out.
      */
-    zoomChanged?: (oEvent: Event<$GeoMapZoomChangedEventParameters>) => void;
+    zoomChanged?: (oEvent: GeoMap$ZoomChangedEvent) => void;
 
     /**
      * this event is raised on map move.
      */
-    centerChanged?: (
-      oEvent: Event<$GeoMapCenterChangedEventParameters>
-    ) => void;
+    centerChanged?: (oEvent: GeoMap$CenterChangedEvent) => void;
 
     /**
      * this event is raised on map key down
      */
-    keyDown?: (oEvent: Event<$GeoMapKeyDownEventParameters>) => void;
+    keyDown?: (oEvent: GeoMap$KeyDownEvent) => void;
 
     /**
      * this event is raised on map key press
      */
-    keyPress?: (oEvent: Event<$GeoMapKeyPressEventParameters>) => void;
+    keyPress?: (oEvent: GeoMap$KeyPressEvent) => void;
 
     /**
      * this event is raised on map key up
      */
-    keyUp?: (oEvent: Event<$GeoMapKeyUpEventParameters>) => void;
+    keyUp?: (oEvent: GeoMap$KeyUpEvent) => void;
   }
 
-  export interface $GeoMapCenterChangedEventParameters {
+  export interface GeoMap$CenterChangedEventParameters {
     /**
      * Center point of the map. Format : Lon;Lat;0.0.
      */
@@ -8250,14 +8235,18 @@ declare module "sap/ui/vbm/GeoMap" {
     zoomLevel?: int;
   }
 
-  export interface $GeoMapClickEventParameters {
+  export type GeoMap$CenterChangedEvent = Event<GeoMap$CenterChangedEventParameters>;
+
+  export interface GeoMap$ClickEventParameters {
     /**
      * Geo coordinates in format "<longitude>;<latitude>;0"
      */
     pos?: string;
   }
 
-  export interface $GeoMapContextMenuEventParameters {
+  export type GeoMap$ClickEvent = Event<GeoMap$ClickEventParameters>;
+
+  export interface GeoMap$ContextMenuEventParameters {
     /**
      * Client coordinate X
      */
@@ -8274,14 +8263,18 @@ declare module "sap/ui/vbm/GeoMap" {
     pos?: string;
   }
 
-  export interface $GeoMapDropEventParameters {
+  export type GeoMap$ContextMenuEvent = Event<GeoMap$ContextMenuEventParameters>;
+
+  export interface GeoMap$DropEventParameters {
     /**
      * Geo coordinates in format "<longitude>;<latitude>;0"
      */
     pos?: string;
   }
 
-  export interface $GeoMapKeyDownEventParameters {
+  export type GeoMap$DropEvent = Event<GeoMap$DropEventParameters>;
+
+  export interface GeoMap$KeyDownEventParameters {
     /**
      * Key value of the key
      */
@@ -8313,7 +8306,9 @@ declare module "sap/ui/vbm/GeoMap" {
     meta?: boolean;
   }
 
-  export interface $GeoMapKeyPressEventParameters {
+  export type GeoMap$KeyDownEvent = Event<GeoMap$KeyDownEventParameters>;
+
+  export interface GeoMap$KeyPressEventParameters {
     /**
      * Key value of the key
      */
@@ -8345,7 +8340,9 @@ declare module "sap/ui/vbm/GeoMap" {
     meta?: boolean;
   }
 
-  export interface $GeoMapKeyUpEventParameters {
+  export type GeoMap$KeyPressEvent = Event<GeoMap$KeyPressEventParameters>;
+
+  export interface GeoMap$KeyUpEventParameters {
     /**
      * Key value of the key
      */
@@ -8377,9 +8374,13 @@ declare module "sap/ui/vbm/GeoMap" {
     meta?: boolean;
   }
 
-  export interface $GeoMapSelectEventParameters {}
+  export type GeoMap$KeyUpEvent = Event<GeoMap$KeyUpEventParameters>;
 
-  export interface $GeoMapZoomChangedEventParameters {
+  export interface GeoMap$SelectEventParameters {}
+
+  export type GeoMap$SelectEvent = Event<GeoMap$SelectEventParameters>;
+
+  export interface GeoMap$ZoomChangedEventParameters {
     /**
      * Center point of the map. Format : Lon;Lat;0.0.
      */
@@ -8395,6 +8396,8 @@ declare module "sap/ui/vbm/GeoMap" {
      */
     zoomLevel?: int;
   }
+
+  export type GeoMap$ZoomChangedEvent = Event<GeoMap$ZoomChangedEventParameters>;
 }
 
 declare module "sap/ui/vbm/Heatmap" {
@@ -8415,7 +8418,7 @@ declare module "sap/ui/vbm/Heatmap" {
   /**
    * Type specific Visual Object aggregation for HeatPoint instances.
    */
-  class Heatmap extends VoAbstract {
+  export default class Heatmap extends VoAbstract {
     /**
      * Constructor for a new Heatmap.
      *
@@ -8761,7 +8764,6 @@ declare module "sap/ui/vbm/Heatmap" {
       sValueScale?: string
     ): this;
   }
-  export default Heatmap;
 
   export interface $HeatmapSettings extends $VoAbstractSettings {
     /**
@@ -8829,7 +8831,7 @@ declare module "sap/ui/vbm/HeatPoint" {
   /**
    * Specific Visual Object element for a HeatPoint.
    */
-  class HeatPoint extends VoBase {
+  export default class HeatPoint extends VoBase {
     /**
      * Constructor for a new HeatPoint.
      *
@@ -8964,7 +8966,6 @@ declare module "sap/ui/vbm/HeatPoint" {
       sValue?: string
     ): this;
   }
-  export default HeatPoint;
 
   export interface $HeatPointSettings extends $VoBaseSettings {
     /**
@@ -8989,8 +8990,6 @@ declare module "sap/ui/vbm/Legend" {
 
   import LegendItem from "sap/ui/vbm/LegendItem";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import {
@@ -8998,11 +8997,13 @@ declare module "sap/ui/vbm/Legend" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * The Legend is a window in the GeoMap or AnalyticMap control wich can be used to display color/icon-text
    * pairs on a map.
    */
-  class Legend extends UI5Element {
+  export default class Legend extends UI5Element {
     /**
      * Constructor for a new Legend.
      *
@@ -9093,7 +9094,7 @@ declare module "sap/ui/vbm/Legend" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$LegendClickEventParameters>) => void,
+      fnFunction: (p1: Legend$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Legend` itself
        */
@@ -9113,7 +9114,7 @@ declare module "sap/ui/vbm/Legend" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$LegendClickEventParameters>) => void,
+      fnFunction: (p1: Legend$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Legend` itself
        */
@@ -9136,14 +9137,14 @@ declare module "sap/ui/vbm/Legend" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$LegendClickEventParameters>) => void,
+      fnFunction: (p1: Legend$ClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -9153,7 +9154,7 @@ declare module "sap/ui/vbm/Legend" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $LegendClickEventParameters
+      mParameters?: Legend$ClickEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCaption caption}.
@@ -9237,7 +9238,6 @@ declare module "sap/ui/vbm/Legend" {
       sCaption?: string
     ): this;
   }
-  export default Legend;
 
   export interface $LegendSettings extends $ElementSettings {
     /**
@@ -9253,10 +9253,10 @@ declare module "sap/ui/vbm/Legend" {
     /**
      * The event is raised when there is a click action on a legend.
      */
-    click?: (oEvent: Event<$LegendClickEventParameters>) => void;
+    click?: (oEvent: Legend$ClickEvent) => void;
   }
 
-  export interface $LegendClickEventParameters {
+  export interface Legend$ClickEventParameters {
     /**
      * Event data object
      */
@@ -9287,25 +9287,27 @@ declare module "sap/ui/vbm/Legend" {
      */
     altKey?: boolean;
   }
+
+  export type Legend$ClickEvent = Event<Legend$ClickEventParameters>;
 }
 
 declare module "sap/ui/vbm/LegendItem" {
   import { default as UI5Element, $ElementSettings } from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { SemanticType } from "sap/ui/vbm/library";
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * Aggregation element for the Legend. A LegendItem consists of marker and an associated text. The marker
    * is either a rectangle in the given color or the given image or a semantic spot type. If no marker but
    * only a text is provided then it is shown in italic letters and can be regarded as a header.
    */
-  class LegendItem extends UI5Element {
+  export default class LegendItem extends UI5Element {
     /**
      * Constructor for a new LegendItem.
      *
@@ -9385,7 +9387,7 @@ declare module "sap/ui/vbm/LegendItem" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$LegendItemClickEventParameters>) => void,
+      fnFunction: (p1: LegendItem$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.LegendItem` itself
        */
@@ -9405,7 +9407,7 @@ declare module "sap/ui/vbm/LegendItem" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$LegendItemClickEventParameters>) => void,
+      fnFunction: (p1: LegendItem$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.LegendItem` itself
        */
@@ -9422,14 +9424,14 @@ declare module "sap/ui/vbm/LegendItem" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$LegendItemClickEventParameters>) => void,
+      fnFunction: (p1: LegendItem$ClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -9439,7 +9441,7 @@ declare module "sap/ui/vbm/LegendItem" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $LegendItemClickEventParameters
+      mParameters?: LegendItem$ClickEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getColor color}.
@@ -9538,7 +9540,6 @@ declare module "sap/ui/vbm/LegendItem" {
       sText?: string
     ): this;
   }
-  export default LegendItem;
 
   export interface $LegendItemSettings extends $ElementSettings {
     /**
@@ -9567,10 +9568,10 @@ declare module "sap/ui/vbm/LegendItem" {
     /**
      * The event is raised when there is a click action on a legend item.
      */
-    click?: (oEvent: Event<$LegendItemClickEventParameters>) => void;
+    click?: (oEvent: LegendItem$ClickEvent) => void;
   }
 
-  export interface $LegendItemClickEventParameters {
+  export interface LegendItem$ClickEventParameters {
     /**
      * Event data object
      */
@@ -9596,6 +9597,8 @@ declare module "sap/ui/vbm/LegendItem" {
      */
     altKey?: boolean;
   }
+
+  export type LegendItem$ClickEvent = Event<LegendItem$ClickEventParameters>;
 }
 
 declare module "sap/ui/vbm/Pie" {
@@ -9618,7 +9621,7 @@ declare module "sap/ui/vbm/Pie" {
    *  The property hotDeltaColor borrowed from VoBase is applied only to the hot PieItem and not the
    * whole pie.
    */
-  class Pie extends VoBase {
+  export default class Pie extends VoBase {
     /**
      * Constructor for a new Pie.
      *
@@ -9799,7 +9802,6 @@ declare module "sap/ui/vbm/Pie" {
       sScale?: string
     ): this;
   }
-  export default Pie;
 
   export interface $PieSettings extends $VoBaseSettings {
     /**
@@ -9832,7 +9834,7 @@ declare module "sap/ui/vbm/PieItem" {
   /**
    * Slice element for a Pie Chart.
    */
-  class PieItem extends UI5Element {
+  export default class PieItem extends UI5Element {
     /**
      * Constructor for a new PieItem.
      *
@@ -9963,7 +9965,7 @@ declare module "sap/ui/vbm/PieItem" {
     /**
      * @deprecated (since 1.31) - This event should no longer be used. Click event from Pie and Pies now includes
      * Pie Item index when event occurs.
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -10049,7 +10051,6 @@ declare module "sap/ui/vbm/PieItem" {
       sValue?: string
     ): this;
   }
-  export default PieItem;
 
   export interface $PieItemSettings extends $ElementSettings {
     /**
@@ -10074,7 +10075,9 @@ declare module "sap/ui/vbm/PieItem" {
     click?: (oEvent: Event) => void;
   }
 
-  export interface $PieItemClickEventParameters {}
+  export interface PieItem$ClickEventParameters {}
+
+  export type PieItem$ClickEvent = Event<PieItem$ClickEventParameters>;
 }
 
 declare module "sap/ui/vbm/Pies" {
@@ -10095,7 +10098,7 @@ declare module "sap/ui/vbm/Pies" {
   /**
    * Type specific Visual Object aggregation for Pie instances.
    */
-  class Pies extends VoAggregation {
+  export default class Pies extends VoAggregation {
     /**
      * Constructor for a new Pies.
      *
@@ -10286,7 +10289,6 @@ declare module "sap/ui/vbm/Pies" {
       bScaleChangeable?: boolean
     ): this;
   }
-  export default Pies;
 
   export interface $PiesSettings extends $VoAggregationSettings {
     /**
@@ -10311,8 +10313,6 @@ declare module "sap/ui/vbm/Pies" {
 declare module "sap/ui/vbm/Region" {
   import { default as UI5Element, $ElementSettings } from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import { CSSColor } from "sap/ui/core/library";
 
   import { SemanticType } from "sap/ui/vbm/library";
@@ -10321,10 +10321,12 @@ declare module "sap/ui/vbm/Region" {
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * Region properties.
    */
-  class Region extends UI5Element {
+  export default class Region extends UI5Element {
     /**
      * Constructor for a new Region.
      *
@@ -10404,7 +10406,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$RegionClickEventParameters>) => void,
+      fnFunction: (p1: Region$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
        */
@@ -10424,7 +10426,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$RegionClickEventParameters>) => void,
+      fnFunction: (p1: Region$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
        */
@@ -10449,7 +10451,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$RegionContextMenuEventParameters>) => void,
+      fnFunction: (p1: Region$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
        */
@@ -10469,7 +10471,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$RegionContextMenuEventParameters>) => void,
+      fnFunction: (p1: Region$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
        */
@@ -10486,7 +10488,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$RegionClickEventParameters>) => void,
+      fnFunction: (p1: Region$ClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -10503,14 +10505,14 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$RegionContextMenuEventParameters>) => void,
+      fnFunction: (p1: Region$ContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -10520,10 +10522,10 @@ declare module "sap/ui/vbm/Region" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $RegionClickEventParameters
+      mParameters?: Region$ClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:contextMenu contextMenu} to attached listeners.
      *
@@ -10533,7 +10535,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $RegionContextMenuEventParameters
+      mParameters?: Region$ContextMenuEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCode code}.
@@ -10734,7 +10736,6 @@ declare module "sap/ui/vbm/Region" {
       bSelect?: boolean
     ): this;
   }
-  export default Region;
 
   export interface $RegionSettings extends $ElementSettings {
     /**
@@ -10775,27 +10776,31 @@ declare module "sap/ui/vbm/Region" {
     /**
      * The event is raised when there is a click action on a region.
      */
-    click?: (oEvent: Event<$RegionClickEventParameters>) => void;
+    click?: (oEvent: Region$ClickEvent) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on a region.
      */
-    contextMenu?: (oEvent: Event<$RegionContextMenuEventParameters>) => void;
+    contextMenu?: (oEvent: Region$ContextMenuEvent) => void;
   }
 
-  export interface $RegionClickEventParameters {
+  export interface Region$ClickEventParameters {
     /**
      * The region code.
      */
     code?: string;
   }
 
-  export interface $RegionContextMenuEventParameters {
+  export type Region$ClickEvent = Event<Region$ClickEventParameters>;
+
+  export interface Region$ContextMenuEventParameters {
     /**
      * The region code.
      */
     code?: string;
   }
+
+  export type Region$ContextMenuEvent = Event<Region$ContextMenuEventParameters>;
 }
 
 declare module "sap/ui/vbm/Resource" {
@@ -10812,7 +10817,7 @@ declare module "sap/ui/vbm/Resource" {
    * a Base64 encoded binary. This happens asynchronously and it may require several re-renderings of the
    * control until all resource show up correctly.
    */
-  class Resource extends UI5Element {
+  export default class Resource extends UI5Element {
     /**
      * Constructor for a new Resource.
      *
@@ -10951,7 +10956,6 @@ declare module "sap/ui/vbm/Resource" {
       sValue?: string
     ): this;
   }
-  export default Resource;
 
   export interface $ResourceSettings extends $ElementSettings {
     /**
@@ -11001,7 +11005,7 @@ declare module "sap/ui/vbm/Route" {
    * types defined on element level apply only for a single element instance, except the element is used as
    * template.
    */
-  class Route extends VoBase {
+  export default class Route extends VoBase {
     /**
      * Constructor for a new Route.
      *
@@ -11211,7 +11215,7 @@ declare module "sap/ui/vbm/Route" {
      */
     getPosition(): string;
     /**
-     * @EXPERIMENTAL (since 1.32.0) - this method is experimental and might be modified or removed in future
+     * @experimental (since 1.32.0) - this method is experimental and might be modified or removed in future
      * versions.
      *
      * Gets current value of property {@link #getRoutetype routetype}.
@@ -11504,7 +11508,7 @@ declare module "sap/ui/vbm/Route" {
       sPosition?: string
     ): this;
     /**
-     * @EXPERIMENTAL (since 1.32.0) - this method is experimental and might be modified or removed in future
+     * @experimental (since 1.32.0) - this method is experimental and might be modified or removed in future
      * versions.
      *
      * Sets a new value for property {@link #getRoutetype routetype}.
@@ -11543,7 +11547,6 @@ declare module "sap/ui/vbm/Route" {
       sStart?: string
     ): this;
   }
-  export default Route;
 
   export interface $RouteSettings extends $VoBaseSettings {
     /**
@@ -11604,7 +11607,7 @@ declare module "sap/ui/vbm/Route" {
     dotwidth?: string | PropertyBindingInfo;
 
     /**
-     * @EXPERIMENTAL (since 1.32.0) - this method is experimental and might be modified or removed in future
+     * @experimental (since 1.32.0) - this method is experimental and might be modified or removed in future
      * versions.
      *
      * Defines the type of the route, default is 'Straight'. Other types are 'Geodesic' which show the shortest
@@ -11646,9 +11649,9 @@ declare module "sap/ui/vbm/Routes" {
   import {
     default as VoAggregation,
     $VoAggregationSettings,
-    $VoAggregationClickEventParameters,
-    $VoAggregationContextMenuEventParameters,
-    $VoAggregationDropEventParameters,
+    VoAggregation$ClickEventParameters,
+    VoAggregation$ContextMenuEventParameters,
+    VoAggregation$DropEventParameters,
   } from "sap/ui/vbm/VoAggregation";
 
   import DragSource from "sap/ui/vbm/DragSource";
@@ -11673,7 +11676,7 @@ declare module "sap/ui/vbm/Routes" {
    * visual object matches a type in the drop target aggregation of the target vo. If drag source and drop
    * target types are defined on aggregation level they apply for all aggregated elements.
    */
-  class Routes extends VoAggregation {
+  export default class Routes extends VoAggregation {
     /**
      * Constructor for a new Routes.
      *
@@ -11972,7 +11975,7 @@ declare module "sap/ui/vbm/Routes" {
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -11985,7 +11988,7 @@ declare module "sap/ui/vbm/Routes" {
       mParameters?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:contextMenu contextMenu} to attached listeners.
      *
@@ -11998,7 +12001,7 @@ declare module "sap/ui/vbm/Routes" {
       mParameters?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:drop drop} to attached listeners.
      *
@@ -12202,7 +12205,6 @@ declare module "sap/ui/vbm/Routes" {
       bPosChangeable?: boolean
     ): this;
   }
-  export default Routes;
 
   export interface $RoutesSettings extends $VoAggregationSettings {
     /**
@@ -12250,14 +12252,20 @@ declare module "sap/ui/vbm/Routes" {
     drop?: (oEvent: Event) => void;
   }
 
-  export interface $RoutesClickEventParameters
-    extends $VoAggregationClickEventParameters {}
+  export interface Routes$ClickEventParameters
+    extends VoAggregation$ClickEventParameters {}
 
-  export interface $RoutesContextMenuEventParameters
-    extends $VoAggregationContextMenuEventParameters {}
+  export type Routes$ClickEvent = Event<Routes$ClickEventParameters>;
 
-  export interface $RoutesDropEventParameters
-    extends $VoAggregationDropEventParameters {}
+  export interface Routes$ContextMenuEventParameters
+    extends VoAggregation$ContextMenuEventParameters {}
+
+  export type Routes$ContextMenuEvent = Event<Routes$ContextMenuEventParameters>;
+
+  export interface Routes$DropEventParameters
+    extends VoAggregation$DropEventParameters {}
+
+  export type Routes$DropEvent = Event<Routes$DropEventParameters>;
 }
 
 declare module "sap/ui/vbm/Spot" {
@@ -12290,7 +12298,7 @@ declare module "sap/ui/vbm/Spot" {
    * types defined on element level apply only for a single element instance, except the element is used as
    * template.
    */
-  class Spot extends VoBase {
+  export default class Spot extends VoBase {
     /**
      * Constructor for a new Spot.
      *
@@ -12798,7 +12806,6 @@ declare module "sap/ui/vbm/Spot" {
       sType?: SemanticType | keyof typeof SemanticType
     ): this;
   }
-  export default Spot;
 
   export interface $SpotSettings extends $VoBaseSettings {
     /**
@@ -12914,7 +12921,7 @@ declare module "sap/ui/vbm/Spots" {
    * visual object matches a type in the drop target aggregation of the target vo. If drag source and drop
    * target types are defined on aggregation level they apply for all aggregated elements.
    */
-  class Spots extends VoAggregation {
+  export default class Spots extends VoAggregation {
     /**
      * Constructor for a new Spots.
      *
@@ -13247,7 +13254,6 @@ declare module "sap/ui/vbm/Spots" {
       bScaleChangeable?: boolean
     ): this;
   }
-  export default Spots;
 
   export interface $SpotsSettings extends $VoAggregationSettings {
     /**
@@ -13292,14 +13298,14 @@ declare module "sap/ui/vbm/VBI" {
 
   import { ID, CSSSize } from "sap/ui/core/library";
 
-  import Event from "sap/ui/base/Event";
-
   import { ClusterInfoType } from "sap/ui/vbm/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * The VBI control. This is the Visual Business base control, which is mainly intended to communicate directly
    * with the Visual Business Backend API in a proprietary JSON format. This control should not be used directly
@@ -13312,7 +13318,7 @@ declare module "sap/ui/vbm/VBI" {
    *  Additionally the control offers a low level API made of several events, like render, zoom, move and
    * so on, which allow to render application specific content directly on the controls canvas.
    */
-  class VBI extends Control {
+  export default class VBI extends Control {
     /**
      * Constructor for a new VBI.
      *
@@ -13396,7 +13402,7 @@ declare module "sap/ui/vbm/VBI" {
       vAriaLabelledBy: ID | Control
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Add dependant child control for rendering.
      */
@@ -13430,7 +13436,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIChangeTrackingModeEventParameters>) => void,
+      fnFunction: (p1: VBI$ChangeTrackingModeEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13451,7 +13457,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIChangeTrackingModeEventParameters>) => void,
+      fnFunction: (p1: VBI$ChangeTrackingModeEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13477,7 +13483,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBICloseWindowEventParameters>) => void,
+      fnFunction: (p1: VBI$CloseWindowEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13498,7 +13504,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBICloseWindowEventParameters>) => void,
+      fnFunction: (p1: VBI$CloseWindowEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13525,7 +13531,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIContainerCreatedEventParameters>) => void,
+      fnFunction: (p1: VBI$ContainerCreatedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13547,7 +13553,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIContainerCreatedEventParameters>) => void,
+      fnFunction: (p1: VBI$ContainerCreatedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13574,7 +13580,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIContainerDestroyedEventParameters>) => void,
+      fnFunction: (p1: VBI$ContainerDestroyedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13596,7 +13602,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIContainerDestroyedEventParameters>) => void,
+      fnFunction: (p1: VBI$ContainerDestroyedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13621,7 +13627,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIMoveEventParameters>) => void,
+      fnFunction: (p1: VBI$MoveEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13641,7 +13647,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIMoveEventParameters>) => void,
+      fnFunction: (p1: VBI$MoveEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13667,7 +13673,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIOpenWindowEventParameters>) => void,
+      fnFunction: (p1: VBI$OpenWindowEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13688,7 +13694,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIOpenWindowEventParameters>) => void,
+      fnFunction: (p1: VBI$OpenWindowEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13714,7 +13720,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIRenderEventParameters>) => void,
+      fnFunction: (p1: VBI$RenderEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13735,7 +13741,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIRenderEventParameters>) => void,
+      fnFunction: (p1: VBI$RenderEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13760,7 +13766,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBISubmitEventParameters>) => void,
+      fnFunction: (p1: VBI$SubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13780,7 +13786,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBISubmitEventParameters>) => void,
+      fnFunction: (p1: VBI$SubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13806,7 +13812,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIThumbnailClickEventParameters>) => void,
+      fnFunction: (p1: VBI$ThumbnailClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13827,7 +13833,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIThumbnailClickEventParameters>) => void,
+      fnFunction: (p1: VBI$ThumbnailClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13852,7 +13858,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIZoomEventParameters>) => void,
+      fnFunction: (p1: VBI$ZoomEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13872,7 +13878,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VBIZoomEventParameters>) => void,
+      fnFunction: (p1: VBI$ZoomEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13890,7 +13896,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBIChangeTrackingModeEventParameters>) => void,
+      fnFunction: (p1: VBI$ChangeTrackingModeEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13907,7 +13913,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBICloseWindowEventParameters>) => void,
+      fnFunction: (p1: VBI$CloseWindowEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13925,7 +13931,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBIContainerCreatedEventParameters>) => void,
+      fnFunction: (p1: VBI$ContainerCreatedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13943,7 +13949,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBIContainerDestroyedEventParameters>) => void,
+      fnFunction: (p1: VBI$ContainerDestroyedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13960,7 +13966,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBIMoveEventParameters>) => void,
+      fnFunction: (p1: VBI$MoveEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13977,7 +13983,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBIOpenWindowEventParameters>) => void,
+      fnFunction: (p1: VBI$OpenWindowEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13994,7 +14000,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBIRenderEventParameters>) => void,
+      fnFunction: (p1: VBI$RenderEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -14011,7 +14017,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBISubmitEventParameters>) => void,
+      fnFunction: (p1: VBI$SubmitEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -14029,7 +14035,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBIThumbnailClickEventParameters>) => void,
+      fnFunction: (p1: VBI$ThumbnailClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -14046,14 +14052,14 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VBIZoomEventParameters>) => void,
+      fnFunction: (p1: VBI$ZoomEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:changeTrackingMode changeTrackingMode} to attached listeners.
      *
@@ -14063,10 +14069,10 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBIChangeTrackingModeEventParameters
+      mParameters?: VBI$ChangeTrackingModeEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:closeWindow closeWindow} to attached listeners.
      *
@@ -14076,10 +14082,10 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBICloseWindowEventParameters
+      mParameters?: VBI$CloseWindowEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:containerCreated containerCreated} to attached listeners.
      *
@@ -14089,10 +14095,10 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBIContainerCreatedEventParameters
+      mParameters?: VBI$ContainerCreatedEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:containerDestroyed containerDestroyed} to attached listeners.
      *
@@ -14102,10 +14108,10 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBIContainerDestroyedEventParameters
+      mParameters?: VBI$ContainerDestroyedEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:move move} to attached listeners.
      *
@@ -14115,10 +14121,10 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBIMoveEventParameters
+      mParameters?: VBI$MoveEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:openWindow openWindow} to attached listeners.
      *
@@ -14128,10 +14134,10 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBIOpenWindowEventParameters
+      mParameters?: VBI$OpenWindowEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:render render} to attached listeners.
      *
@@ -14141,10 +14147,10 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBIRenderEventParameters
+      mParameters?: VBI$RenderEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:submit submit} to attached listeners.
      *
@@ -14154,10 +14160,10 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBISubmitEventParameters
+      mParameters?: VBI$SubmitEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:thumbnailClick thumbnailClick} to attached listeners.
      *
@@ -14167,10 +14173,10 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBIThumbnailClickEventParameters
+      mParameters?: VBI$ThumbnailClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:zoom zoom} to attached listeners.
      *
@@ -14180,7 +14186,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VBIZoomEventParameters
+      mParameters?: VBI$ZoomEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getAllowKeyEventRepeat allowKeyEventRepeat}.
@@ -14634,7 +14640,6 @@ declare module "sap/ui/vbm/VBI" {
       iLod: int
     ): void;
   }
-  export default VBI;
 
   export interface $VBISettings extends $ControlSettings {
     /**
@@ -14707,66 +14712,60 @@ declare module "sap/ui/vbm/VBI" {
     /**
      * High level API. Submit event is raised.
      */
-    submit?: (oEvent: Event<$VBISubmitEventParameters>) => void;
+    submit?: (oEvent: VBI$SubmitEvent) => void;
 
     /**
      * High level API. ThumbnailClick event is raised.
      */
-    thumbnailClick?: (oEvent: Event<$VBIThumbnailClickEventParameters>) => void;
+    thumbnailClick?: (oEvent: VBI$ThumbnailClickEvent) => void;
 
     /**
      * Low level API. Rendering of the canvas content is reqested. This event can be used to do custom rendering
      * into the Visual Business overlay canvas. This function is not supported in plugin mode.
      */
-    render?: (oEvent: Event<$VBIRenderEventParameters>) => void;
+    render?: (oEvent: VBI$RenderEvent) => void;
 
     /**
      * Low level API. Tracking mode is set or reset. This function is not supported in plugin mode.
      */
-    changeTrackingMode?: (
-      oEvent: Event<$VBIChangeTrackingModeEventParameters>
-    ) => void;
+    changeTrackingMode?: (oEvent: VBI$ChangeTrackingModeEvent) => void;
 
     /**
      * Low level API. The canvas is zoomed. This function is not supported in plugin mode.
      */
-    zoom?: (oEvent: Event<$VBIZoomEventParameters>) => void;
+    zoom?: (oEvent: VBI$ZoomEvent) => void;
 
     /**
      * Low level API. The canvas was moved. This function is not supported in plugin mode.
      */
-    move?: (oEvent: Event<$VBIMoveEventParameters>) => void;
+    move?: (oEvent: VBI$MoveEvent) => void;
 
     /**
      * The event is raised before a Visual Business window is opened. It is intended to be used to place arbitrary
      * content in e.g. a Detail Window. This event is not supported in plugin mode.
      */
-    openWindow?: (oEvent: Event<$VBIOpenWindowEventParameters>) => void;
+    openWindow?: (oEvent: VBI$OpenWindowEvent) => void;
 
     /**
      * The event is raised before a Visual Business window is closed. This function is not supported in plugin
      * mode.
      */
-    closeWindow?: (oEvent: Event<$VBICloseWindowEventParameters>) => void;
+    closeWindow?: (oEvent: VBI$CloseWindowEvent) => void;
 
     /**
      * The event is raised when a Visual Business container VO instance is created. It is intended to be used
      * to place arbitrary content in e.g. other controls. This event is not supported in plugin mode.
      */
-    containerCreated?: (
-      oEvent: Event<$VBIContainerCreatedEventParameters>
-    ) => void;
+    containerCreated?: (oEvent: VBI$ContainerCreatedEvent) => void;
 
     /**
      * The event is raised before a Visual Business container VO instance is destroyed. This function is not
      * supported in plugin mode.
      */
-    containerDestroyed?: (
-      oEvent: Event<$VBIContainerDestroyedEventParameters>
-    ) => void;
+    containerDestroyed?: (oEvent: VBI$ContainerDestroyedEvent) => void;
   }
 
-  export interface $VBIChangeTrackingModeEventParameters {
+  export interface VBI$ChangeTrackingModeEventParameters {
     /**
      * tracking mode to set or reset
      */
@@ -14778,7 +14777,9 @@ declare module "sap/ui/vbm/VBI" {
     bSet?: boolean;
   }
 
-  export interface $VBICloseWindowEventParameters {
+  export type VBI$ChangeTrackingModeEvent = Event<VBI$ChangeTrackingModeEventParameters>;
+
+  export interface VBI$CloseWindowEventParameters {
     /**
      * DomRef of placeholder Div for content.
      */
@@ -14790,7 +14791,9 @@ declare module "sap/ui/vbm/VBI" {
     id?: string;
   }
 
-  export interface $VBIContainerCreatedEventParameters {
+  export type VBI$CloseWindowEvent = Event<VBI$CloseWindowEventParameters>;
+
+  export interface VBI$ContainerCreatedEventParameters {
     /**
      * DomRef of placeholder Div to render into.
      */
@@ -14802,7 +14805,9 @@ declare module "sap/ui/vbm/VBI" {
     id?: string;
   }
 
-  export interface $VBIContainerDestroyedEventParameters {
+  export type VBI$ContainerCreatedEvent = Event<VBI$ContainerCreatedEventParameters>;
+
+  export interface VBI$ContainerDestroyedEventParameters {
     /**
      * DomRef of placeholder Div of content.
      */
@@ -14814,14 +14819,18 @@ declare module "sap/ui/vbm/VBI" {
     id?: string;
   }
 
-  export interface $VBIMoveEventParameters {
+  export type VBI$ContainerDestroyedEvent = Event<VBI$ContainerDestroyedEventParameters>;
+
+  export interface VBI$MoveEventParameters {
     /**
      * Canvas object to render into.
      */
     canvas?: object;
   }
 
-  export interface $VBIOpenWindowEventParameters {
+  export type VBI$MoveEvent = Event<VBI$MoveEventParameters>;
+
+  export interface VBI$OpenWindowEventParameters {
     /**
      * DomRef of placeholder Div to render into.
      */
@@ -14833,14 +14842,18 @@ declare module "sap/ui/vbm/VBI" {
     id?: string;
   }
 
-  export interface $VBIRenderEventParameters {
+  export type VBI$OpenWindowEvent = Event<VBI$OpenWindowEventParameters>;
+
+  export interface VBI$RenderEventParameters {
     /**
      * Canvas object to render into.
      */
     canvas?: object;
   }
 
-  export interface $VBISubmitEventParameters {
+  export type VBI$RenderEvent = Event<VBI$RenderEventParameters>;
+
+  export interface VBI$SubmitEventParameters {
     /**
      * JSON (or possibly XML and case the plugin is used) string describing the delta state of Visual Business
      * and the information about the event.
@@ -14848,7 +14861,9 @@ declare module "sap/ui/vbm/VBI" {
     data?: string;
   }
 
-  export interface $VBIThumbnailClickEventParameters {
+  export type VBI$SubmitEvent = Event<VBI$SubmitEventParameters>;
+
+  export interface VBI$ThumbnailClickEventParameters {
     /**
      * Geo coordinates in format "lon;lat;0"
      */
@@ -14860,29 +14875,33 @@ declare module "sap/ui/vbm/VBI" {
     zoomLevel?: int;
   }
 
-  export interface $VBIZoomEventParameters {
+  export type VBI$ThumbnailClickEvent = Event<VBI$ThumbnailClickEventParameters>;
+
+  export interface VBI$ZoomEventParameters {
     /**
      * Canvas object to render into
      */
     canvas?: object;
   }
+
+  export type VBI$ZoomEvent = Event<VBI$ZoomEventParameters>;
 }
 
 declare module "sap/ui/vbm/Viewport" {
   import { default as Control, $ControlSettings } from "sap/ui/core/Control";
 
-  import Event from "sap/ui/base/Event";
-
   import { CSSSize } from "sap/ui/core/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * Provides a control for three js canvas.
    */
-  class Viewport extends Control {
+  export default class Viewport extends Control {
     /**
      * Constructor for a new three js viewport for Adapter3D.
      *
@@ -14940,7 +14959,7 @@ declare module "sap/ui/vbm/Viewport" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ViewportCameraChangeEventParameters>) => void,
+      fnFunction: (p1: Viewport$CameraChangeEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Viewport` itself
        */
@@ -14960,7 +14979,7 @@ declare module "sap/ui/vbm/Viewport" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ViewportCameraChangeEventParameters>) => void,
+      fnFunction: (p1: Viewport$CameraChangeEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Viewport` itself
        */
@@ -14977,14 +14996,14 @@ declare module "sap/ui/vbm/Viewport" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ViewportCameraChangeEventParameters>) => void,
+      fnFunction: (p1: Viewport$CameraChangeEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:cameraChange cameraChange} to attached listeners.
      *
@@ -14994,7 +15013,7 @@ declare module "sap/ui/vbm/Viewport" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ViewportCameraChangeEventParameters
+      mParameters?: Viewport$CameraChangeEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCameraHistoryLength cameraHistoryLength}.
@@ -15101,7 +15120,6 @@ declare module "sap/ui/vbm/Viewport" {
       sWidth?: CSSSize
     ): this;
   }
-  export default Viewport;
 
   export interface $ViewportSettings extends $ControlSettings {
     /**
@@ -15127,12 +15145,10 @@ declare module "sap/ui/vbm/Viewport" {
     /**
      * This event is fired when camera positioning changed (whole movement has been finished)
      */
-    cameraChange?: (
-      oEvent: Event<$ViewportCameraChangeEventParameters>
-    ) => void;
+    cameraChange?: (oEvent: Viewport$CameraChangeEvent) => void;
   }
 
-  export interface $ViewportCameraChangeEventParameters {
+  export interface Viewport$CameraChangeEventParameters {
     /**
      * Current position in camera history
      */
@@ -15143,6 +15159,8 @@ declare module "sap/ui/vbm/Viewport" {
      */
     historyLength?: int;
   }
+
+  export type Viewport$CameraChangeEvent = Event<Viewport$CameraChangeEventParameters>;
 }
 
 declare module "sap/ui/vbm/VoAbstract" {
@@ -15158,7 +15176,7 @@ declare module "sap/ui/vbm/VoAbstract" {
    * Abstract VO aggregation container. This element implements the common part for VOs. It must not be used
    * directly, but is the base for further extension.
    */
-  class VoAbstract extends UI5Element {
+  export default class VoAbstract extends UI5Element {
     /**
      * Constructor for a new VoAbstract.
      *
@@ -15243,7 +15261,6 @@ declare module "sap/ui/vbm/VoAbstract" {
       oMenu: Menu
     ): void;
   }
-  export default VoAbstract;
 
   export interface $VoAbstractSettings extends $ElementSettings {}
 }
@@ -15254,14 +15271,14 @@ declare module "sap/ui/vbm/VoAggregation" {
     $VoAbstractSettings,
   } from "sap/ui/vbm/VoAbstract";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import VoBase from "sap/ui/vbm/VoBase";
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   import Menu from "sap/ui/unified/Menu";
 
   import Spot from "sap/ui/vbm/Spot";
@@ -15270,7 +15287,7 @@ declare module "sap/ui/vbm/VoAggregation" {
    * Abstract VO aggregation container. This element implements the common part for all specific VO aggregations
    * with selection cardinatities. It must not be used directly, but is the base for further extension.
    */
-  class VoAggregation extends VoAbstract {
+  export default class VoAggregation extends VoAbstract {
     /**
      * Constructor for a new VoAggregation.
      *
@@ -15350,7 +15367,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationClickEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15370,7 +15387,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationClickEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$ClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15395,7 +15412,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationContextMenuEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15415,7 +15432,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationContextMenuEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15440,7 +15457,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationDeselectEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$DeselectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15460,7 +15477,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationDeselectEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$DeselectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15485,7 +15502,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationDropEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$DropEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15505,7 +15522,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationDropEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$DropEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15530,7 +15547,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationHandleClickEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$HandleClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15550,7 +15567,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationHandleClickEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$HandleClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15576,9 +15593,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$VoAggregationHandleContextMenuEventParameters>
-      ) => void,
+      fnFunction: (p1: VoAggregation$HandleContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15599,9 +15614,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$VoAggregationHandleContextMenuEventParameters>
-      ) => void,
+      fnFunction: (p1: VoAggregation$HandleContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15626,7 +15639,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationHandleMovedEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$HandleMovedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15646,7 +15659,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationHandleMovedEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$HandleMovedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15671,7 +15684,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationSelectEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$SelectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15691,7 +15704,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationSelectEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$SelectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15708,7 +15721,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationClickEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$ClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15725,7 +15738,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationContextMenuEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$ContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15742,7 +15755,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationDeselectEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$DeselectEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15759,7 +15772,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationDropEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$DropEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15776,7 +15789,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationHandleClickEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$HandleClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15794,9 +15807,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$VoAggregationHandleContextMenuEventParameters>
-      ) => void,
+      fnFunction: (p1: VoAggregation$HandleContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15813,7 +15824,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationHandleMovedEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$HandleMovedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15830,14 +15841,14 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoAggregationSelectEventParameters>) => void,
+      fnFunction: (p1: VoAggregation$SelectEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -15847,10 +15858,10 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoAggregationClickEventParameters
+      mParameters?: VoAggregation$ClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:contextMenu contextMenu} to attached listeners.
      *
@@ -15860,10 +15871,10 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoAggregationContextMenuEventParameters
+      mParameters?: VoAggregation$ContextMenuEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:deselect deselect} to attached listeners.
      *
@@ -15873,10 +15884,10 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoAggregationDeselectEventParameters
+      mParameters?: VoAggregation$DeselectEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:drop drop} to attached listeners.
      *
@@ -15886,10 +15897,10 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoAggregationDropEventParameters
+      mParameters?: VoAggregation$DropEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:handleClick handleClick} to attached listeners.
      *
@@ -15899,10 +15910,10 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoAggregationHandleClickEventParameters
+      mParameters?: VoAggregation$HandleClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:handleContextMenu handleContextMenu} to attached listeners.
      *
@@ -15912,10 +15923,10 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoAggregationHandleContextMenuEventParameters
+      mParameters?: VoAggregation$HandleContextMenuEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:handleMoved handleMoved} to attached listeners.
      *
@@ -15925,10 +15936,10 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoAggregationHandleMovedEventParameters
+      mParameters?: VoAggregation$HandleMovedEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:select select} to attached listeners.
      *
@@ -15938,7 +15949,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoAggregationSelectEventParameters
+      mParameters?: VoAggregation$SelectEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCustomProperties customProperties}.
@@ -16050,7 +16061,6 @@ declare module "sap/ui/vbm/VoAggregation" {
       sMinSel?: string
     ): this;
   }
-  export default VoAggregation;
 
   export interface $VoAggregationSettings extends $VoAbstractSettings {
     /**
@@ -16072,60 +16082,54 @@ declare module "sap/ui/vbm/VoAggregation" {
     /**
      * This event is raised when a Design handle is moved.
      */
-    handleMoved?: (
-      oEvent: Event<$VoAggregationHandleMovedEventParameters>
-    ) => void;
+    handleMoved?: (oEvent: VoAggregation$HandleMovedEvent) => void;
 
     /**
      * This event is raised when a Design handle is right clicked.
      */
-    handleContextMenu?: (
-      oEvent: Event<$VoAggregationHandleContextMenuEventParameters>
-    ) => void;
+    handleContextMenu?: (oEvent: VoAggregation$HandleContextMenuEvent) => void;
 
     /**
      * This event is raised when a Design handle is clicked.
      */
-    handleClick?: (
-      oEvent: Event<$VoAggregationHandleClickEventParameters>
-    ) => void;
+    handleClick?: (oEvent: VoAggregation$HandleClickEvent) => void;
 
     /**
      * This event is raised when aggregated elements get selected
      */
-    select?: (oEvent: Event<$VoAggregationSelectEventParameters>) => void;
+    select?: (oEvent: VoAggregation$SelectEvent) => void;
 
     /**
      * This event is raised when aggregated elements get deselected
      */
-    deselect?: (oEvent: Event<$VoAggregationDeselectEventParameters>) => void;
+    deselect?: (oEvent: VoAggregation$DeselectEvent) => void;
 
     /**
      * The event is raised when there is a click action on a VO.
      */
-    click?: (oEvent: Event<$VoAggregationClickEventParameters>) => void;
+    click?: (oEvent: VoAggregation$ClickEvent) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on a VO.
      */
-    contextMenu?: (
-      oEvent: Event<$VoAggregationContextMenuEventParameters>
-    ) => void;
+    contextMenu?: (oEvent: VoAggregation$ContextMenuEvent) => void;
 
     /**
      * The event is raised when something is dropped on a VO.
      */
-    drop?: (oEvent: Event<$VoAggregationDropEventParameters>) => void;
+    drop?: (oEvent: VoAggregation$DropEvent) => void;
   }
 
-  export interface $VoAggregationClickEventParameters {
+  export interface VoAggregation$ClickEventParameters {
     /**
      * Clicked instance
      */
     instance?: VoBase;
   }
 
-  export interface $VoAggregationContextMenuEventParameters {
+  export type VoAggregation$ClickEvent = Event<VoAggregation$ClickEventParameters>;
+
+  export interface VoAggregation$ContextMenuEventParameters {
     /**
      * Clicked instance
      */
@@ -16137,14 +16141,18 @@ declare module "sap/ui/vbm/VoAggregation" {
     menu?: Menu;
   }
 
-  export interface $VoAggregationDeselectEventParameters {
+  export type VoAggregation$ContextMenuEvent = Event<VoAggregation$ContextMenuEventParameters>;
+
+  export interface VoAggregation$DeselectEventParameters {
     /**
      * Array of deselected VOs
      */
     deselected?: any[];
   }
 
-  export interface $VoAggregationDropEventParameters {
+  export type VoAggregation$DeselectEvent = Event<VoAggregation$DeselectEventParameters>;
+
+  export interface VoAggregation$DropEventParameters {
     /**
      * Drop target instance
      */
@@ -16156,7 +16164,9 @@ declare module "sap/ui/vbm/VoAggregation" {
     dragSource?: VoBase;
   }
 
-  export interface $VoAggregationHandleClickEventParameters {
+  export type VoAggregation$DropEvent = Event<VoAggregation$DropEventParameters>;
+
+  export interface VoAggregation$HandleClickEventParameters {
     /**
      * Clicked instance
      */
@@ -16168,7 +16178,9 @@ declare module "sap/ui/vbm/VoAggregation" {
     handle?: int;
   }
 
-  export interface $VoAggregationHandleContextMenuEventParameters {
+  export type VoAggregation$HandleClickEvent = Event<VoAggregation$HandleClickEventParameters>;
+
+  export interface VoAggregation$HandleContextMenuEventParameters {
     /**
      * Clicked instance
      */
@@ -16185,7 +16197,9 @@ declare module "sap/ui/vbm/VoAggregation" {
     handle?: int;
   }
 
-  export interface $VoAggregationHandleMovedEventParameters {
+  export type VoAggregation$HandleContextMenuEvent = Event<VoAggregation$HandleContextMenuEventParameters>;
+
+  export interface VoAggregation$HandleMovedEventParameters {
     /**
      * Clicked instance
      */
@@ -16197,12 +16211,16 @@ declare module "sap/ui/vbm/VoAggregation" {
     handle?: int;
   }
 
-  export interface $VoAggregationSelectEventParameters {
+  export type VoAggregation$HandleMovedEvent = Event<VoAggregation$HandleMovedEventParameters>;
+
+  export interface VoAggregation$SelectEventParameters {
     /**
      * Array of selected VOs
      */
     selected?: any[];
   }
+
+  export type VoAggregation$SelectEvent = Event<VoAggregation$SelectEventParameters>;
 }
 
 declare module "sap/ui/vbm/VoBase" {
@@ -16228,7 +16246,7 @@ declare module "sap/ui/vbm/VoBase" {
    * 	 - A freestyle mode, providing the full control on colors and layout.  Further all visual objects
    *     have common edit capabilities and it is possible to drop content on visual objects.
    */
-  class VoBase extends UI5Element {
+  export default class VoBase extends UI5Element {
     /**
      * Constructor for a new VoBase.
      *
@@ -16353,7 +16371,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseContextMenuEventParameters>) => void,
+      fnFunction: (p1: VoBase$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16373,7 +16391,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseContextMenuEventParameters>) => void,
+      fnFunction: (p1: VoBase$ContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16398,7 +16416,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseDropEventParameters>) => void,
+      fnFunction: (p1: VoBase$DropEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16418,7 +16436,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseDropEventParameters>) => void,
+      fnFunction: (p1: VoBase$DropEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16443,7 +16461,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseHandleClickEventParameters>) => void,
+      fnFunction: (p1: VoBase$HandleClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16463,7 +16481,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseHandleClickEventParameters>) => void,
+      fnFunction: (p1: VoBase$HandleClickEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16489,7 +16507,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseHandleContextMenuEventParameters>) => void,
+      fnFunction: (p1: VoBase$HandleContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16510,7 +16528,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseHandleContextMenuEventParameters>) => void,
+      fnFunction: (p1: VoBase$HandleContextMenuEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16535,7 +16553,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseHandleMovedEventParameters>) => void,
+      fnFunction: (p1: VoBase$HandleMovedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16555,7 +16573,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseHandleMovedEventParameters>) => void,
+      fnFunction: (p1: VoBase$HandleMovedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16589,7 +16607,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseContextMenuEventParameters>) => void,
+      fnFunction: (p1: VoBase$ContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -16606,7 +16624,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseDropEventParameters>) => void,
+      fnFunction: (p1: VoBase$DropEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -16623,7 +16641,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseHandleClickEventParameters>) => void,
+      fnFunction: (p1: VoBase$HandleClickEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -16641,7 +16659,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseHandleContextMenuEventParameters>) => void,
+      fnFunction: (p1: VoBase$HandleContextMenuEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -16658,14 +16676,14 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$VoBaseHandleMovedEventParameters>) => void,
+      fnFunction: (p1: VoBase$HandleMovedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:click click} to attached listeners.
      *
@@ -16678,7 +16696,7 @@ declare module "sap/ui/vbm/VoBase" {
       mParameters?: object
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:contextMenu contextMenu} to attached listeners.
      *
@@ -16688,10 +16706,10 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoBaseContextMenuEventParameters
+      mParameters?: VoBase$ContextMenuEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:drop drop} to attached listeners.
      *
@@ -16701,10 +16719,10 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoBaseDropEventParameters
+      mParameters?: VoBase$DropEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:handleClick handleClick} to attached listeners.
      *
@@ -16714,10 +16732,10 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoBaseHandleClickEventParameters
+      mParameters?: VoBase$HandleClickEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:handleContextMenu handleContextMenu} to attached listeners.
      *
@@ -16727,10 +16745,10 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoBaseHandleContextMenuEventParameters
+      mParameters?: VoBase$HandleContextMenuEventParameters
     ): this;
     /**
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:handleMoved handleMoved} to attached listeners.
      *
@@ -16740,7 +16758,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $VoBaseHandleMovedEventParameters
+      mParameters?: VoBase$HandleMovedEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getChangeable changeable}.
@@ -17229,7 +17247,6 @@ declare module "sap/ui/vbm/VoBase" {
       sSelectColor?: string
     ): this;
   }
-  export default VoBase;
 
   export interface $VoBaseSettings extends $ElementSettings {
     /**
@@ -17348,55 +17365,61 @@ declare module "sap/ui/vbm/VoBase" {
     /**
      * The event is raised when there is a right click or a tap and hold action on a visual object.
      */
-    contextMenu?: (oEvent: Event<$VoBaseContextMenuEventParameters>) => void;
+    contextMenu?: (oEvent: VoBase$ContextMenuEvent) => void;
 
     /**
      * This event is raised when the design handle is moved.
      */
-    handleMoved?: (oEvent: Event<$VoBaseHandleMovedEventParameters>) => void;
+    handleMoved?: (oEvent: VoBase$HandleMovedEvent) => void;
 
     /**
      * This event is raised when the design handle is right clicked.
      */
-    handleContextMenu?: (
-      oEvent: Event<$VoBaseHandleContextMenuEventParameters>
-    ) => void;
+    handleContextMenu?: (oEvent: VoBase$HandleContextMenuEvent) => void;
 
     /**
      * This event is raised when the design handle is clicked.
      */
-    handleClick?: (oEvent: Event<$VoBaseHandleClickEventParameters>) => void;
+    handleClick?: (oEvent: VoBase$HandleClickEvent) => void;
 
     /**
      * The event is raised when something is dropped on the object.
      */
-    drop?: (oEvent: Event<$VoBaseDropEventParameters>) => void;
+    drop?: (oEvent: VoBase$DropEvent) => void;
   }
 
-  export interface $VoBaseClickEventParameters {}
+  export interface VoBase$ClickEventParameters {}
 
-  export interface $VoBaseContextMenuEventParameters {
+  export type VoBase$ClickEvent = Event<VoBase$ClickEventParameters>;
+
+  export interface VoBase$ContextMenuEventParameters {
     /**
      * Menu to open
      */
     menu?: Menu;
   }
 
-  export interface $VoBaseDropEventParameters {
+  export type VoBase$ContextMenuEvent = Event<VoBase$ContextMenuEventParameters>;
+
+  export interface VoBase$DropEventParameters {
     /**
      * Dragged instance
      */
     dragSource?: VoBase;
   }
 
-  export interface $VoBaseHandleClickEventParameters {
+  export type VoBase$DropEvent = Event<VoBase$DropEventParameters>;
+
+  export interface VoBase$HandleClickEventParameters {
     /**
      * The number of the handle where the click occured. Handles are numbered zero based.
      */
     handle?: int;
   }
 
-  export interface $VoBaseHandleContextMenuEventParameters {
+  export type VoBase$HandleClickEvent = Event<VoBase$HandleClickEventParameters>;
+
+  export interface VoBase$HandleContextMenuEventParameters {
     /**
      * The number of the handle where the click occured. Handles are numbered zero based.
      */
@@ -17408,12 +17431,16 @@ declare module "sap/ui/vbm/VoBase" {
     menu?: Menu;
   }
 
-  export interface $VoBaseHandleMovedEventParameters {
+  export type VoBase$HandleContextMenuEvent = Event<VoBase$HandleContextMenuEventParameters>;
+
+  export interface VoBase$HandleMovedEventParameters {
     /**
      * The number of the handle where the click occured. Handles are numbered zero based.
      */
     handle?: int;
   }
+
+  export type VoBase$HandleMovedEvent = Event<VoBase$HandleMovedEventParameters>;
 }
 
 declare namespace sap {