@sapui5/ts-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 namespace sap {
   namespace ui {
@@ -17,9 +17,7 @@ declare namespace sap {
          * 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: sap.ui.base.Event<sap.ui.vbm.$AdapterSubmitEventParameters>
-        ) => void;
+        submit?: (oEvent: Adapter$SubmitEvent) => void;
       }
 
       interface $Adapter3DSettings extends sap.ui.core.$ElementSettings {
@@ -32,9 +30,7 @@ declare namespace sap {
         /**
          * This event is fired when interactions in the viewport happen.
          */
-        submit?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$Adapter3DSubmitEventParameters>
-        ) => void;
+        submit?: (oEvent: Adapter3D$SubmitEvent) => void;
       }
 
       interface $AnalyticMapSettings extends sap.ui.vbm.$GeoMapSettings {
@@ -51,15 +47,13 @@ declare namespace sap {
         /**
          * The event is raised when there is a click or a tap on a region.
          */
-        regionClick?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$AnalyticMapRegionContextMenuEventParameters>
+          oEvent: AnalyticMap$RegionContextMenuEvent
         ) => void;
 
         /**
@@ -132,16 +126,12 @@ declare namespace sap {
         /**
          * This event is raised when the edge of an Area is clicked.
          */
-        edgeClick?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$AreasEdgeClickEventParameters>
-        ) => void;
+        edgeClick?: (oEvent: Areas$EdgeClickEvent) => void;
 
         /**
          * This event is raised when the edge of an Area is right clicked.
          */
-        edgeContextMenu?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$AreasEdgeContextMenuEventParameters>
-        ) => void;
+        edgeContextMenu?: (oEvent: Areas$EdgeContextMenuEvent) => void;
       }
 
       interface $BoxSettings extends sap.ui.vbm.$VoBaseSettings {
@@ -339,16 +329,12 @@ declare namespace sap {
         /**
          * The event is raised when there is a click action on a Cluster Object.
          */
-        click?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$ClusterBaseContextMenuEventParameters>
-        ) => void;
+        contextMenu?: (oEvent: ClusterBase$ContextMenuEvent) => void;
       }
 
       interface $ClusterContainerSettings
@@ -488,9 +474,7 @@ declare namespace sap {
         /**
          * The event is raised when there is a right click or a tap and hold action on a Feature.
          */
-        contextMenu?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$FeatureContextMenuEventParameters>
-        ) => void;
+        contextMenu?: (oEvent: Feature$ContextMenuEvent) => void;
       }
 
       interface $FeatureCollectionSettings
@@ -508,17 +492,13 @@ declare namespace sap {
          * 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: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$FeatureCollectionContextMenuEventParameters>
-        ) => void;
+        contextMenu?: (oEvent: FeatureCollection$ContextMenuEvent) => void;
       }
 
       interface $GeoCircleSettings extends sap.ui.vbm.$VoBaseSettings {
@@ -629,17 +609,13 @@ declare namespace sap {
          * 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: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$GeoJsonLayerContextMenuEventParameters>
-        ) => void;
+        contextMenu?: (oEvent: GeoJsonLayer$ContextMenuEvent) => void;
       }
 
       interface $GeoMapSettings extends sap.ui.vbm.$VBISettings {
@@ -809,23 +785,17 @@ declare namespace sap {
         /**
          * Raised when the map is clicked.
          */
-        click?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$GeoMapClickEventParameters>
-        ) => void;
+        click?: (oEvent: GeoMap$ClickEvent) => void;
 
         /**
          * Raised when the map is right clicked/longPressed(tap and hold).
          */
-        contextMenu?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$GeoMapContextMenuEventParameters>
-        ) => void;
+        contextMenu?: (oEvent: GeoMap$ContextMenuEvent) => void;
 
         /**
          * Raised when something is dropped on the map.
          */
-        drop?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$GeoMapDropEventParameters>
-        ) => void;
+        drop?: (oEvent: GeoMap$DropEvent) => void;
 
         /**
          * This event is raised when a multi selection of visual objects has occurred
@@ -835,37 +805,27 @@ declare namespace sap {
         /**
          * this event is raised on zoom in or zoom out.
          */
-        zoomChanged?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$GeoMapZoomChangedEventParameters>
-        ) => void;
+        zoomChanged?: (oEvent: GeoMap$ZoomChangedEvent) => void;
 
         /**
          * this event is raised on map move.
          */
-        centerChanged?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$GeoMapCenterChangedEventParameters>
-        ) => void;
+        centerChanged?: (oEvent: GeoMap$CenterChangedEvent) => void;
 
         /**
          * this event is raised on map key down
          */
-        keyDown?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyDownEventParameters>
-        ) => void;
+        keyDown?: (oEvent: GeoMap$KeyDownEvent) => void;
 
         /**
          * this event is raised on map key press
          */
-        keyPress?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyPressEventParameters>
-        ) => void;
+        keyPress?: (oEvent: GeoMap$KeyPressEvent) => void;
 
         /**
          * this event is raised on map key up
          */
-        keyUp?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyUpEventParameters>
-        ) => void;
+        keyUp?: (oEvent: GeoMap$KeyUpEvent) => void;
       }
 
       interface $HeatmapSettings extends sap.ui.vbm.$VoAbstractSettings {
@@ -965,9 +925,7 @@ declare namespace sap {
         /**
          * The event is raised when there is a click action on a legend.
          */
-        click?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$LegendClickEventParameters>
-        ) => void;
+        click?: (oEvent: Legend$ClickEvent) => void;
       }
 
       interface $LegendItemSettings extends sap.ui.core.$ElementSettings {
@@ -997,9 +955,7 @@ declare namespace sap {
         /**
          * The event is raised when there is a click action on a legend item.
          */
-        click?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$LegendItemClickEventParameters>
-        ) => void;
+        click?: (oEvent: LegendItem$ClickEvent) => void;
       }
 
       interface $PieSettings extends sap.ui.vbm.$VoBaseSettings {
@@ -1126,16 +1082,12 @@ declare namespace sap {
         /**
          * The event is raised when there is a click action on a region.
          */
-        click?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$RegionContextMenuEventParameters>
-        ) => void;
+        contextMenu?: (oEvent: Region$ContextMenuEvent) => void;
       }
 
       interface $ResourceSettings extends sap.ui.core.$ElementSettings {
@@ -1216,7 +1168,7 @@ declare namespace sap {
         dotwidth?: string | sap.ui.base.ManagedObject.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
@@ -1544,77 +1496,57 @@ declare namespace sap {
         /**
          * High level API. Submit event is raised.
          */
-        submit?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VBISubmitEventParameters>
-        ) => void;
+        submit?: (oEvent: VBI$SubmitEvent) => void;
 
         /**
          * High level API. ThumbnailClick event is raised.
          */
-        thumbnailClick?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$VBIChangeTrackingModeEventParameters>
-        ) => void;
+        changeTrackingMode?: (oEvent: VBI$ChangeTrackingModeEvent) => void;
 
         /**
          * Low level API. The canvas is zoomed. This function is not supported in plugin mode.
          */
-        zoom?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VBIZoomEventParameters>
-        ) => void;
+        zoom?: (oEvent: VBI$ZoomEvent) => void;
 
         /**
          * Low level API. The canvas was moved. This function is not supported in plugin mode.
          */
-        move?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$VBIContainerDestroyedEventParameters>
-        ) => void;
+        containerDestroyed?: (oEvent: VBI$ContainerDestroyedEvent) => void;
       }
 
       interface $ViewportSettings extends sap.ui.core.$ControlSettings {
@@ -1653,9 +1585,7 @@ declare namespace sap {
         /**
          * This event is fired when camera positioning changed (whole movement has been finished)
          */
-        cameraChange?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$ViewportCameraChangeEventParameters>
-        ) => void;
+        cameraChange?: (oEvent: Viewport$CameraChangeEvent) => void;
       }
 
       interface $VoAbstractSettings extends sap.ui.core.$ElementSettings {}
@@ -1683,58 +1613,44 @@ declare namespace sap {
         /**
          * This event is raised when a Design handle is moved.
          */
-        handleMoved?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleMovedEventParameters>
-        ) => void;
+        handleMoved?: (oEvent: VoAggregation$HandleMovedEvent) => void;
 
         /**
          * This event is raised when a Design handle is right clicked.
          */
         handleContextMenu?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleContextMenuEventParameters>
+          oEvent: VoAggregation$HandleContextMenuEvent
         ) => void;
 
         /**
          * This event is raised when a Design handle is clicked.
          */
-        handleClick?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleClickEventParameters>
-        ) => void;
+        handleClick?: (oEvent: VoAggregation$HandleClickEvent) => void;
 
         /**
          * This event is raised when aggregated elements get selected
          */
-        select?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoAggregationSelectEventParameters>
-        ) => void;
+        select?: (oEvent: VoAggregation$SelectEvent) => void;
 
         /**
          * This event is raised when aggregated elements get deselected
          */
-        deselect?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoAggregationDeselectEventParameters>
-        ) => void;
+        deselect?: (oEvent: VoAggregation$DeselectEvent) => void;
 
         /**
          * The event is raised when there is a click action on a VO.
          */
-        click?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$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: sap.ui.base.Event<sap.ui.vbm.$VoAggregationContextMenuEventParameters>
-        ) => void;
+        contextMenu?: (oEvent: VoAggregation$ContextMenuEvent) => void;
 
         /**
          * The event is raised when something is dropped on a VO.
          */
-        drop?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoAggregationDropEventParameters>
-        ) => void;
+        drop?: (oEvent: VoAggregation$DropEvent) => void;
       }
 
       interface $VoBaseSettings extends sap.ui.core.$ElementSettings {
@@ -1865,73 +1781,63 @@ declare namespace sap {
         /**
          * The event is raised when there is a right click or a tap and hold action on a visual object.
          */
-        contextMenu?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoBaseContextMenuEventParameters>
-        ) => void;
+        contextMenu?: (oEvent: VoBase$ContextMenuEvent) => void;
 
         /**
          * This event is raised when the design handle is moved.
          */
-        handleMoved?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleMovedEventParameters>
-        ) => void;
+        handleMoved?: (oEvent: VoBase$HandleMovedEvent) => void;
 
         /**
          * This event is raised when the design handle is right clicked.
          */
-        handleContextMenu?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleContextMenuEventParameters>
-        ) => void;
+        handleContextMenu?: (oEvent: VoBase$HandleContextMenuEvent) => void;
 
         /**
          * This event is raised when the design handle is clicked.
          */
-        handleClick?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleClickEventParameters>
-        ) => void;
+        handleClick?: (oEvent: VoBase$HandleClickEvent) => void;
 
         /**
          * The event is raised when something is dropped on the object.
          */
-        drop?: (
-          oEvent: sap.ui.base.Event<sap.ui.vbm.$VoBaseDropEventParameters>
-        ) => void;
+        drop?: (oEvent: VoBase$DropEvent) => void;
       }
 
-      interface $AdapterSubmitEventParameters {
+      interface Adapter$SubmitEventParameters {
         data?: string;
       }
 
-      interface $Adapter3DSubmitEventParameters {
+      interface Adapter3D$SubmitEventParameters {
         /**
          * A string in the VBI JSON format.
          */
         data?: string;
       }
 
-      interface $AnalyticMapRegionClickEventParameters {
+      interface AnalyticMap$RegionClickEventParameters {
         /**
          * The regions code.
          */
         code?: string;
       }
 
-      interface $AnalyticMapRegionContextMenuEventParameters {
+      interface AnalyticMap$RegionContextMenuEventParameters {
         /**
          * The regions code.
          */
         code?: string;
       }
 
-      interface $AnalyticMapRegionDeselectEventParameters {}
+      interface AnalyticMap$RegionDeselectEventParameters {}
 
-      interface $AnalyticMapRegionSelectEventParameters {}
+      interface AnalyticMap$RegionSelectEventParameters {}
 
-      interface $AreaEdgeClickEventParameters {}
+      interface Area$EdgeClickEventParameters {}
 
-      interface $AreaEdgeContextMenuEventParameters {}
+      interface Area$EdgeContextMenuEventParameters {}
 
-      interface $AreasEdgeClickEventParameters {
+      interface Areas$EdgeClickEventParameters {
         /**
          * Clicked instance
          */
@@ -1944,7 +1850,7 @@ declare namespace sap {
         edge?: int;
       }
 
-      interface $AreasEdgeContextMenuEventParameters {
+      interface Areas$EdgeContextMenuEventParameters {
         /**
          * Clicked instance
          */
@@ -1957,14 +1863,14 @@ declare namespace sap {
         edge?: int;
       }
 
-      interface $ClusterBaseClickEventParameters {
+      interface ClusterBase$ClickEventParameters {
         /**
          * ID of the clicked cluster object. Can serve as input for GeoMap function getInfoForCluster
          */
         clusterID?: string;
       }
 
-      interface $ClusterBaseContextMenuEventParameters {
+      interface ClusterBase$ContextMenuEventParameters {
         /**
          * ID of the clicked cluster object. Can serve as input for GeoMap function getInfoForCluster
          */
@@ -1976,36 +1882,36 @@ declare namespace sap {
         menu?: sap.ui.unified.Menu;
       }
 
-      interface $FeatureClickEventParameters {}
+      interface Feature$ClickEventParameters {}
 
-      interface $FeatureContextMenuEventParameters {
+      interface Feature$ContextMenuEventParameters {
         /**
          * Menu object to be used with openContextMenu().
          */
         menu?: sap.ui.unified.Menu;
       }
 
-      interface $FeatureCollectionClickEventParameters
-        extends sap.ui.vbm.$GeoJsonLayerClickEventParameters {}
+      interface FeatureCollection$ClickEventParameters
+        extends sap.ui.vbm.GeoJsonLayer$ClickEventParameters {}
 
-      interface $FeatureCollectionContextMenuEventParameters
-        extends sap.ui.vbm.$GeoJsonLayerContextMenuEventParameters {}
+      interface FeatureCollection$ContextMenuEventParameters
+        extends sap.ui.vbm.GeoJsonLayer$ContextMenuEventParameters {}
 
-      interface $GeoJsonLayerClickEventParameters {
+      interface GeoJsonLayer$ClickEventParameters {
         /**
          * Id of clicked Feature
          */
         featureId?: string;
       }
 
-      interface $GeoJsonLayerContextMenuEventParameters {
+      interface GeoJsonLayer$ContextMenuEventParameters {
         /**
          * Id of clicked Feature
          */
         featureId?: string;
       }
 
-      interface $GeoMapCenterChangedEventParameters {
+      interface GeoMap$CenterChangedEventParameters {
         /**
          * Center point of the map. Format : Lon;Lat;0.0.
          */
@@ -2022,14 +1928,14 @@ declare namespace sap {
         zoomLevel?: int;
       }
 
-      interface $GeoMapClickEventParameters {
+      interface GeoMap$ClickEventParameters {
         /**
          * Geo coordinates in format "<longitude>;<latitude>;0"
          */
         pos?: string;
       }
 
-      interface $GeoMapContextMenuEventParameters {
+      interface GeoMap$ContextMenuEventParameters {
         /**
          * Client coordinate X
          */
@@ -2046,14 +1952,14 @@ declare namespace sap {
         pos?: string;
       }
 
-      interface $GeoMapDropEventParameters {
+      interface GeoMap$DropEventParameters {
         /**
          * Geo coordinates in format "<longitude>;<latitude>;0"
          */
         pos?: string;
       }
 
-      interface $GeoMapKeyDownEventParameters {
+      interface GeoMap$KeyDownEventParameters {
         /**
          * Key value of the key
          */
@@ -2085,7 +1991,7 @@ declare namespace sap {
         meta?: boolean;
       }
 
-      interface $GeoMapKeyPressEventParameters {
+      interface GeoMap$KeyPressEventParameters {
         /**
          * Key value of the key
          */
@@ -2117,7 +2023,7 @@ declare namespace sap {
         meta?: boolean;
       }
 
-      interface $GeoMapKeyUpEventParameters {
+      interface GeoMap$KeyUpEventParameters {
         /**
          * Key value of the key
          */
@@ -2149,9 +2055,9 @@ declare namespace sap {
         meta?: boolean;
       }
 
-      interface $GeoMapSelectEventParameters {}
+      interface GeoMap$SelectEventParameters {}
 
-      interface $GeoMapZoomChangedEventParameters {
+      interface GeoMap$ZoomChangedEventParameters {
         /**
          * Center point of the map. Format : Lon;Lat;0.0.
          */
@@ -2168,7 +2074,7 @@ declare namespace sap {
         zoomLevel?: int;
       }
 
-      interface $LegendClickEventParameters {
+      interface Legend$ClickEventParameters {
         /**
          * Event data object
          */
@@ -2200,7 +2106,7 @@ declare namespace sap {
         altKey?: boolean;
       }
 
-      interface $LegendItemClickEventParameters {
+      interface LegendItem$ClickEventParameters {
         /**
          * Event data object
          */
@@ -2227,32 +2133,32 @@ declare namespace sap {
         altKey?: boolean;
       }
 
-      interface $PieItemClickEventParameters {}
+      interface PieItem$ClickEventParameters {}
 
-      interface $RegionClickEventParameters {
+      interface Region$ClickEventParameters {
         /**
          * The region code.
          */
         code?: string;
       }
 
-      interface $RegionContextMenuEventParameters {
+      interface Region$ContextMenuEventParameters {
         /**
          * The region code.
          */
         code?: string;
       }
 
-      interface $RoutesClickEventParameters
-        extends sap.ui.vbm.$VoAggregationClickEventParameters {}
+      interface Routes$ClickEventParameters
+        extends sap.ui.vbm.VoAggregation$ClickEventParameters {}
 
-      interface $RoutesContextMenuEventParameters
-        extends sap.ui.vbm.$VoAggregationContextMenuEventParameters {}
+      interface Routes$ContextMenuEventParameters
+        extends sap.ui.vbm.VoAggregation$ContextMenuEventParameters {}
 
-      interface $RoutesDropEventParameters
-        extends sap.ui.vbm.$VoAggregationDropEventParameters {}
+      interface Routes$DropEventParameters
+        extends sap.ui.vbm.VoAggregation$DropEventParameters {}
 
-      interface $VBIChangeTrackingModeEventParameters {
+      interface VBI$ChangeTrackingModeEventParameters {
         /**
          * tracking mode to set or reset
          */
@@ -2264,7 +2170,7 @@ declare namespace sap {
         bSet?: boolean;
       }
 
-      interface $VBICloseWindowEventParameters {
+      interface VBI$CloseWindowEventParameters {
         /**
          * DomRef of placeholder Div for content.
          */
@@ -2276,7 +2182,7 @@ declare namespace sap {
         id?: string;
       }
 
-      interface $VBIContainerCreatedEventParameters {
+      interface VBI$ContainerCreatedEventParameters {
         /**
          * DomRef of placeholder Div to render into.
          */
@@ -2288,7 +2194,7 @@ declare namespace sap {
         id?: string;
       }
 
-      interface $VBIContainerDestroyedEventParameters {
+      interface VBI$ContainerDestroyedEventParameters {
         /**
          * DomRef of placeholder Div of content.
          */
@@ -2300,14 +2206,14 @@ declare namespace sap {
         id?: string;
       }
 
-      interface $VBIMoveEventParameters {
+      interface VBI$MoveEventParameters {
         /**
          * Canvas object to render into.
          */
         canvas?: object;
       }
 
-      interface $VBIOpenWindowEventParameters {
+      interface VBI$OpenWindowEventParameters {
         /**
          * DomRef of placeholder Div to render into.
          */
@@ -2319,14 +2225,14 @@ declare namespace sap {
         id?: string;
       }
 
-      interface $VBIRenderEventParameters {
+      interface VBI$RenderEventParameters {
         /**
          * Canvas object to render into.
          */
         canvas?: object;
       }
 
-      interface $VBISubmitEventParameters {
+      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.
@@ -2334,7 +2240,7 @@ declare namespace sap {
         data?: string;
       }
 
-      interface $VBIThumbnailClickEventParameters {
+      interface VBI$ThumbnailClickEventParameters {
         /**
          * Geo coordinates in format "lon;lat;0"
          */
@@ -2346,14 +2252,14 @@ declare namespace sap {
         zoomLevel?: int;
       }
 
-      interface $VBIZoomEventParameters {
+      interface VBI$ZoomEventParameters {
         /**
          * Canvas object to render into
          */
         canvas?: object;
       }
 
-      interface $ViewportCameraChangeEventParameters {
+      interface Viewport$CameraChangeEventParameters {
         /**
          * Current position in camera history
          */
@@ -2365,14 +2271,14 @@ declare namespace sap {
         historyLength?: int;
       }
 
-      interface $VoAggregationClickEventParameters {
+      interface VoAggregation$ClickEventParameters {
         /**
          * Clicked instance
          */
         instance?: sap.ui.vbm.VoBase;
       }
 
-      interface $VoAggregationContextMenuEventParameters {
+      interface VoAggregation$ContextMenuEventParameters {
         /**
          * Clicked instance
          */
@@ -2384,14 +2290,14 @@ declare namespace sap {
         menu?: sap.ui.unified.Menu;
       }
 
-      interface $VoAggregationDeselectEventParameters {
+      interface VoAggregation$DeselectEventParameters {
         /**
          * Array of deselected VOs
          */
         deselected?: any[];
       }
 
-      interface $VoAggregationDropEventParameters {
+      interface VoAggregation$DropEventParameters {
         /**
          * Drop target instance
          */
@@ -2403,7 +2309,7 @@ declare namespace sap {
         dragSource?: sap.ui.vbm.VoBase;
       }
 
-      interface $VoAggregationHandleClickEventParameters {
+      interface VoAggregation$HandleClickEventParameters {
         /**
          * Clicked instance
          */
@@ -2415,7 +2321,7 @@ declare namespace sap {
         handle?: int;
       }
 
-      interface $VoAggregationHandleContextMenuEventParameters {
+      interface VoAggregation$HandleContextMenuEventParameters {
         /**
          * Clicked instance
          */
@@ -2432,7 +2338,7 @@ declare namespace sap {
         handle?: int;
       }
 
-      interface $VoAggregationHandleMovedEventParameters {
+      interface VoAggregation$HandleMovedEventParameters {
         /**
          * Clicked instance
          */
@@ -2444,37 +2350,37 @@ declare namespace sap {
         handle?: int;
       }
 
-      interface $VoAggregationSelectEventParameters {
+      interface VoAggregation$SelectEventParameters {
         /**
          * Array of selected VOs
          */
         selected?: any[];
       }
 
-      interface $VoBaseClickEventParameters {}
+      interface VoBase$ClickEventParameters {}
 
-      interface $VoBaseContextMenuEventParameters {
+      interface VoBase$ContextMenuEventParameters {
         /**
          * Menu to open
          */
         menu?: sap.ui.unified.Menu;
       }
 
-      interface $VoBaseDropEventParameters {
+      interface VoBase$DropEventParameters {
         /**
          * Dragged instance
          */
         dragSource?: sap.ui.vbm.VoBase;
       }
 
-      interface $VoBaseHandleClickEventParameters {
+      interface VoBase$HandleClickEventParameters {
         /**
          * The number of the handle where the click occured. Handles are numbered zero based.
          */
         handle?: int;
       }
 
-      interface $VoBaseHandleContextMenuEventParameters {
+      interface VoBase$HandleContextMenuEventParameters {
         /**
          * The number of the handle where the click occured. Handles are numbered zero based.
          */
@@ -2486,7 +2392,7 @@ declare namespace sap {
         menu?: sap.ui.unified.Menu;
       }
 
-      interface $VoBaseHandleMovedEventParameters {
+      interface VoBase$HandleMovedEventParameters {
         /**
          * The number of the handle where the click occured. Handles are numbered zero based.
          */
@@ -2577,9 +2483,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AdapterSubmitEventParameters>
-          ) => void,
+          fnFunction: (p1: Adapter$SubmitEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter` itself
            */
@@ -2600,9 +2504,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AdapterSubmitEventParameters>
-          ) => void,
+          fnFunction: (p1: Adapter$SubmitEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter` itself
            */
@@ -2619,16 +2521,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -2638,7 +2538,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$AdapterSubmitEventParameters
+          mParameters?: sap.ui.vbm.Adapter$SubmitEventParameters
         ): this;
         /**
          * ID of the element which is the current target of the association {@link #getMap map}, or `null`.
@@ -2751,9 +2651,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$Adapter3DSubmitEventParameters>
-          ) => void,
+          fnFunction: (p1: Adapter3D$SubmitEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter3D` itself
            */
@@ -2773,9 +2671,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$Adapter3DSubmitEventParameters>
-          ) => void,
+          fnFunction: (p1: Adapter3D$SubmitEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter3D` itself
            */
@@ -2792,16 +2688,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -2811,7 +2705,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$Adapter3DSubmitEventParameters
+          mParameters?: sap.ui.vbm.Adapter3D$SubmitEventParameters
         ): this;
         /**
          * ID of the element which is the current target of the association {@link #getViewport viewport}, or `null`.
@@ -2945,9 +2839,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AnalyticMapRegionClickEventParameters>
-          ) => void,
+          fnFunction: (p1: AnalyticMap$RegionClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
            */
@@ -2967,9 +2859,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AnalyticMapRegionClickEventParameters>
-          ) => void,
+          fnFunction: (p1: AnalyticMap$RegionClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
            */
@@ -2995,9 +2885,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AnalyticMapRegionContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: AnalyticMap$RegionContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
            */
@@ -3018,9 +2906,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AnalyticMapRegionContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: AnalyticMap$RegionContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
            */
@@ -3135,9 +3021,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AnalyticMapRegionClickEventParameters>
-          ) => void,
+          fnFunction: (p1: AnalyticMap$RegionClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -3155,9 +3039,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AnalyticMapRegionContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: AnalyticMap$RegionContextMenuEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -3199,7 +3081,7 @@ declare namespace sap {
           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.
          *
@@ -3209,10 +3091,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$AnalyticMapRegionClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -3222,10 +3104,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$AnalyticMapRegionContextMenuEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -3238,7 +3120,7 @@ declare namespace sap {
           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.
          *
@@ -3530,7 +3412,7 @@ declare namespace sap {
           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.
          *
@@ -3543,7 +3425,7 @@ declare namespace sap {
           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.
          *
@@ -3752,9 +3634,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AreasEdgeClickEventParameters>
-          ) => void,
+          fnFunction: (p1: Areas$EdgeClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
            */
@@ -3774,9 +3654,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AreasEdgeClickEventParameters>
-          ) => void,
+          fnFunction: (p1: Areas$EdgeClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
            */
@@ -3802,9 +3680,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AreasEdgeContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: Areas$EdgeContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
            */
@@ -3825,9 +3701,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AreasEdgeContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: Areas$EdgeContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
            */
@@ -3850,9 +3724,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$AreasEdgeClickEventParameters>
-          ) => void,
+          fnFunction: (p1: Areas$EdgeClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -3870,16 +3742,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -3889,10 +3759,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$AreasEdgeClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -3902,7 +3772,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$AreasEdgeContextMenuEventParameters
+          mParameters?: sap.ui.vbm.Areas$EdgeContextMenuEventParameters
         ): this;
         /**
          * Gets content of aggregation {@link #getItems items}.
@@ -5016,9 +4886,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$ClusterBaseClickEventParameters>
-          ) => void,
+          fnFunction: (p1: ClusterBase$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
            */
@@ -5038,9 +4906,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$ClusterBaseClickEventParameters>
-          ) => void,
+          fnFunction: (p1: ClusterBase$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
            */
@@ -5065,9 +4931,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$ClusterBaseContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: ClusterBase$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
            */
@@ -5087,9 +4951,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$ClusterBaseContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: ClusterBase$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
            */
@@ -5118,9 +4980,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$ClusterBaseClickEventParameters>
-          ) => void,
+          fnFunction: (p1: ClusterBase$ClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -5137,16 +4997,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -5156,10 +5014,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$ClusterBaseClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -5169,7 +5027,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$ClusterBaseContextMenuEventParameters
+          mParameters?: sap.ui.vbm.ClusterBase$ContextMenuEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getAreaAlwaysVisible areaAlwaysVisible}.
@@ -6489,9 +6347,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$FeatureContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: Feature$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Feature` itself
            */
@@ -6511,9 +6367,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$FeatureContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: Feature$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Feature` itself
            */
@@ -6547,16 +6401,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -6569,7 +6421,7 @@ declare namespace sap {
           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.
          *
@@ -6579,7 +6431,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$FeatureContextMenuEventParameters
+          mParameters?: sap.ui.vbm.Feature$ContextMenuEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getColor color}.
@@ -6757,9 +6609,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$FeatureCollectionClickEventParameters>
-          ) => void,
+          fnFunction: (p1: FeatureCollection$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
            */
@@ -6780,9 +6630,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$FeatureCollectionClickEventParameters>
-          ) => void,
+          fnFunction: (p1: FeatureCollection$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
            */
@@ -6808,9 +6656,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$FeatureCollectionContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: FeatureCollection$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
            */
@@ -6831,9 +6677,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$FeatureCollectionContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: FeatureCollection$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
            */
@@ -6856,9 +6700,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$FeatureCollectionClickEventParameters>
-          ) => void,
+          fnFunction: (p1: FeatureCollection$ClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -6875,16 +6717,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -6894,10 +6734,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$FeatureCollectionClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -6907,7 +6747,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$FeatureCollectionContextMenuEventParameters
+          mParameters?: sap.ui.vbm.FeatureCollection$ContextMenuEventParameters
         ): this;
         /**
          * Returns Properties for Features like name, bounding box, and midpoint
@@ -7487,9 +7327,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoJsonLayerClickEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoJsonLayer$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
            */
@@ -7510,9 +7348,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoJsonLayerClickEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoJsonLayer$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
            */
@@ -7538,9 +7374,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoJsonLayerContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoJsonLayer$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
            */
@@ -7561,9 +7395,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoJsonLayerContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoJsonLayer$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
            */
@@ -7586,9 +7418,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoJsonLayerClickEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoJsonLayer$ClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -7605,16 +7435,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -7624,10 +7452,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoJsonLayerClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -7637,7 +7465,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoJsonLayerContextMenuEventParameters
+          mParameters?: sap.ui.vbm.GeoJsonLayer$ContextMenuEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getData data}.
@@ -8027,9 +7855,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapCenterChangedEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$CenterChangedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8049,9 +7875,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapCenterChangedEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$CenterChangedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8076,9 +7900,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapClickEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8098,9 +7920,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapClickEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8125,9 +7945,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8147,9 +7965,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8174,9 +7990,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapDropEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$DropEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8196,9 +8010,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapDropEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$DropEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8223,9 +8035,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyDownEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$KeyDownEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8245,9 +8055,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyDownEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$KeyDownEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8272,9 +8080,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyPressEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$KeyPressEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8294,9 +8100,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyPressEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$KeyPressEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8321,9 +8125,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyUpEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$KeyUpEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8343,9 +8145,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyUpEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$KeyUpEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8415,9 +8215,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapZoomChangedEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$ZoomChangedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8437,9 +8235,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapZoomChangedEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$ZoomChangedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
            */
@@ -8500,9 +8296,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapCenterChangedEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$CenterChangedEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -8519,9 +8313,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapClickEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$ClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -8538,9 +8330,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$ContextMenuEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -8557,9 +8347,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapDropEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$DropEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -8576,9 +8364,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyDownEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$KeyDownEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -8595,9 +8381,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyPressEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$KeyPressEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -8614,9 +8398,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$GeoMapKeyUpEventParameters>
-          ) => void,
+          fnFunction: (p1: GeoMap$KeyUpEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -8650,16 +8432,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -8669,10 +8449,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoMapCenterChangedEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -8682,10 +8462,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoMapClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -8695,10 +8475,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoMapContextMenuEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -8708,10 +8488,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoMapDropEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -8721,10 +8501,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoMapKeyDownEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -8734,10 +8514,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoMapKeyPressEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -8747,10 +8527,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoMapKeyUpEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -8763,7 +8543,7 @@ declare namespace sap {
           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.
          *
@@ -8773,7 +8553,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$GeoMapZoomChangedEventParameters
+          mParameters?: sap.ui.vbm.GeoMap$ZoomChangedEventParameters
         ): this;
         /**
          * Retrieves the center position of the current map.
@@ -8908,7 +8688,7 @@ declare namespace sap {
          */
         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.
@@ -10172,9 +9952,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$LegendClickEventParameters>
-          ) => void,
+          fnFunction: (p1: Legend$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Legend` itself
            */
@@ -10194,9 +9972,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$LegendClickEventParameters>
-          ) => void,
+          fnFunction: (p1: Legend$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Legend` itself
            */
@@ -10219,16 +9995,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -10238,7 +10012,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$LegendClickEventParameters
+          mParameters?: sap.ui.vbm.Legend$ClickEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getCaption caption}.
@@ -10407,9 +10181,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$LegendItemClickEventParameters>
-          ) => void,
+          fnFunction: (p1: LegendItem$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.LegendItem` itself
            */
@@ -10429,9 +10201,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$LegendItemClickEventParameters>
-          ) => void,
+          fnFunction: (p1: LegendItem$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.LegendItem` itself
            */
@@ -10448,16 +10218,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -10467,7 +10235,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$LegendItemClickEventParameters
+          mParameters?: sap.ui.vbm.LegendItem$ClickEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getColor color}.
@@ -10889,7 +10657,7 @@ declare namespace sap {
         /**
          * @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.
          *
@@ -11252,9 +11020,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$RegionClickEventParameters>
-          ) => void,
+          fnFunction: (p1: Region$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
            */
@@ -11274,9 +11040,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$RegionClickEventParameters>
-          ) => void,
+          fnFunction: (p1: Region$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
            */
@@ -11301,9 +11065,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$RegionContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: Region$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
            */
@@ -11323,9 +11085,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$RegionContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: Region$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
            */
@@ -11342,9 +11102,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$RegionClickEventParameters>
-          ) => void,
+          fnFunction: (p1: Region$ClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -11361,16 +11119,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -11380,10 +11136,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$RegionClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -11393,7 +11149,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$RegionContextMenuEventParameters
+          mParameters?: sap.ui.vbm.Region$ContextMenuEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getCode code}.
@@ -11962,7 +11718,7 @@ declare namespace sap {
          */
         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}.
@@ -12255,7 +12011,7 @@ declare namespace sap {
           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}.
@@ -12600,7 +12356,7 @@ declare namespace sap {
           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.
          *
@@ -12613,7 +12369,7 @@ declare namespace sap {
           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.
          *
@@ -12626,7 +12382,7 @@ declare namespace sap {
           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.
          *
@@ -13788,7 +13544,7 @@ declare namespace sap {
           vAriaLabelledBy: sap.ui.core.ID | sap.ui.core.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.
          */
@@ -13822,9 +13578,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIChangeTrackingModeEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ChangeTrackingModeEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -13845,9 +13599,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIChangeTrackingModeEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ChangeTrackingModeEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -13873,9 +13625,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBICloseWindowEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$CloseWindowEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -13896,9 +13646,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBICloseWindowEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$CloseWindowEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -13925,9 +13673,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIContainerCreatedEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ContainerCreatedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -13949,9 +13695,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIContainerCreatedEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ContainerCreatedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -13978,9 +13722,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIContainerDestroyedEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ContainerDestroyedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14002,9 +13744,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIContainerDestroyedEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ContainerDestroyedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14029,9 +13769,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIMoveEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$MoveEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14051,9 +13789,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIMoveEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$MoveEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14079,9 +13815,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIOpenWindowEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$OpenWindowEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14102,9 +13836,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIOpenWindowEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$OpenWindowEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14130,9 +13862,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIRenderEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$RenderEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14153,9 +13883,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIRenderEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$RenderEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14180,9 +13908,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBISubmitEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$SubmitEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14202,9 +13928,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBISubmitEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$SubmitEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14230,9 +13954,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIThumbnailClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ThumbnailClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14253,9 +13975,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIThumbnailClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ThumbnailClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14280,9 +14000,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIZoomEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ZoomEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14302,9 +14020,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIZoomEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ZoomEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
            */
@@ -14322,9 +14038,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIChangeTrackingModeEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ChangeTrackingModeEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -14341,9 +14055,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBICloseWindowEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$CloseWindowEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -14361,9 +14073,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIContainerCreatedEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ContainerCreatedEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -14381,9 +14091,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIContainerDestroyedEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ContainerDestroyedEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -14400,9 +14108,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIMoveEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$MoveEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -14419,9 +14125,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIOpenWindowEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$OpenWindowEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -14438,9 +14142,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIRenderEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$RenderEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -14457,9 +14159,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBISubmitEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$SubmitEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -14477,9 +14177,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VBIThumbnailClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VBI$ThumbnailClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -14496,16 +14194,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -14515,10 +14211,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBIChangeTrackingModeEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -14528,10 +14224,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBICloseWindowEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -14541,10 +14237,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBIContainerCreatedEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -14554,10 +14250,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBIContainerDestroyedEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -14567,10 +14263,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBIMoveEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -14580,10 +14276,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBIOpenWindowEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -14593,10 +14289,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBIRenderEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -14606,10 +14302,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBISubmitEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -14619,10 +14315,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBIThumbnailClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -14632,7 +14328,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VBIZoomEventParameters
+          mParameters?: sap.ui.vbm.VBI$ZoomEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getAllowKeyEventRepeat allowKeyEventRepeat}.
@@ -15147,9 +14843,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$ViewportCameraChangeEventParameters>
-          ) => void,
+          fnFunction: (p1: Viewport$CameraChangeEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Viewport` itself
            */
@@ -15169,9 +14863,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$ViewportCameraChangeEventParameters>
-          ) => void,
+          fnFunction: (p1: Viewport$CameraChangeEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Viewport` itself
            */
@@ -15188,16 +14880,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -15207,7 +14897,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$ViewportCameraChangeEventParameters
+          mParameters?: sap.ui.vbm.Viewport$CameraChangeEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getCameraHistoryLength cameraHistoryLength}.
@@ -15487,9 +15177,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15509,9 +15197,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$ClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15536,9 +15222,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15558,9 +15242,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15585,9 +15267,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationDeselectEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$DeselectEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15607,9 +15287,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationDeselectEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$DeselectEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15634,9 +15312,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationDropEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$DropEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15656,9 +15332,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationDropEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$DropEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15683,9 +15357,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$HandleClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15705,9 +15377,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$HandleClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15733,9 +15403,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$HandleContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15756,9 +15424,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$HandleContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15783,9 +15449,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleMovedEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$HandleMovedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15805,9 +15469,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleMovedEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$HandleMovedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15832,9 +15494,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationSelectEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$SelectEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15854,9 +15514,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationSelectEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$SelectEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
            */
@@ -15873,9 +15531,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$ClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -15892,9 +15548,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$ContextMenuEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -15911,9 +15565,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationDeselectEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$DeselectEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -15930,9 +15582,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationDropEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$DropEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -15949,9 +15599,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$HandleClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -15969,9 +15617,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$HandleContextMenuEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -15988,9 +15634,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoAggregationHandleMovedEventParameters>
-          ) => void,
+          fnFunction: (p1: VoAggregation$HandleMovedEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -16007,16 +15651,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -16026,10 +15668,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoAggregationClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16039,10 +15681,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoAggregationContextMenuEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16052,10 +15694,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoAggregationDeselectEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16065,10 +15707,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoAggregationDropEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16078,10 +15720,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoAggregationHandleClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16091,10 +15733,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoAggregationHandleContextMenuEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16104,10 +15746,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoAggregationHandleMovedEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16117,7 +15759,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoAggregationSelectEventParameters
+          mParameters?: sap.ui.vbm.VoAggregation$SelectEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getCustomProperties customProperties}.
@@ -16364,9 +16006,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16386,9 +16026,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$ContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16413,9 +16051,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseDropEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$DropEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16435,9 +16071,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseDropEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$DropEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16462,9 +16096,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$HandleClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16484,9 +16116,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$HandleClickEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16512,9 +16142,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$HandleContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16535,9 +16163,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$HandleContextMenuEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16562,9 +16188,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleMovedEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$HandleMovedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16584,9 +16208,7 @@ declare namespace sap {
           /**
            * The function to be called when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleMovedEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$HandleMovedEvent) => void,
           /**
            * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
            */
@@ -16620,9 +16242,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$ContextMenuEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -16639,9 +16259,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseDropEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$DropEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -16658,9 +16276,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleClickEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$HandleClickEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -16678,9 +16294,7 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$VoBaseHandleContextMenuEventParameters>
-          ) => void,
+          fnFunction: (p1: VoBase$HandleContextMenuEvent) => void,
           /**
            * Context object on which the given function had to be called
            */
@@ -16697,16 +16311,14 @@ declare namespace sap {
           /**
            * The function to be called, when the event occurs
            */
-          fnFunction: (
-            p1: sap.ui.base.Event<sap.ui.vbm.$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.
          *
@@ -16719,7 +16331,7 @@ declare namespace sap {
           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.
          *
@@ -16729,10 +16341,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoBaseContextMenuEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16742,10 +16354,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoBaseDropEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16755,10 +16367,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoBaseHandleClickEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16768,10 +16380,10 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoBaseHandleContextMenuEventParameters
+          mParameters?: sap.ui.vbm.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.
          *
@@ -16781,7 +16393,7 @@ declare namespace sap {
           /**
            * Parameters to pass along with the event
            */
-          mParameters?: sap.ui.vbm.$VoBaseHandleMovedEventParameters
+          mParameters?: sap.ui.vbm.VoBase$HandleMovedEventParameters
         ): this;
         /**
          * Gets current value of property {@link #getChangeable changeable}.
@@ -17345,6 +16957,126 @@ declare namespace sap {
          */
         Warning = "Warning",
       }
+
+      type Adapter$SubmitEvent = sap.ui.base.Event<Adapter$SubmitEventParameters>;
+
+      type Adapter3D$SubmitEvent = sap.ui.base.Event<Adapter3D$SubmitEventParameters>;
+
+      type AnalyticMap$RegionClickEvent = sap.ui.base.Event<AnalyticMap$RegionClickEventParameters>;
+
+      type AnalyticMap$RegionContextMenuEvent = sap.ui.base.Event<AnalyticMap$RegionContextMenuEventParameters>;
+
+      type AnalyticMap$RegionDeselectEvent = sap.ui.base.Event<AnalyticMap$RegionDeselectEventParameters>;
+
+      type AnalyticMap$RegionSelectEvent = sap.ui.base.Event<AnalyticMap$RegionSelectEventParameters>;
+
+      type Area$EdgeClickEvent = sap.ui.base.Event<Area$EdgeClickEventParameters>;
+
+      type Area$EdgeContextMenuEvent = sap.ui.base.Event<Area$EdgeContextMenuEventParameters>;
+
+      type Areas$EdgeClickEvent = sap.ui.base.Event<Areas$EdgeClickEventParameters>;
+
+      type Areas$EdgeContextMenuEvent = sap.ui.base.Event<Areas$EdgeContextMenuEventParameters>;
+
+      type ClusterBase$ClickEvent = sap.ui.base.Event<ClusterBase$ClickEventParameters>;
+
+      type ClusterBase$ContextMenuEvent = sap.ui.base.Event<ClusterBase$ContextMenuEventParameters>;
+
+      type Feature$ClickEvent = sap.ui.base.Event<Feature$ClickEventParameters>;
+
+      type Feature$ContextMenuEvent = sap.ui.base.Event<Feature$ContextMenuEventParameters>;
+
+      type FeatureCollection$ClickEvent = sap.ui.base.Event<FeatureCollection$ClickEventParameters>;
+
+      type FeatureCollection$ContextMenuEvent = sap.ui.base.Event<FeatureCollection$ContextMenuEventParameters>;
+
+      type GeoJsonLayer$ClickEvent = sap.ui.base.Event<GeoJsonLayer$ClickEventParameters>;
+
+      type GeoJsonLayer$ContextMenuEvent = sap.ui.base.Event<GeoJsonLayer$ContextMenuEventParameters>;
+
+      type GeoMap$CenterChangedEvent = sap.ui.base.Event<GeoMap$CenterChangedEventParameters>;
+
+      type GeoMap$ClickEvent = sap.ui.base.Event<GeoMap$ClickEventParameters>;
+
+      type GeoMap$ContextMenuEvent = sap.ui.base.Event<GeoMap$ContextMenuEventParameters>;
+
+      type GeoMap$DropEvent = sap.ui.base.Event<GeoMap$DropEventParameters>;
+
+      type GeoMap$KeyDownEvent = sap.ui.base.Event<GeoMap$KeyDownEventParameters>;
+
+      type GeoMap$KeyPressEvent = sap.ui.base.Event<GeoMap$KeyPressEventParameters>;
+
+      type GeoMap$KeyUpEvent = sap.ui.base.Event<GeoMap$KeyUpEventParameters>;
+
+      type GeoMap$SelectEvent = sap.ui.base.Event<GeoMap$SelectEventParameters>;
+
+      type GeoMap$ZoomChangedEvent = sap.ui.base.Event<GeoMap$ZoomChangedEventParameters>;
+
+      type Legend$ClickEvent = sap.ui.base.Event<Legend$ClickEventParameters>;
+
+      type LegendItem$ClickEvent = sap.ui.base.Event<LegendItem$ClickEventParameters>;
+
+      type PieItem$ClickEvent = sap.ui.base.Event<PieItem$ClickEventParameters>;
+
+      type Region$ClickEvent = sap.ui.base.Event<Region$ClickEventParameters>;
+
+      type Region$ContextMenuEvent = sap.ui.base.Event<Region$ContextMenuEventParameters>;
+
+      type Routes$ClickEvent = sap.ui.base.Event<Routes$ClickEventParameters>;
+
+      type Routes$ContextMenuEvent = sap.ui.base.Event<Routes$ContextMenuEventParameters>;
+
+      type Routes$DropEvent = sap.ui.base.Event<Routes$DropEventParameters>;
+
+      type VBI$ChangeTrackingModeEvent = sap.ui.base.Event<VBI$ChangeTrackingModeEventParameters>;
+
+      type VBI$CloseWindowEvent = sap.ui.base.Event<VBI$CloseWindowEventParameters>;
+
+      type VBI$ContainerCreatedEvent = sap.ui.base.Event<VBI$ContainerCreatedEventParameters>;
+
+      type VBI$ContainerDestroyedEvent = sap.ui.base.Event<VBI$ContainerDestroyedEventParameters>;
+
+      type VBI$MoveEvent = sap.ui.base.Event<VBI$MoveEventParameters>;
+
+      type VBI$OpenWindowEvent = sap.ui.base.Event<VBI$OpenWindowEventParameters>;
+
+      type VBI$RenderEvent = sap.ui.base.Event<VBI$RenderEventParameters>;
+
+      type VBI$SubmitEvent = sap.ui.base.Event<VBI$SubmitEventParameters>;
+
+      type VBI$ThumbnailClickEvent = sap.ui.base.Event<VBI$ThumbnailClickEventParameters>;
+
+      type VBI$ZoomEvent = sap.ui.base.Event<VBI$ZoomEventParameters>;
+
+      type Viewport$CameraChangeEvent = sap.ui.base.Event<Viewport$CameraChangeEventParameters>;
+
+      type VoAggregation$ClickEvent = sap.ui.base.Event<VoAggregation$ClickEventParameters>;
+
+      type VoAggregation$ContextMenuEvent = sap.ui.base.Event<VoAggregation$ContextMenuEventParameters>;
+
+      type VoAggregation$DeselectEvent = sap.ui.base.Event<VoAggregation$DeselectEventParameters>;
+
+      type VoAggregation$DropEvent = sap.ui.base.Event<VoAggregation$DropEventParameters>;
+
+      type VoAggregation$HandleClickEvent = sap.ui.base.Event<VoAggregation$HandleClickEventParameters>;
+
+      type VoAggregation$HandleContextMenuEvent = sap.ui.base.Event<VoAggregation$HandleContextMenuEventParameters>;
+
+      type VoAggregation$HandleMovedEvent = sap.ui.base.Event<VoAggregation$HandleMovedEventParameters>;
+
+      type VoAggregation$SelectEvent = sap.ui.base.Event<VoAggregation$SelectEventParameters>;
+
+      type VoBase$ClickEvent = sap.ui.base.Event<VoBase$ClickEventParameters>;
+
+      type VoBase$ContextMenuEvent = sap.ui.base.Event<VoBase$ContextMenuEventParameters>;
+
+      type VoBase$DropEvent = sap.ui.base.Event<VoBase$DropEventParameters>;
+
+      type VoBase$HandleClickEvent = sap.ui.base.Event<VoBase$HandleClickEventParameters>;
+
+      type VoBase$HandleContextMenuEvent = sap.ui.base.Event<VoBase$HandleContextMenuEventParameters>;
+
+      type VoBase$HandleMovedEvent = sap.ui.base.Event<VoBase$HandleMovedEventParameters>;
     }
   }