@openui5/types 1.115.0 → 1.116.0

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

@@ -1,9 +1,9 @@
-// For Library Version: 1.115.0
+// For Library Version: 1.116.0
 
 declare module "sap/ui/ux3/library" {
   /**
    * @deprecated (since 1.38)
-   * @EXPERIMENTAL (since 1.2) - API is not yet finished and might change completely
+   * @experimental (since 1.2) - API is not yet finished and might change completely
    *
    * Enumeration of available standard actions for 'sap.ui.ux3.ActionBar'. To be used as parameters for function
    * 'sap.ui.ux3.ActionBar.getSocialAction'.
@@ -40,7 +40,7 @@ declare module "sap/ui/ux3/library" {
   }
 
   /**
-   * @SINCE 1.7.1
+   * @since 1.7.1
    * @deprecated (since 1.38)
    *
    * Defines the order of the sub lists of a list in the ExactBrowser.
@@ -57,7 +57,7 @@ declare module "sap/ui/ux3/library" {
   }
   /**
    * @deprecated (since 1.38)
-   * @EXPERIMENTAL (since 1.2) - The whole Feed/Feeder API is still under discussion, significant changes
+   * @experimental (since 1.2) - The whole Feed/Feeder API is still under discussion, significant changes
    * are likely. Especially text presentation (e.g. @-references and formatted text) is not final. Also the
    * Feed model topic is still open.
    *
@@ -120,7 +120,7 @@ declare module "sap/ui/ux3/library" {
     None = "None",
   }
   /**
-   * @SINCE 1.12.0
+   * @since 1.12.0
    * @deprecated (since 1.38)
    *
    * Available shell design types.
@@ -164,7 +164,7 @@ declare module "sap/ui/ux3/library" {
     Standard = "Standard",
   }
   /**
-   * @SINCE 1.16.3
+   * @since 1.16.3
    * @deprecated (since 1.38)
    *
    * Available ThingViewer header display types.
@@ -201,7 +201,7 @@ declare module "sap/ui/ux3/library" {
 declare module "sap/ui/ux3/ShellPersonalization" {
   /**
    * @deprecated (since 1.36) - This class was never released for productive use and will never be.
-   * @EXPERIMENTAL (since 1.0) - The Shell-features Personalization, Color Picker and “Inspect”-Tool are only
+   * @experimental (since 1.0) - The Shell-features Personalization, Color Picker and “Inspect”-Tool are only
    * experimental work and might change or disappear in future versions.
    *
    * Experimental implementation of visual Ux3 Shell personalization / branding.
@@ -220,8 +220,6 @@ declare module "sap/ui/ux3/ShellPersonalization" {
 declare module "sap/ui/ux3/ActionBar" {
   import { default as Control, $ControlSettings } from "sap/ui/core/Control";
 
-  import Event from "sap/ui/base/Event";
-
   import ThingAction from "sap/ui/ux3/ThingAction";
 
   import { CSSSize, URI } from "sap/ui/core/library";
@@ -235,6 +233,8 @@ declare module "sap/ui/ux3/ActionBar" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38) - Instead, use the `sap.m.Toolbar` or `sap.m.OverflowToolbar` control.
    *
@@ -247,7 +247,7 @@ declare module "sap/ui/ux3/ActionBar" {
    * When using this control, please be aware that it fulfills rather specific requirements: it has been designed
    * for and is used within composite controls QuickView and ThingInspector.
    */
-  class ActionBar extends Control {
+  export default class ActionBar extends Control {
     /**
      * Constructor for a new ActionBar.
      *
@@ -334,7 +334,7 @@ declare module "sap/ui/ux3/ActionBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ActionBarActionSelectedEventParameters>) => void,
+      fnFunction: (p1: ActionBar$ActionSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ActionBar` itself
        */
@@ -361,7 +361,7 @@ declare module "sap/ui/ux3/ActionBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ActionBarActionSelectedEventParameters>) => void,
+      fnFunction: (p1: ActionBar$ActionSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ActionBar` itself
        */
@@ -386,7 +386,7 @@ declare module "sap/ui/ux3/ActionBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ActionBarFeedSubmitEventParameters>) => void,
+      fnFunction: (p1: ActionBar$FeedSubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ActionBar` itself
        */
@@ -406,7 +406,7 @@ declare module "sap/ui/ux3/ActionBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ActionBarFeedSubmitEventParameters>) => void,
+      fnFunction: (p1: ActionBar$FeedSubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ActionBar` itself
        */
@@ -429,7 +429,7 @@ declare module "sap/ui/ux3/ActionBar" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ActionBarActionSelectedEventParameters>) => void,
+      fnFunction: (p1: ActionBar$ActionSelectedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -446,14 +446,14 @@ declare module "sap/ui/ux3/ActionBar" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ActionBarFeedSubmitEventParameters>) => void,
+      fnFunction: (p1: ActionBar$FeedSubmitEvent) => 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:actionSelected actionSelected} to attached listeners.
      *
@@ -463,10 +463,10 @@ declare module "sap/ui/ux3/ActionBar" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ActionBarActionSelectedEventParameters
+      mParameters?: ActionBar$ActionSelectedEventParameters
     ): 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:feedSubmit feedSubmit} to attached listeners.
      *
@@ -476,7 +476,7 @@ declare module "sap/ui/ux3/ActionBar" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ActionBarFeedSubmitEventParameters
+      mParameters?: ActionBar$FeedSubmitEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getAlwaysShowMoreMenu alwaysShowMoreMenu}.
@@ -610,7 +610,7 @@ declare module "sap/ui/ux3/ActionBar" {
       oBusinessAction: ThingAction
     ): int;
     /**
-     * @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)
      *
      * Checks whether the control is still valid (is in the DOM). ActionBar instance is rendered if and only
      * if 'isActive' returns 'true'. This check is called implicitely by the rendere, MUST not be removed.
@@ -816,7 +816,6 @@ declare module "sap/ui/ux3/ActionBar" {
       bUpdateState?: boolean
     ): this;
   }
-  export default ActionBar;
 
   export interface $ActionBarSettings extends $ControlSettings {
     /**
@@ -903,17 +902,15 @@ declare module "sap/ui/ux3/ActionBar" {
      *
      * For ‘Update’, please refer to event ‘feedSubmit’
      */
-    actionSelected?: (
-      oEvent: Event<$ActionBarActionSelectedEventParameters>
-    ) => void;
+    actionSelected?: (oEvent: ActionBar$ActionSelectedEvent) => void;
 
     /**
      * Fired when a new feed entry is submitted.
      */
-    feedSubmit?: (oEvent: Event<$ActionBarFeedSubmitEventParameters>) => void;
+    feedSubmit?: (oEvent: ActionBar$FeedSubmitEvent) => void;
   }
 
-  export interface $ActionBarActionSelectedEventParameters {
+  export interface ActionBar$ActionSelectedEventParameters {
     /**
      * Id of selected ThingAction
      */
@@ -931,12 +928,16 @@ declare module "sap/ui/ux3/ActionBar" {
     newState?: string;
   }
 
-  export interface $ActionBarFeedSubmitEventParameters {
+  export type ActionBar$ActionSelectedEvent = Event<ActionBar$ActionSelectedEventParameters>;
+
+  export interface ActionBar$FeedSubmitEventParameters {
     /**
      * Feed text
      */
     text?: string;
   }
+
+  export type ActionBar$FeedSubmitEvent = Event<ActionBar$FeedSubmitEventParameters>;
 }
 
 declare module "sap/ui/ux3/Collection" {
@@ -956,12 +957,12 @@ declare module "sap/ui/ux3/Collection" {
   } from "sap/ui/base/ManagedObject";
 
   /**
-   * @SINCE 1.9.0
+   * @since 1.9.0
    * @deprecated (since 1.38)
    *
    * Collection
    */
-  class Collection extends UI5Element {
+  export default class Collection extends UI5Element {
     /**
      * Constructor for a new Collection.
      *
@@ -1181,7 +1182,7 @@ declare module "sap/ui/ux3/Collection" {
       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:propertyChanged propertyChanged} to attached listeners.
      *
@@ -1194,7 +1195,7 @@ declare module "sap/ui/ux3/Collection" {
       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:selectionChanged selectionChanged} to attached listeners.
      *
@@ -1357,7 +1358,6 @@ declare module "sap/ui/ux3/Collection" {
       sTitle?: string
     ): this;
   }
-  export default Collection;
 
   export interface $CollectionSettings extends $ElementSettings {
     /**
@@ -1396,9 +1396,13 @@ declare module "sap/ui/ux3/Collection" {
     propertyChanged?: (oEvent: Event) => void;
   }
 
-  export interface $CollectionPropertyChangedEventParameters {}
+  export interface Collection$PropertyChangedEventParameters {}
+
+  export type Collection$PropertyChangedEvent = Event<Collection$PropertyChangedEventParameters>;
+
+  export interface Collection$SelectionChangedEventParameters {}
 
-  export interface $CollectionSelectionChangedEventParameters {}
+  export type Collection$SelectionChangedEvent = Event<Collection$SelectionChangedEventParameters>;
 }
 
 declare module "sap/ui/ux3/CollectionInspector" {
@@ -1418,12 +1422,12 @@ declare module "sap/ui/ux3/CollectionInspector" {
   } from "sap/ui/base/ManagedObject";
 
   /**
-   * @SINCE 1.9.0
+   * @since 1.9.0
    * @deprecated (since 1.38)
    *
    * CollectionInspector
    */
-  class CollectionInspector extends Control {
+  export default class CollectionInspector extends Control {
     /**
      * Constructor for a new CollectionInspector.
      *
@@ -1718,7 +1722,7 @@ declare module "sap/ui/ux3/CollectionInspector" {
       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:collectionSelected collectionSelected} to attached listeners.
      *
@@ -1731,7 +1735,7 @@ declare module "sap/ui/ux3/CollectionInspector" {
       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:editCollection editCollection} to attached listeners.
      *
@@ -1744,7 +1748,7 @@ declare module "sap/ui/ux3/CollectionInspector" {
       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:itemSelectionChanged itemSelectionChanged} to attached listeners.
      *
@@ -1942,7 +1946,6 @@ declare module "sap/ui/ux3/CollectionInspector" {
       bSidebarVisible?: boolean
     ): this;
   }
-  export default CollectionInspector;
 
   export interface $CollectionInspectorSettings extends $ControlSettings {
     /**
@@ -1990,11 +1993,17 @@ declare module "sap/ui/ux3/CollectionInspector" {
     editCollection?: (oEvent: Event) => void;
   }
 
-  export interface $CollectionInspectorCollectionSelectedEventParameters {}
+  export interface CollectionInspector$CollectionSelectedEventParameters {}
 
-  export interface $CollectionInspectorEditCollectionEventParameters {}
+  export type CollectionInspector$CollectionSelectedEvent = Event<CollectionInspector$CollectionSelectedEventParameters>;
 
-  export interface $CollectionInspectorItemSelectionChangedEventParameters {}
+  export interface CollectionInspector$EditCollectionEventParameters {}
+
+  export type CollectionInspector$EditCollectionEvent = Event<CollectionInspector$EditCollectionEventParameters>;
+
+  export interface CollectionInspector$ItemSelectionChangedEventParameters {}
+
+  export type CollectionInspector$ItemSelectionChangedEvent = Event<CollectionInspector$ItemSelectionChangedEventParameters>;
 }
 
 declare module "sap/ui/ux3/DataSet" {
@@ -2006,8 +2015,6 @@ declare module "sap/ui/ux3/DataSet" {
 
   import { DataSetView } from "sap/ui/ux3/library";
 
-  import Event from "sap/ui/base/Event";
-
   import {
     AggregationBindingInfo,
     PropertyBindingInfo,
@@ -2017,12 +2024,14 @@ declare module "sap/ui/ux3/DataSet" {
 
   import { ID } from "sap/ui/core/library";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38) - Use a container by choice from the {@link sap.m} library, instead.
    *
    * DataSet
    */
-  class DataSet extends Control {
+  export default class DataSet extends Control {
     /**
      * Constructor for a new DataSet.
      *
@@ -2084,13 +2093,13 @@ declare module "sap/ui/ux3/DataSet" {
      */
     static getMetadata(): ElementMetadata;
     /**
-     * @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)
      *
      * Rerendering of the FilterArea
      */
     _rerenderFilter(): void;
     /**
-     * @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)
      *
      * Rerendering of the Toolbar
      */
@@ -2156,7 +2165,7 @@ declare module "sap/ui/ux3/DataSet" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$DataSetSearchEventParameters>) => void,
+      fnFunction: (p1: DataSet$SearchEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.DataSet` itself
        */
@@ -2176,7 +2185,7 @@ declare module "sap/ui/ux3/DataSet" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$DataSetSearchEventParameters>) => void,
+      fnFunction: (p1: DataSet$SearchEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.DataSet` itself
        */
@@ -2202,7 +2211,7 @@ declare module "sap/ui/ux3/DataSet" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$DataSetSelectionChangedEventParameters>) => void,
+      fnFunction: (p1: DataSet$SelectionChangedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.DataSet` itself
        */
@@ -2223,7 +2232,7 @@ declare module "sap/ui/ux3/DataSet" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$DataSetSelectionChangedEventParameters>) => void,
+      fnFunction: (p1: DataSet$SelectionChangedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.DataSet` itself
        */
@@ -2248,7 +2257,7 @@ declare module "sap/ui/ux3/DataSet" {
      */
     clearSelection(): void;
     /**
-     * @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)
      *
      * Creates a view switch button
      *
@@ -2293,7 +2302,7 @@ declare module "sap/ui/ux3/DataSet" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$DataSetSearchEventParameters>) => void,
+      fnFunction: (p1: DataSet$SearchEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -2311,14 +2320,14 @@ declare module "sap/ui/ux3/DataSet" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$DataSetSelectionChangedEventParameters>) => void,
+      fnFunction: (p1: DataSet$SelectionChangedEvent) => 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:search search} to attached listeners.
      *
@@ -2328,10 +2337,10 @@ declare module "sap/ui/ux3/DataSet" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $DataSetSearchEventParameters
+      mParameters?: DataSet$SearchEventParameters
     ): 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:selectionChanged selectionChanged} to attached listeners.
      *
@@ -2341,7 +2350,7 @@ declare module "sap/ui/ux3/DataSet" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $DataSetSelectionChangedEventParameters
+      mParameters?: DataSet$SelectionChangedEventParameters
     ): this;
     /**
      * Gets content of aggregation {@link #getFilter filter}.
@@ -2356,7 +2365,7 @@ declare module "sap/ui/ux3/DataSet" {
      */
     getItems(): DataSetItem[];
     /**
-     * @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)
      *
      * Returns the LeadSelection index
      *
@@ -2382,7 +2391,7 @@ declare module "sap/ui/ux3/DataSet" {
      */
     getSelectedIndices(): void;
     /**
-     * @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)
      *
      * Returns id of selected Item from given index
      *
@@ -2523,7 +2532,7 @@ declare module "sap/ui/ux3/DataSet" {
       iIndex: int
     ): 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)
      *
      * Returns true if iIndex is selected
      *
@@ -2597,7 +2606,7 @@ declare module "sap/ui/ux3/DataSet" {
       vView: int | string | DataSetView
     ): DataSetView | null;
     /**
-     * @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)
      *
      * Set the LeadSelection index
      */
@@ -2686,7 +2695,6 @@ declare module "sap/ui/ux3/DataSet" {
      */
     unbindItems(): this;
   }
-  export default DataSet;
 
   export interface $DataSetSettings extends $ControlSettings {
     /**
@@ -2740,24 +2748,24 @@ declare module "sap/ui/ux3/DataSet" {
     /**
      * selection Changed
      */
-    selectionChanged?: (
-      oEvent: Event<$DataSetSelectionChangedEventParameters>
-    ) => void;
+    selectionChanged?: (oEvent: DataSet$SelectionChangedEvent) => void;
 
     /**
      * Event which is fired when the user triggers a search
      */
-    search?: (oEvent: Event<$DataSetSearchEventParameters>) => void;
+    search?: (oEvent: DataSet$SearchEvent) => void;
   }
 
-  export interface $DataSetSearchEventParameters {
+  export interface DataSet$SearchEventParameters {
     /**
      * The search query
      */
     query?: string;
   }
 
-  export interface $DataSetSelectionChangedEventParameters {
+  export type DataSet$SearchEvent = Event<DataSet$SearchEventParameters>;
+
+  export interface DataSet$SelectionChangedEventParameters {
     /**
      * Old lead selected index
      */
@@ -2768,25 +2776,27 @@ declare module "sap/ui/ux3/DataSet" {
      */
     newLeadSelectedIndex?: int;
   }
+
+  export type DataSet$SelectionChangedEvent = Event<DataSet$SelectionChangedEventParameters>;
 }
 
 declare module "sap/ui/ux3/DataSetItem" {
   import { default as UI5Element, $ElementSettings } from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import { URI } from "sap/ui/core/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38)
    *
    * DataSet Item
    */
-  class DataSetItem extends UI5Element {
+  export default class DataSetItem extends UI5Element {
     /**
      * Constructor for a new DataSetItem.
      *
@@ -2866,7 +2876,7 @@ declare module "sap/ui/ux3/DataSetItem" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$DataSetItemSelectedEventParameters>) => void,
+      fnFunction: (p1: DataSetItem$SelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.DataSetItem` itself
        */
@@ -2886,7 +2896,7 @@ declare module "sap/ui/ux3/DataSetItem" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$DataSetItemSelectedEventParameters>) => void,
+      fnFunction: (p1: DataSetItem$SelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.DataSetItem` itself
        */
@@ -2903,14 +2913,14 @@ declare module "sap/ui/ux3/DataSetItem" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$DataSetItemSelectedEventParameters>) => void,
+      fnFunction: (p1: DataSetItem$SelectedEvent) => 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:selected selected} to attached listeners.
      *
@@ -2920,7 +2930,7 @@ declare module "sap/ui/ux3/DataSetItem" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $DataSetItemSelectedEventParameters
+      mParameters?: DataSetItem$SelectedEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCheckable checkable}.
@@ -3027,7 +3037,6 @@ declare module "sap/ui/ux3/DataSetItem" {
       sTitle?: string
     ): this;
   }
-  export default DataSetItem;
 
   export interface $DataSetItemSettings extends $ElementSettings {
     /**
@@ -3053,15 +3062,17 @@ declare module "sap/ui/ux3/DataSetItem" {
     /**
      * Event Fired when Datset item is selected.
      */
-    selected?: (oEvent: Event<$DataSetItemSelectedEventParameters>) => void;
+    selected?: (oEvent: DataSetItem$SelectedEvent) => void;
   }
 
-  export interface $DataSetItemSelectedEventParameters {
+  export interface DataSetItem$SelectedEventParameters {
     /**
      * Id of the selected Datset item
      */
     itemId?: string;
   }
+
+  export type DataSetItem$SelectedEvent = Event<DataSetItem$SelectedEventParameters>;
 }
 
 declare module "sap/ui/ux3/DataSetSimpleView" {
@@ -3084,7 +3095,9 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
    *
    * DataSetSimpleView provides a simple view example for DataSet usage.
    */
-  class DataSetSimpleView extends Control implements DataSetView {
+  export default class DataSetSimpleView
+    extends Control
+    implements DataSetView {
     __implements__sap_ui_ux3_DataSetView: boolean;
     /**
      * Constructor for a new DataSetSimpleView.
@@ -3153,7 +3166,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
      */
     destroyTemplate(): 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)
      *
      * View finalization: Called when leaving the view
      */
@@ -3170,7 +3183,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
      */
     getFloating(): boolean;
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * Gets current value of property {@link #getHeight height}.
      *
@@ -3205,7 +3218,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
      */
     getIconSelected(): URI;
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * Gets current value of property {@link #getInitialItemCount initialItemCount}.
      *
@@ -3219,7 +3232,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
      */
     getInitialItemCount(): int;
     /**
-     * @SINCE 1.9.2
+     * @since 1.9.2
      *
      * Gets current value of property {@link #getItemMinWidth itemMinWidth}.
      *
@@ -3242,7 +3255,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
      */
     getName(): string;
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * Gets current value of property {@link #getReloadItemCount reloadItemCount}.
      *
@@ -3254,7 +3267,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
      */
     getReloadItemCount(): int;
     /**
-     * @SINCE 1.9.2
+     * @since 1.9.2
      *
      * Gets current value of property {@link #getResponsive responsive}.
      *
@@ -3267,7 +3280,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
      */
     getResponsive(): boolean;
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * Gets current value of property {@link #getScrollArea scrollArea}.
      *
@@ -3283,7 +3296,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
      */
     getTemplate(): Control;
     /**
-     * @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)
      *
      * Eventhandler for the selection of an Item
      */
@@ -3294,7 +3307,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
       oEvent: Event
     ): void;
     /**
-     * @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)
      *
      * View Initialization: Called when selecting the view
      */
@@ -3305,7 +3318,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
       aItems: any[]
     ): void;
     /**
-     * @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)
      *
      * Check if Item `oItem` is selected
      */
@@ -3334,7 +3347,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
       bFloating?: boolean
     ): this;
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * Sets a new value for property {@link #getHeight height}.
      *
@@ -3397,7 +3410,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
       sIconSelected?: URI
     ): this;
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * Sets a new value for property {@link #getInitialItemCount initialItemCount}.
      *
@@ -3418,7 +3431,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
       iInitialItemCount?: int
     ): this;
     /**
-     * @SINCE 1.9.2
+     * @since 1.9.2
      *
      * Sets a new value for property {@link #getItemMinWidth itemMinWidth}.
      *
@@ -3455,7 +3468,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
       sName?: string
     ): this;
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * Sets a new value for property {@link #getReloadItemCount reloadItemCount}.
      *
@@ -3474,7 +3487,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
       iReloadItemCount?: int
     ): this;
     /**
-     * @SINCE 1.9.2
+     * @since 1.9.2
      *
      * Sets a new value for property {@link #getResponsive responsive}.
      *
@@ -3511,7 +3524,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
       oTemplate: 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)
      *
      * View update: Called when pagination adds items
      */
@@ -3522,7 +3535,6 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
       aDiff: DataSetItem[]
     ): void;
   }
-  export default DataSetSimpleView;
 
   export interface $DataSetSimpleViewSettings extends $ControlSettings {
     /**
@@ -3552,7 +3564,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
     iconSelected?: URI | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.9.2
+     * @since 1.9.2
      *
      * When true and the property floating is true the DatSet items are floating containers filling the whole
      * space of a row.
@@ -3560,7 +3572,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
     responsive?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.9.2
+     * @since 1.9.2
      *
      * When itemMinWidth>0 and the property floating is true the given minimum width in pixels is set to DatSet
      * items. A minimum width must be given when the property responsive is set.
@@ -3568,7 +3580,7 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
     itemMinWidth?: int | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * If this value is greater zero only this amount of items is loaded in the first place. New items are loaded
      * automatically when the user scrolls down. The number of items which are reloaded can be defined with
@@ -3577,21 +3589,21 @@ declare module "sap/ui/ux3/DataSetSimpleView" {
     initialItemCount?: int | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * This number defines the item count which is reloaded on scroll if initialItemCount is enabled.
      */
     reloadItemCount?: int | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * ID of the DOM Element or jQuery reference to the dom which holds the scrollbar for the dataset
      */
     scrollArea?: any | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.13.0
+     * @since 1.13.0
      *
      * If the pagination feature is used without specifying a scroll area, a height for the dataset must be
      * defined.
@@ -3610,8 +3622,6 @@ declare module "sap/ui/ux3/Exact" {
 
   import ExactAttribute from "sap/ui/ux3/ExactAttribute";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import ExactArea from "sap/ui/ux3/ExactArea";
@@ -3625,14 +3635,16 @@ declare module "sap/ui/ux3/Exact" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38)
-   * @EXPERIMENTAL (since 1.2) - API is not yet finished and might change completely
+   * @experimental (since 1.2) - API is not yet finished and might change completely
    *
    * A comprehensive UI design approach with graphical and functional elements for searching data, exploring
    * data, and acting on the data ("Explore and Act (Exact) Pattern").
    */
-  class Exact extends Control {
+  export default class Exact extends Control {
     /**
      * Constructor for a new Exact.
      *
@@ -3723,7 +3735,7 @@ declare module "sap/ui/ux3/Exact" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ExactRefineSearchEventParameters>) => void,
+      fnFunction: (p1: Exact$RefineSearchEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Exact` itself
        */
@@ -3743,7 +3755,7 @@ declare module "sap/ui/ux3/Exact" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ExactRefineSearchEventParameters>) => void,
+      fnFunction: (p1: Exact$RefineSearchEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Exact` itself
        */
@@ -3768,7 +3780,7 @@ declare module "sap/ui/ux3/Exact" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ExactSearchEventParameters>) => void,
+      fnFunction: (p1: Exact$SearchEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Exact` itself
        */
@@ -3788,7 +3800,7 @@ declare module "sap/ui/ux3/Exact" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ExactSearchEventParameters>) => void,
+      fnFunction: (p1: Exact$SearchEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Exact` itself
        */
@@ -3817,7 +3829,7 @@ declare module "sap/ui/ux3/Exact" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ExactRefineSearchEventParameters>) => void,
+      fnFunction: (p1: Exact$RefineSearchEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -3834,14 +3846,14 @@ declare module "sap/ui/ux3/Exact" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ExactSearchEventParameters>) => void,
+      fnFunction: (p1: Exact$SearchEvent) => 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:refineSearch refineSearch} to attached listeners.
      *
@@ -3851,10 +3863,10 @@ declare module "sap/ui/ux3/Exact" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ExactRefineSearchEventParameters
+      mParameters?: Exact$RefineSearchEventParameters
     ): 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:search search} to attached listeners.
      *
@@ -3864,7 +3876,7 @@ declare module "sap/ui/ux3/Exact" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ExactSearchEventParameters
+      mParameters?: Exact$SearchEventParameters
     ): this;
     /**
      * Gets content of aggregation {@link #getAttributes attributes}.
@@ -3969,7 +3981,6 @@ declare module "sap/ui/ux3/Exact" {
       oSettingsMenu: Menu
     ): this;
   }
-  export default Exact;
 
   export interface $ExactSettings extends $ControlSettings {
     /**
@@ -3994,15 +4005,15 @@ declare module "sap/ui/ux3/Exact" {
     /**
      * Event is fired when the search button is clicked
      */
-    search?: (oEvent: Event<$ExactSearchEventParameters>) => void;
+    search?: (oEvent: Exact$SearchEvent) => void;
 
     /**
      * Event which is fired when an attribute is selected or unselected.
      */
-    refineSearch?: (oEvent: Event<$ExactRefineSearchEventParameters>) => void;
+    refineSearch?: (oEvent: Exact$RefineSearchEvent) => void;
   }
 
-  export interface $ExactRefineSearchEventParameters {
+  export interface Exact$RefineSearchEventParameters {
     /**
      * The query string which was entered in the search field
      */
@@ -4019,12 +4030,16 @@ declare module "sap/ui/ux3/Exact" {
     allSelectedAttributes?: object;
   }
 
-  export interface $ExactSearchEventParameters {
+  export type Exact$RefineSearchEvent = Event<Exact$RefineSearchEventParameters>;
+
+  export interface Exact$SearchEventParameters {
     /**
      * The query string which was entered in the search field.
      */
     query?: string;
   }
+
+  export type Exact$SearchEvent = Event<Exact$SearchEventParameters>;
 }
 
 declare module "sap/ui/ux3/ExactArea" {
@@ -4041,12 +4056,12 @@ declare module "sap/ui/ux3/ExactArea" {
 
   /**
    * @deprecated (since 1.38)
-   * @EXPERIMENTAL (since 1.6) - API is not yet finished and might change completely
+   * @experimental (since 1.6) - API is not yet finished and might change completely
    *
    * Consists of two sections: A tool bar and a content area where arbitrary controls can be added. The ExactArea
    * is intended to be used for the Exact design approach but alternatively also in a stand alone version.
    */
-  class ExactArea extends Control {
+  export default class ExactArea extends Control {
     /**
      * Constructor for a new ExactArea.
      *
@@ -4277,7 +4292,6 @@ declare module "sap/ui/ux3/ExactArea" {
       bToolbarVisible?: boolean
     ): this;
   }
-  export default ExactArea;
 
   export interface $ExactAreaSettings extends $ControlSettings {
     /**
@@ -4304,8 +4318,6 @@ declare module "sap/ui/ux3/ExactArea" {
 declare module "sap/ui/ux3/ExactAttribute" {
   import { default as UI5Element, $ElementSettings } from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import { ExactOrder } from "sap/ui/ux3/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
@@ -4317,12 +4329,14 @@ declare module "sap/ui/ux3/ExactAttribute" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38)
    *
    * An element for defining attributes and sub-attributes used within the Exact pattern.
    */
-  class ExactAttribute extends UI5Element {
+  export default class ExactAttribute extends UI5Element {
     /**
      * Constructor for a new ExactAttribute.
      *
@@ -4416,9 +4430,7 @@ declare module "sap/ui/ux3/ExactAttribute" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ExactAttributeSupplyAttributesEventParameters>
-      ) => void,
+      fnFunction: (p1: ExactAttribute$SupplyAttributesEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ExactAttribute` itself
        */
@@ -4441,9 +4453,7 @@ declare module "sap/ui/ux3/ExactAttribute" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ExactAttributeSupplyAttributesEventParameters>
-      ) => void,
+      fnFunction: (p1: ExactAttribute$SupplyAttributesEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ExactAttribute` itself
        */
@@ -4467,16 +4477,14 @@ declare module "sap/ui/ux3/ExactAttribute" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ExactAttributeSupplyAttributesEventParameters>
-      ) => void,
+      fnFunction: (p1: ExactAttribute$SupplyAttributesEvent) => 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:supplyAttributes supplyAttributes} to attached listeners.
      *
@@ -4486,7 +4494,7 @@ declare module "sap/ui/ux3/ExactAttribute" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ExactAttributeSupplyAttributesEventParameters
+      mParameters?: ExactAttribute$SupplyAttributesEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getAdditionalData additionalData}.
@@ -4514,7 +4522,7 @@ declare module "sap/ui/ux3/ExactAttribute" {
      */
     getAutoActivateSupply(): boolean;
     /**
-     * @SINCE 1.7.1
+     * @since 1.7.1
      *
      * Gets current value of property {@link #getListOrder listOrder}.
      *
@@ -4574,7 +4582,7 @@ declare module "sap/ui/ux3/ExactAttribute" {
      */
     getText(): string;
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Gets current value of property {@link #getWidth width}.
      *
@@ -4677,7 +4685,7 @@ declare module "sap/ui/ux3/ExactAttribute" {
       bAutoActivateSupply?: boolean
     ): this;
     /**
-     * @SINCE 1.7.1
+     * @since 1.7.1
      *
      * Sets a new value for property {@link #getListOrder listOrder}.
      *
@@ -4696,7 +4704,7 @@ declare module "sap/ui/ux3/ExactAttribute" {
       sListOrder?: ExactOrder | keyof typeof ExactOrder
     ): 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)
      *
      * See:
      * 	sap.ui.base.ManagedObject.prototype.setProperty
@@ -4790,7 +4798,7 @@ declare module "sap/ui/ux3/ExactAttribute" {
      */
     setTooltip(oTooltip: string | TooltipBase): this;
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Sets a new value for property {@link #getWidth width}.
      *
@@ -4809,7 +4817,6 @@ declare module "sap/ui/ux3/ExactAttribute" {
       iWidth?: int
     ): this;
   }
-  export default ExactAttribute;
 
   export interface $ExactAttributeSettings extends $ElementSettings {
     /**
@@ -4823,14 +4830,14 @@ declare module "sap/ui/ux3/ExactAttribute" {
     selected?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Specifies the width of the corresponding list in pixels. The value must be between 70 and 500.
      */
     width?: int | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.7.1
+     * @since 1.7.1
      *
      * The order how the sublists of this attribute should be displayed.
      */
@@ -4882,17 +4889,17 @@ declare module "sap/ui/ux3/ExactAttribute" {
      * the corresponding ExactAttribute is selected, it was already selected when a handler is attached or function
      * getAttributes() is called.
      */
-    supplyAttributes?: (
-      oEvent: Event<$ExactAttributeSupplyAttributesEventParameters>
-    ) => void;
+    supplyAttributes?: (oEvent: ExactAttribute$SupplyAttributesEvent) => void;
   }
 
-  export interface $ExactAttributeSupplyAttributesEventParameters {
+  export interface ExactAttribute$SupplyAttributesEventParameters {
     /**
      * The ExactAttribute
      */
     attribute?: ExactAttribute;
   }
+
+  export type ExactAttribute$SupplyAttributesEvent = Event<ExactAttribute$SupplyAttributesEventParameters>;
 }
 
 declare module "sap/ui/ux3/ExactBrowser" {
@@ -4924,7 +4931,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
    * and thereby trigger the display of further information, depending on the chosen entry/entries (multiple
    * selection supported).
    */
-  class ExactBrowser extends Control {
+  export default class ExactBrowser extends Control {
     /**
      * Constructor for a new ExactBrowser.
      *
@@ -5016,9 +5023,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ExactBrowserAttributeSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ExactBrowser$AttributeSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ExactBrowser` itself
        */
@@ -5039,9 +5044,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ExactBrowserAttributeSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ExactBrowser$AttributeSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ExactBrowser` itself
        */
@@ -5116,9 +5119,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ExactBrowserAttributeSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ExactBrowser$AttributeSelectedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -5142,7 +5143,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
       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:attributeSelected attributeSelected} to attached listeners.
      *
@@ -5152,10 +5153,10 @@ declare module "sap/ui/ux3/ExactBrowser" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ExactBrowserAttributeSelectedEventParameters
+      mParameters?: ExactBrowser$AttributeSelectedEventParameters
     ): 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:save save} to attached listeners.
      *
@@ -5194,7 +5195,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
      */
     getEnableReset(): boolean;
     /**
-     * @SINCE 1.9.2
+     * @since 1.9.2
      *
      * Gets current value of property {@link #getEnableSave enableSave}.
      *
@@ -5245,7 +5246,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
      */
     getShowHeader(): boolean;
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Gets current value of property {@link #getShowTopList showTopList}.
      *
@@ -5267,7 +5268,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
      */
     getTitle(): string;
     /**
-     * @SINCE 1.7.1
+     * @since 1.7.1
      *
      * Gets current value of property {@link #getTopListOrder topListOrder}.
      *
@@ -5279,7 +5280,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
      */
     getTopListOrder(): ExactOrder | keyof typeof ExactOrder;
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Gets current value of property {@link #getTopListWidth topListWidth}.
      *
@@ -5377,7 +5378,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
       bEnableReset?: boolean
     ): this;
     /**
-     * @SINCE 1.9.2
+     * @since 1.9.2
      *
      * Sets a new value for property {@link #getEnableSave enableSave}.
      *
@@ -5468,7 +5469,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
       bShowHeader?: boolean
     ): this;
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Sets a new value for property {@link #getShowTopList showTopList}.
      *
@@ -5504,7 +5505,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
       sTitle?: string
     ): this;
     /**
-     * @SINCE 1.7.1
+     * @since 1.7.1
      *
      * Sets a new value for property {@link #getTopListOrder topListOrder}.
      *
@@ -5523,7 +5524,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
       sTopListOrder?: ExactOrder | keyof typeof ExactOrder
     ): this;
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Sets a new value for property {@link #getTopListWidth topListWidth}.
      *
@@ -5542,7 +5543,6 @@ declare module "sap/ui/ux3/ExactBrowser" {
       iTopListWidth?: int
     ): this;
   }
-  export default ExactBrowser;
 
   export interface $ExactBrowserSettings extends $ControlSettings {
     /**
@@ -5557,7 +5557,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
     headerTitle?: string | PropertyBindingInfo;
 
     /**
-     * @SINCE 1.7.1
+     * @since 1.7.1
      *
      * The order how the sublists of the top level list should be displayed.
      */
@@ -5582,7 +5582,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
     showHeader?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Whether the top list of the ExactBrowser should be shown. When the property is set to false the application
      * must ensure to select top level attributes appropriately.
@@ -5595,14 +5595,14 @@ declare module "sap/ui/ux3/ExactBrowser" {
     enableReset?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.9.2
+     * @since 1.9.2
      *
      * Whether the save button should be available in the header area.
      */
     enableSave?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Specifies the width of the top list in pixels. The value must be between 70 and 500.
      */
@@ -5631,9 +5631,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
     /**
      * Event is fired when an attribute is selected or unselected.
      */
-    attributeSelected?: (
-      oEvent: Event<$ExactBrowserAttributeSelectedEventParameters>
-    ) => void;
+    attributeSelected?: (oEvent: ExactBrowser$AttributeSelectedEvent) => void;
 
     /**
      * Event is fired when an attribute is selected or unselected.
@@ -5641,7 +5639,7 @@ declare module "sap/ui/ux3/ExactBrowser" {
     save?: (oEvent: Event) => void;
   }
 
-  export interface $ExactBrowserAttributeSelectedEventParameters {
+  export interface ExactBrowser$AttributeSelectedEventParameters {
     /**
      * The attribute which was selected or unselected recently
      */
@@ -5653,14 +5651,16 @@ declare module "sap/ui/ux3/ExactBrowser" {
     allAttributes?: object;
   }
 
-  export interface $ExactBrowserSaveEventParameters {}
+  export type ExactBrowser$AttributeSelectedEvent = Event<ExactBrowser$AttributeSelectedEventParameters>;
+
+  export interface ExactBrowser$SaveEventParameters {}
+
+  export type ExactBrowser$SaveEvent = Event<ExactBrowser$SaveEventParameters>;
 }
 
 declare module "sap/ui/ux3/ExactList" {
   import { default as Control, $ControlSettings } from "sap/ui/core/Control";
 
-  import Event from "sap/ui/base/Event";
-
   import { ID } from "sap/ui/core/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
@@ -5672,13 +5672,15 @@ declare module "sap/ui/ux3/ExactList" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38)
    *
    * Internal sub-control of the ExactBrowser. The control is not intended to be used stand alone. For this
    * purpose, the ExactBrowser control can be used.
    */
-  class ExactList extends Control {
+  export default class ExactList extends Control {
     /**
      * Constructor for a new ExactList.
      *
@@ -5770,9 +5772,7 @@ declare module "sap/ui/ux3/ExactList" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ExactListAttributeSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ExactList$AttributeSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ExactList` itself
        */
@@ -5793,9 +5793,7 @@ declare module "sap/ui/ux3/ExactList" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ExactListAttributeSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ExactList$AttributeSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ExactList` itself
        */
@@ -5819,16 +5817,14 @@ declare module "sap/ui/ux3/ExactList" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ExactListAttributeSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ExactList$AttributeSelectedEvent) => 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:attributeSelected attributeSelected} to attached listeners.
      *
@@ -5838,7 +5834,7 @@ declare module "sap/ui/ux3/ExactList" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ExactListAttributeSelectedEventParameters
+      mParameters?: ExactList$AttributeSelectedEventParameters
     ): this;
     /**
      * ID of the element which is the current target of the association {@link #getData data}, or `null`.
@@ -5989,7 +5985,6 @@ declare module "sap/ui/ux3/ExactList" {
       sTopTitle?: string
     ): this;
   }
-  export default ExactList;
 
   export interface $ExactListSettings extends $ControlSettings {
     /**
@@ -6021,12 +6016,10 @@ declare module "sap/ui/ux3/ExactList" {
     /**
      * Event which is fired when an attribute is selected/unselected
      */
-    attributeSelected?: (
-      oEvent: Event<$ExactListAttributeSelectedEventParameters>
-    ) => void;
+    attributeSelected?: (oEvent: ExactList$AttributeSelectedEvent) => void;
   }
 
-  export interface $ExactListAttributeSelectedEventParameters {
+  export interface ExactList$AttributeSelectedEventParameters {
     /**
      * The attribute which was selected/unselected recently
      */
@@ -6037,6 +6030,8 @@ declare module "sap/ui/ux3/ExactList" {
      */
     allAttributes?: object;
   }
+
+  export type ExactList$AttributeSelectedEvent = Event<ExactList$AttributeSelectedEventParameters>;
 }
 
 declare module "sap/ui/ux3/FacetFilter" {
@@ -6058,7 +6053,7 @@ declare module "sap/ui/ux3/FacetFilter" {
    *
    * FacetFilter Control.
    */
-  class FacetFilter extends Control {
+  export default class FacetFilter extends Control {
     /**
      * Constructor for a new FacetFilter.
      *
@@ -6224,7 +6219,6 @@ declare module "sap/ui/ux3/FacetFilter" {
         | keyof typeof VisibleItemCountMode
     ): this;
   }
-  export default FacetFilter;
 
   export interface $FacetFilterSettings extends $ControlSettings {
     /**
@@ -6252,8 +6246,6 @@ declare module "sap/ui/ux3/FacetFilterList" {
 
   import ListItem from "sap/ui/core/ListItem";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import {
@@ -6261,12 +6253,14 @@ declare module "sap/ui/ux3/FacetFilterList" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38) - replaced by {@link sap.m.FacetFilter}
    *
    * List to be used with the FacetFilter control. The control is not intended to be used stand alone.
    */
-  class FacetFilterList extends Control {
+  export default class FacetFilterList extends Control {
     /**
      * Constructor for a new FacetFilterList.
      *
@@ -6357,7 +6351,7 @@ declare module "sap/ui/ux3/FacetFilterList" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FacetFilterListSelectEventParameters>) => void,
+      fnFunction: (p1: FacetFilterList$SelectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FacetFilterList` itself
        */
@@ -6377,7 +6371,7 @@ declare module "sap/ui/ux3/FacetFilterList" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FacetFilterListSelectEventParameters>) => void,
+      fnFunction: (p1: FacetFilterList$SelectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FacetFilterList` itself
        */
@@ -6400,14 +6394,14 @@ declare module "sap/ui/ux3/FacetFilterList" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FacetFilterListSelectEventParameters>) => void,
+      fnFunction: (p1: FacetFilterList$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:select select} to attached listeners.
      *
@@ -6417,10 +6411,10 @@ declare module "sap/ui/ux3/FacetFilterList" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FacetFilterListSelectEventParameters
+      mParameters?: FacetFilterList$SelectEventParameters
     ): this;
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Gets current value of property {@link #getDisplaySecondaryValues displaySecondaryValues}.
      *
@@ -6523,7 +6517,7 @@ declare module "sap/ui/ux3/FacetFilterList" {
       vItem: int | string | ListItem
     ): ListItem | null;
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Sets a new value for property {@link #getDisplaySecondaryValues displaySecondaryValues}.
      *
@@ -6607,7 +6601,6 @@ declare module "sap/ui/ux3/FacetFilterList" {
       sTitle?: string
     ): this;
   }
-  export default FacetFilterList;
 
   export interface $FacetFilterListSettings extends $ControlSettings {
     /**
@@ -6621,7 +6614,7 @@ declare module "sap/ui/ux3/FacetFilterList" {
     multiSelect?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Specifies whether the text values from the additionalText property (see sap.ui.core.ListItems) shall
      * be displayed.
@@ -6646,10 +6639,10 @@ declare module "sap/ui/ux3/FacetFilterList" {
     /**
      * On Select event.
      */
-    select?: (oEvent: Event<$FacetFilterListSelectEventParameters>) => void;
+    select?: (oEvent: FacetFilterList$SelectEvent) => void;
   }
 
-  export interface $FacetFilterListSelectEventParameters {
+  export interface FacetFilterList$SelectEventParameters {
     /**
      * Id of the FacetFilterList taht fires the event.
      */
@@ -6671,6 +6664,8 @@ declare module "sap/ui/ux3/FacetFilterList" {
      */
     all?: boolean;
   }
+
+  export type FacetFilterList$SelectEvent = Event<FacetFilterList$SelectEventParameters>;
 }
 
 declare module "sap/ui/ux3/Feed" {
@@ -6682,8 +6677,6 @@ declare module "sap/ui/ux3/Feed" {
 
   import MenuItem from "sap/ui/commons/MenuItem";
 
-  import Event from "sap/ui/base/Event";
-
   import {
     AggregationBindingInfo,
     PropertyBindingInfo,
@@ -6693,17 +6686,19 @@ declare module "sap/ui/ux3/Feed" {
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
+  import Event from "sap/ui/base/Event";
+
   import MenuItemBase from "sap/ui/unified/MenuItemBase";
 
   /**
    * @deprecated (since 1.38) - Instead, use **any** `sap.ui.layout` container control.
-   * @EXPERIMENTAL (since 1.2) - The whole Feed/Feeder API is still under discussion, significant changes
+   * @experimental (since 1.2) - The whole Feed/Feeder API is still under discussion, significant changes
    * are likely. Especially text presentation (e.g. @-references and formatted text) is not final. Also the
    * Feed model topic is still open.
    *
    * A container control representing a full feed page, including feeder and updates.
    */
-  class Feed extends Control {
+  export default class Feed extends Control {
     /**
      * Constructor for a new Feed.
      *
@@ -6816,7 +6811,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkAddedEventParameters>) => void,
+      fnFunction: (p1: Feed$ChunkAddedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -6836,7 +6831,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkAddedEventParameters>) => void,
+      fnFunction: (p1: Feed$ChunkAddedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -6861,7 +6856,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedFilterChangeEventParameters>) => void,
+      fnFunction: (p1: Feed$FilterChangeEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -6881,7 +6876,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedFilterChangeEventParameters>) => void,
+      fnFunction: (p1: Feed$FilterChangeEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -6906,7 +6901,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedSearchEventParameters>) => void,
+      fnFunction: (p1: Feed$SearchEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -6926,7 +6921,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedSearchEventParameters>) => void,
+      fnFunction: (p1: Feed$SearchEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -6951,7 +6946,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedToggleLiveEventParameters>) => void,
+      fnFunction: (p1: Feed$ToggleLiveEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -6971,7 +6966,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedToggleLiveEventParameters>) => void,
+      fnFunction: (p1: Feed$ToggleLiveEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -6997,7 +6992,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedToolsItemSelectedEventParameters>) => void,
+      fnFunction: (p1: Feed$ToolsItemSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -7018,7 +7013,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedToolsItemSelectedEventParameters>) => void,
+      fnFunction: (p1: Feed$ToolsItemSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feed` itself
        */
@@ -7095,7 +7090,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkAddedEventParameters>) => void,
+      fnFunction: (p1: Feed$ChunkAddedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7112,7 +7107,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeedFilterChangeEventParameters>) => void,
+      fnFunction: (p1: Feed$FilterChangeEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7129,7 +7124,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeedSearchEventParameters>) => void,
+      fnFunction: (p1: Feed$SearchEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7146,7 +7141,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeedToggleLiveEventParameters>) => void,
+      fnFunction: (p1: Feed$ToggleLiveEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7164,14 +7159,14 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeedToolsItemSelectedEventParameters>) => void,
+      fnFunction: (p1: Feed$ToolsItemSelectedEvent) => 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:chunkAdded chunkAdded} to attached listeners.
      *
@@ -7181,10 +7176,10 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedChunkAddedEventParameters
+      mParameters?: Feed$ChunkAddedEventParameters
     ): 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:filterChange filterChange} to attached listeners.
      *
@@ -7194,10 +7189,10 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedFilterChangeEventParameters
+      mParameters?: Feed$FilterChangeEventParameters
     ): 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:search search} to attached listeners.
      *
@@ -7207,10 +7202,10 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedSearchEventParameters
+      mParameters?: Feed$SearchEventParameters
     ): 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:toggleLive toggleLive} to attached listeners.
      *
@@ -7220,10 +7215,10 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedToggleLiveEventParameters
+      mParameters?: Feed$ToggleLiveEventParameters
     ): 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:toolsItemSelected toolsItemSelected} to attached listeners.
      *
@@ -7233,7 +7228,7 @@ declare module "sap/ui/ux3/Feed" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedToolsItemSelectedEventParameters
+      mParameters?: Feed$ToolsItemSelectedEventParameters
     ): this;
     /**
      * Gets content of aggregation {@link #getChunks chunks}.
@@ -7512,7 +7507,6 @@ declare module "sap/ui/ux3/Feed" {
      */
     unbindToolsMenuItems(): this;
   }
-  export default Feed;
 
   export interface $FeedSettings extends $ControlSettings {
     /**
@@ -7561,60 +7555,66 @@ declare module "sap/ui/ux3/Feed" {
     /**
      * Event is fired when the filter is changed
      */
-    filterChange?: (oEvent: Event<$FeedFilterChangeEventParameters>) => void;
+    filterChange?: (oEvent: Feed$FilterChangeEvent) => void;
 
     /**
      * Event is fired when the search function on SearchField is triggered
      */
-    search?: (oEvent: Event<$FeedSearchEventParameters>) => void;
+    search?: (oEvent: Feed$SearchEvent) => void;
 
     /**
      * Event is fired when a new chunk is added
      */
-    chunkAdded?: (oEvent: Event<$FeedChunkAddedEventParameters>) => void;
+    chunkAdded?: (oEvent: Feed$ChunkAddedEvent) => void;
 
     /**
      * Event is fired when an item from the tools MenuButton was selected
      */
-    toolsItemSelected?: (
-      oEvent: Event<$FeedToolsItemSelectedEventParameters>
-    ) => void;
+    toolsItemSelected?: (oEvent: Feed$ToolsItemSelectedEvent) => void;
 
     /**
      * Event is fired when the live mode has changed
      */
-    toggleLive?: (oEvent: Event<$FeedToggleLiveEventParameters>) => void;
+    toggleLive?: (oEvent: Feed$ToggleLiveEvent) => void;
   }
 
-  export interface $FeedChunkAddedEventParameters {
+  export interface Feed$ChunkAddedEventParameters {
     /**
      * New chunk
      */
     chunk?: FeedChunk;
   }
 
-  export interface $FeedFilterChangeEventParameters {
+  export type Feed$ChunkAddedEvent = Event<Feed$ChunkAddedEventParameters>;
+
+  export interface Feed$FilterChangeEventParameters {
     /**
      * The new/changed value of the filter
      */
     newValue?: string;
   }
 
-  export interface $FeedSearchEventParameters {
+  export type Feed$FilterChangeEvent = Event<Feed$FilterChangeEventParameters>;
+
+  export interface Feed$SearchEventParameters {
     /**
      * The search query
      */
     query?: string;
   }
 
-  export interface $FeedToggleLiveEventParameters {
+  export type Feed$SearchEvent = Event<Feed$SearchEventParameters>;
+
+  export interface Feed$ToggleLiveEventParameters {
     /**
      * Current live indicator
      */
     live?: boolean;
   }
 
-  export interface $FeedToolsItemSelectedEventParameters {
+  export type Feed$ToggleLiveEvent = Event<Feed$ToggleLiveEventParameters>;
+
+  export interface Feed$ToolsItemSelectedEventParameters {
     /**
      * The Id of the selected item
      */
@@ -7625,6 +7625,8 @@ declare module "sap/ui/ux3/Feed" {
      */
     item?: MenuItemBase;
   }
+
+  export type Feed$ToolsItemSelectedEvent = Event<Feed$ToolsItemSelectedEventParameters>;
 }
 
 declare module "sap/ui/ux3/FeedChunk" {
@@ -7647,7 +7649,7 @@ declare module "sap/ui/ux3/FeedChunk" {
 
   /**
    * @deprecated (since 1.38) - Instead, use the `sap.m.FeedListItem` control.
-   * @EXPERIMENTAL (since 1.2) - The whole Feed/Feeder API is still under discussion, significant changes
+   * @experimental (since 1.2) - The whole Feed/Feeder API is still under discussion, significant changes
    * are likely. Especially text presentation (e.g. @-references and formatted text) is not final. Also the
    * Feed model topic is still open.
    *
@@ -7655,7 +7657,7 @@ declare module "sap/ui/ux3/FeedChunk" {
    * a set of properties for text, sender information, time stamp, comments, and functions such as flagging
    * the entry to be favorite, shared, or flagged.
    */
-  class FeedChunk extends Control {
+  export default class FeedChunk extends Control {
     /**
      * Constructor for a new FeedChunk.
      *
@@ -7758,9 +7760,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$FeedChunkActionItemSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: FeedChunk$ActionItemSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -7781,9 +7781,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$FeedChunkActionItemSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: FeedChunk$ActionItemSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -7808,7 +7806,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkCommentAddedEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$CommentAddedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -7828,7 +7826,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkCommentAddedEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$CommentAddedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -7944,9 +7942,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$FeedChunkReferenceClickedEventParameters>
-      ) => void,
+      fnFunction: (p1: FeedChunk$ReferenceClickedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -7967,9 +7963,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$FeedChunkReferenceClickedEventParameters>
-      ) => void,
+      fnFunction: (p1: FeedChunk$ReferenceClickedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -8041,7 +8035,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkToggleFavoriteEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$ToggleFavoriteEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -8063,7 +8057,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkToggleFavoriteEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$ToggleFavoriteEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -8088,7 +8082,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkToggleFlaggedEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$ToggleFlaggedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -8108,7 +8102,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkToggleFlaggedEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$ToggleFlaggedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -8133,7 +8127,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkToggleSharedEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$ToggleSharedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -8153,7 +8147,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkToggleSharedEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$ToggleSharedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.FeedChunk` itself
        */
@@ -8211,9 +8205,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$FeedChunkActionItemSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: FeedChunk$ActionItemSelectedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -8230,7 +8222,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkCommentAddedEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$CommentAddedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -8282,9 +8274,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$FeedChunkReferenceClickedEventParameters>
-      ) => void,
+      fnFunction: (p1: FeedChunk$ReferenceClickedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -8320,7 +8310,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkToggleFavoriteEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$ToggleFavoriteEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -8338,7 +8328,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkToggleFlaggedEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$ToggleFlaggedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -8355,14 +8345,14 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeedChunkToggleSharedEventParameters>) => void,
+      fnFunction: (p1: FeedChunk$ToggleSharedEvent) => 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:actionItemSelected actionItemSelected} to attached listeners.
      *
@@ -8372,10 +8362,10 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedChunkActionItemSelectedEventParameters
+      mParameters?: FeedChunk$ActionItemSelectedEventParameters
     ): 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:commentAdded commentAdded} to attached listeners.
      *
@@ -8385,10 +8375,10 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedChunkCommentAddedEventParameters
+      mParameters?: FeedChunk$CommentAddedEventParameters
     ): 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:deleted deleted} to attached listeners.
      *
@@ -8401,7 +8391,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       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:inspect inspect} to attached listeners.
      *
@@ -8414,7 +8404,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       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:referenceClicked referenceClicked} to attached listeners.
      *
@@ -8424,10 +8414,10 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedChunkReferenceClickedEventParameters
+      mParameters?: FeedChunk$ReferenceClickedEventParameters
     ): 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:senderClicked senderClicked} to attached listeners.
      *
@@ -8440,7 +8430,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       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:toggleFavorite toggleFavorite} to attached listeners.
      *
@@ -8450,10 +8440,10 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedChunkToggleFavoriteEventParameters
+      mParameters?: FeedChunk$ToggleFavoriteEventParameters
     ): 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:toggleFlagged toggleFlagged} to attached listeners.
      *
@@ -8463,10 +8453,10 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedChunkToggleFlaggedEventParameters
+      mParameters?: FeedChunk$ToggleFlaggedEventParameters
     ): 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:toggleShared toggleShared} to attached listeners.
      *
@@ -8476,7 +8466,7 @@ declare module "sap/ui/ux3/FeedChunk" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeedChunkToggleSharedEventParameters
+      mParameters?: FeedChunk$ToggleSharedEventParameters
     ): this;
     /**
      * Gets content of aggregation {@link #getActionMenuItems actionMenuItems}.
@@ -9021,7 +9011,6 @@ declare module "sap/ui/ux3/FeedChunk" {
      */
     unbindComments(): this;
   }
-  export default FeedChunk;
 
   export interface $FeedChunkSettings extends $ControlSettings {
     /**
@@ -9135,16 +9124,12 @@ declare module "sap/ui/ux3/FeedChunk" {
     /**
      * Event is raised when a comment is added to the entry. This event is not supported for comment chunks.
      */
-    commentAdded?: (
-      oEvent: Event<$FeedChunkCommentAddedEventParameters>
-    ) => void;
+    commentAdded?: (oEvent: FeedChunk$CommentAddedEvent) => void;
 
     /**
      * Event is raised when the user clicks to flag the entry. This event is not supported for comment chunks.
      */
-    toggleFlagged?: (
-      oEvent: Event<$FeedChunkToggleFlaggedEventParameters>
-    ) => void;
+    toggleFlagged?: (oEvent: FeedChunk$ToggleFlaggedEvent) => void;
 
     /**
      * Event is fired when the thumbnail or the name of the sender is clicked.
@@ -9154,17 +9139,13 @@ declare module "sap/ui/ux3/FeedChunk" {
     /**
      * Click on a @-reference
      */
-    referenceClicked?: (
-      oEvent: Event<$FeedChunkReferenceClickedEventParameters>
-    ) => void;
+    referenceClicked?: (oEvent: FeedChunk$ReferenceClickedEvent) => void;
 
     /**
      * Event is raised when the user clicks to set the entry as favorite. This event is not supported for comment
      * chunks.
      */
-    toggleFavorite?: (
-      oEvent: Event<$FeedChunkToggleFavoriteEventParameters>
-    ) => void;
+    toggleFavorite?: (oEvent: FeedChunk$ToggleFavoriteEvent) => void;
 
     /**
      * Event is fired when the inspect button was pressed
@@ -9174,19 +9155,15 @@ declare module "sap/ui/ux3/FeedChunk" {
     /**
      * Event is raised when the user clicks to share the entry. This event is not supported for comment chunks.
      */
-    toggleShared?: (
-      oEvent: Event<$FeedChunkToggleSharedEventParameters>
-    ) => void;
+    toggleShared?: (oEvent: FeedChunk$ToggleSharedEvent) => void;
 
     /**
      * Event is fired when an item from the action menu button was selected.
      */
-    actionItemSelected?: (
-      oEvent: Event<$FeedChunkActionItemSelectedEventParameters>
-    ) => void;
+    actionItemSelected?: (oEvent: FeedChunk$ActionItemSelectedEvent) => void;
   }
 
-  export interface $FeedChunkActionItemSelectedEventParameters {
+  export interface FeedChunk$ActionItemSelectedEventParameters {
     /**
      * The Id of the selected item
      */
@@ -9198,53 +9175,69 @@ declare module "sap/ui/ux3/FeedChunk" {
     item?: MenuItemBase;
   }
 
-  export interface $FeedChunkCommentAddedEventParameters {
+  export type FeedChunk$ActionItemSelectedEvent = Event<FeedChunk$ActionItemSelectedEventParameters>;
+
+  export interface FeedChunk$CommentAddedEventParameters {
     /**
      * New comment chunk
      */
     comment?: FeedChunk;
   }
 
-  export interface $FeedChunkDeletedEventParameters {}
+  export type FeedChunk$CommentAddedEvent = Event<FeedChunk$CommentAddedEventParameters>;
+
+  export interface FeedChunk$DeletedEventParameters {}
 
-  export interface $FeedChunkInspectEventParameters {}
+  export type FeedChunk$DeletedEvent = Event<FeedChunk$DeletedEventParameters>;
 
-  export interface $FeedChunkReferenceClickedEventParameters {
+  export interface FeedChunk$InspectEventParameters {}
+
+  export type FeedChunk$InspectEvent = Event<FeedChunk$InspectEventParameters>;
+
+  export interface FeedChunk$ReferenceClickedEventParameters {
     /**
      * Text of the @-reference
      */
     text?: string;
   }
 
-  export interface $FeedChunkSenderClickedEventParameters {}
+  export type FeedChunk$ReferenceClickedEvent = Event<FeedChunk$ReferenceClickedEventParameters>;
+
+  export interface FeedChunk$SenderClickedEventParameters {}
+
+  export type FeedChunk$SenderClickedEvent = Event<FeedChunk$SenderClickedEventParameters>;
 
-  export interface $FeedChunkToggleFavoriteEventParameters {
+  export interface FeedChunk$ToggleFavoriteEventParameters {
     /**
      * Current favorite state
      */
     favorite?: boolean;
   }
 
-  export interface $FeedChunkToggleFlaggedEventParameters {
+  export type FeedChunk$ToggleFavoriteEvent = Event<FeedChunk$ToggleFavoriteEventParameters>;
+
+  export interface FeedChunk$ToggleFlaggedEventParameters {
     /**
      * Current flagged state
      */
     flagged?: boolean;
   }
 
-  export interface $FeedChunkToggleSharedEventParameters {
+  export type FeedChunk$ToggleFlaggedEvent = Event<FeedChunk$ToggleFlaggedEventParameters>;
+
+  export interface FeedChunk$ToggleSharedEventParameters {
     /**
      * Current shared state
      */
     shareed?: boolean;
   }
+
+  export type FeedChunk$ToggleSharedEvent = Event<FeedChunk$ToggleSharedEventParameters>;
 }
 
 declare module "sap/ui/ux3/Feeder" {
   import { default as Control, $ControlSettings } from "sap/ui/core/Control";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { URI } from "sap/ui/core/library";
@@ -9253,9 +9246,11 @@ declare module "sap/ui/ux3/Feeder" {
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38) - Instead, use the `sap.m.FeedInput` control.
-   * @EXPERIMENTAL (since 1.2) - The whole Feed/Feeder API is still under discussion, significant changes
+   * @experimental (since 1.2) - The whole Feed/Feeder API is still under discussion, significant changes
    * are likely. Especially text presentation (e.g. @-references and formatted text) is not final. Also the
    * Feed model topic is still open.
    *
@@ -9263,7 +9258,7 @@ declare module "sap/ui/ux3/Feeder" {
    * The control can be used stand alone or in a multiple way, and generally would be integrated directly
    * into a UIArea.
    */
-  class Feeder extends Control {
+  export default class Feeder extends Control {
     /**
      * Constructor for a new Feeder.
      *
@@ -9343,7 +9338,7 @@ declare module "sap/ui/ux3/Feeder" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeederSubmitEventParameters>) => void,
+      fnFunction: (p1: Feeder$SubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feeder` itself
        */
@@ -9363,7 +9358,7 @@ declare module "sap/ui/ux3/Feeder" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$FeederSubmitEventParameters>) => void,
+      fnFunction: (p1: Feeder$SubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Feeder` itself
        */
@@ -9380,14 +9375,14 @@ declare module "sap/ui/ux3/Feeder" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$FeederSubmitEventParameters>) => void,
+      fnFunction: (p1: Feeder$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.
      *
@@ -9397,7 +9392,7 @@ declare module "sap/ui/ux3/Feeder" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $FeederSubmitEventParameters
+      mParameters?: Feeder$SubmitEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getPlaceholderText placeholderText}.
@@ -9500,7 +9495,6 @@ declare module "sap/ui/ux3/Feeder" {
       sType?: FeederType | keyof typeof FeederType
     ): this;
   }
-  export default Feeder;
 
   export interface $FeederSettings extends $ControlSettings {
     /**
@@ -9531,15 +9525,17 @@ declare module "sap/ui/ux3/Feeder" {
     /**
      * Event is fired when the entered text is submitted
      */
-    submit?: (oEvent: Event<$FeederSubmitEventParameters>) => void;
+    submit?: (oEvent: Feeder$SubmitEvent) => void;
   }
 
-  export interface $FeederSubmitEventParameters {
+  export interface Feeder$SubmitEventParameters {
     /**
      * The text that is submitted
      */
     text?: string;
   }
+
+  export type Feeder$SubmitEvent = Event<Feeder$SubmitEventParameters>;
 }
 
 declare module "sap/ui/ux3/NavigationBar" {
@@ -9549,8 +9545,6 @@ declare module "sap/ui/ux3/NavigationBar" {
 
   import NavigationItem from "sap/ui/ux3/NavigationItem";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import {
@@ -9558,6 +9552,8 @@ declare module "sap/ui/ux3/NavigationBar" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38) - Instead, use the `sap.m.IconTabBar`, `sap.m.TabContainer` or `sap.uxap.ObjectPageLayout`
    * control.
@@ -9568,7 +9564,7 @@ declare module "sap/ui/ux3/NavigationBar" {
    * items are defined for the bar, this is made transparent to the user by showing symbols for scrolling
    * options (forwards and backwards) to see the next or previous items.
    */
-  class NavigationBar extends Control {
+  export default class NavigationBar extends Control {
     /**
      * Constructor for a new NavigationBar.
      *
@@ -9670,7 +9666,7 @@ declare module "sap/ui/ux3/NavigationBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$NavigationBarSelectEventParameters>) => void,
+      fnFunction: (p1: NavigationBar$SelectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.NavigationBar` itself
        */
@@ -9690,7 +9686,7 @@ declare module "sap/ui/ux3/NavigationBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$NavigationBarSelectEventParameters>) => void,
+      fnFunction: (p1: NavigationBar$SelectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.NavigationBar` itself
        */
@@ -9713,14 +9709,14 @@ declare module "sap/ui/ux3/NavigationBar" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$NavigationBarSelectEventParameters>) => void,
+      fnFunction: (p1: NavigationBar$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:select select} to attached listeners.
      *
@@ -9733,7 +9729,7 @@ declare module "sap/ui/ux3/NavigationBar" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $NavigationBarSelectEventParameters
+      mParameters?: NavigationBar$SelectEventParameters
     ): boolean;
     /**
      * Returns array of IDs of the elements which are the current targets of the association {@link #getAssociatedItems associatedItems}.
@@ -9748,7 +9744,7 @@ declare module "sap/ui/ux3/NavigationBar" {
      */
     getItems(): NavigationItem[];
     /**
-     * @SINCE 1.36
+     * @since 1.36
      *
      * Gets current value of property {@link #getOverflowItemsToUpperCase overflowItemsToUpperCase}.
      *
@@ -9854,7 +9850,7 @@ declare module "sap/ui/ux3/NavigationBar" {
       aItems: NavigationItem[]
     ): this;
     /**
-     * @SINCE 1.36
+     * @since 1.36
      *
      * Sets a new value for property {@link #getOverflowItemsToUpperCase overflowItemsToUpperCase}.
      *
@@ -9902,7 +9898,6 @@ declare module "sap/ui/ux3/NavigationBar" {
       bToplevelVariant?: boolean
     ): this;
   }
-  export default NavigationBar;
 
   export interface $NavigationBarSettings extends $ControlSettings {
     /**
@@ -9911,7 +9906,7 @@ declare module "sap/ui/ux3/NavigationBar" {
     toplevelVariant?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.36
+     * @since 1.36
      *
      * Sets the appearance of the menu items in the overflow menu to uppercase
      */
@@ -9942,10 +9937,10 @@ declare module "sap/ui/ux3/NavigationBar" {
     /**
      * Event is fired when an item is selected by the user
      */
-    select?: (oEvent: Event<$NavigationBarSelectEventParameters>) => void;
+    select?: (oEvent: NavigationBar$SelectEvent) => void;
   }
 
-  export interface $NavigationBarSelectEventParameters {
+  export interface NavigationBar$SelectEventParameters {
     /**
      * The ID of the newly selected NavigationItem.
      */
@@ -9956,6 +9951,8 @@ declare module "sap/ui/ux3/NavigationBar" {
      */
     item?: NavigationItem;
   }
+
+  export type NavigationBar$SelectEvent = Event<NavigationBar$SelectEventParameters>;
 }
 
 declare module "sap/ui/ux3/NavigationItem" {
@@ -9976,7 +9973,7 @@ declare module "sap/ui/ux3/NavigationItem" {
    *
    * Is the item to be used within the NavigationBar
    */
-  class NavigationItem extends Item {
+  export default class NavigationItem extends Item {
     /**
      * Constructor for a new NavigationItem.
      *
@@ -10074,7 +10071,7 @@ declare module "sap/ui/ux3/NavigationItem" {
      */
     getSubItems(): NavigationItem[];
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Gets current value of property {@link #getVisible visible}.
      *
@@ -10156,7 +10153,7 @@ declare module "sap/ui/ux3/NavigationItem" {
       sHref?: URI
     ): this;
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Sets a new value for property {@link #getVisible visible}.
      *
@@ -10177,11 +10174,10 @@ declare module "sap/ui/ux3/NavigationItem" {
       bVisible?: boolean
     ): this;
   }
-  export default NavigationItem;
 
   export interface $NavigationItemSettings extends $ItemSettings {
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Whether the NavigationItem is currently visible. When making NavigationItems invisible at runtime it
      * is the application's responsibility to make sure it is not the currently selected one - or to select
@@ -10215,8 +10211,6 @@ declare module "sap/ui/ux3/NotificationBar" {
 
   import UI5Element from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { NotificationBarStatus } from "sap/ui/ux3/library";
@@ -10226,8 +10220,10 @@ declare module "sap/ui/ux3/NotificationBar" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
-   * @SINCE 1.7.0
+   * @since 1.7.0
    * @deprecated (since 1.38) - Instead, use the `sap.m.MessagePopover` control.
    *
    * A NotificationBar is a "toolbar" that can be added to a page to show messages and notifications from
@@ -10236,7 +10232,7 @@ declare module "sap/ui/ux3/NotificationBar" {
    * CSS may sometimes cause issues when nested deeply inside other controls. To have a proper behavior of
    * the NotificationBar use it as high in the control hierarchy as possible.
    */
-  class NotificationBar extends Control {
+  export default class NotificationBar extends Control {
     /**
      * Constructor for a new NotificationBar.
      *
@@ -10328,7 +10324,7 @@ declare module "sap/ui/ux3/NotificationBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$NotificationBarDisplayEventParameters>) => void,
+      fnFunction: (p1: NotificationBar$DisplayEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.NotificationBar` itself
        */
@@ -10349,14 +10345,14 @@ declare module "sap/ui/ux3/NotificationBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$NotificationBarDisplayEventParameters>) => void,
+      fnFunction: (p1: NotificationBar$DisplayEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.NotificationBar` itself
        */
       oListener?: object
     ): this;
     /**
-     * @SINCE 1.12.2
+     * @since 1.12.2
      *
      * Attaches event handler `fnFunction` to the {@link #event:resize resize} event of this `sap.ui.ux3.NotificationBar`.
      *
@@ -10378,14 +10374,14 @@ declare module "sap/ui/ux3/NotificationBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$NotificationBarResizeEventParameters>) => void,
+      fnFunction: (p1: NotificationBar$ResizeEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.NotificationBar` itself
        */
       oListener?: object
     ): this;
     /**
-     * @SINCE 1.12.2
+     * @since 1.12.2
      *
      * Attaches event handler `fnFunction` to the {@link #event:resize resize} event of this `sap.ui.ux3.NotificationBar`.
      *
@@ -10402,7 +10398,7 @@ declare module "sap/ui/ux3/NotificationBar" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$NotificationBarResizeEventParameters>) => void,
+      fnFunction: (p1: NotificationBar$ResizeEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.NotificationBar` itself
        */
@@ -10431,14 +10427,14 @@ declare module "sap/ui/ux3/NotificationBar" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$NotificationBarDisplayEventParameters>) => void,
+      fnFunction: (p1: NotificationBar$DisplayEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @SINCE 1.12.2
+     * @since 1.12.2
      *
      * Detaches event handler `fnFunction` from the {@link #event:resize resize} event of this `sap.ui.ux3.NotificationBar`.
      *
@@ -10450,14 +10446,14 @@ declare module "sap/ui/ux3/NotificationBar" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$NotificationBarResizeEventParameters>) => void,
+      fnFunction: (p1: NotificationBar$ResizeEvent) => 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:display display} to attached listeners.
      *
@@ -10467,11 +10463,11 @@ declare module "sap/ui/ux3/NotificationBar" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $NotificationBarDisplayEventParameters
+      mParameters?: NotificationBar$DisplayEventParameters
     ): this;
     /**
-     * @SINCE 1.12.2
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @since 1.12.2
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:resize resize} to attached listeners.
      *
@@ -10481,10 +10477,10 @@ declare module "sap/ui/ux3/NotificationBar" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $NotificationBarResizeEventParameters
+      mParameters?: NotificationBar$ResizeEventParameters
     ): this;
     /**
-     * @SINCE 1.24.5
+     * @since 1.24.5
      *
      * Gets current value of property {@link #getAlwaysShowToggler alwaysShowToggler}.
      *
@@ -10583,7 +10579,7 @@ declare module "sap/ui/ux3/NotificationBar" {
       vNotifier: int | string | UI5Element
     ): UI5Element | null;
     /**
-     * @SINCE 1.22.11
+     * @since 1.22.11
      */
     setAlwaysShowToggler(
       /**
@@ -10639,7 +10635,6 @@ declare module "sap/ui/ux3/NotificationBar" {
         | keyof typeof NotificationBarStatus
     ): this;
   }
-  export default NotificationBar;
 
   export interface $NotificationBarSettings extends $ControlSettings {
     /**
@@ -10656,7 +10651,7 @@ declare module "sap/ui/ux3/NotificationBar" {
     resizeEnabled?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.24.5
+     * @since 1.24.5
      *
      * This property defines if the toggler should be displayed the whole time when the NotificationBar is shown.
      */
@@ -10680,32 +10675,36 @@ declare module "sap/ui/ux3/NotificationBar" {
      * Event is fired when the bar wants to be displayed depending on given flag. This allows the application
      * to decide what to do.
      */
-    display?: (oEvent: Event<$NotificationBarDisplayEventParameters>) => void;
+    display?: (oEvent: NotificationBar$DisplayEvent) => void;
 
     /**
-     * @SINCE 1.12.2
+     * @since 1.12.2
      *
      * This event is thrown when the bar was resized (to the different valid states: Min, Max, Default, None).
      * The event itself can be used from SAPUI5-version 1.12.2 since there was a bug in the previous versions
      * firing this event.
      */
-    resize?: (oEvent: Event<$NotificationBarResizeEventParameters>) => void;
+    resize?: (oEvent: NotificationBar$ResizeEvent) => void;
   }
 
-  export interface $NotificationBarDisplayEventParameters {
+  export interface NotificationBar$DisplayEventParameters {
     /**
      * Indicates if the bar wants to be shown or hidden
      */
     show?: boolean;
   }
 
-  export interface $NotificationBarResizeEventParameters {
+  export type NotificationBar$DisplayEvent = Event<NotificationBar$DisplayEventParameters>;
+
+  export interface NotificationBar$ResizeEventParameters {
     /**
      * The corresponding status to which the bar was resized. The corresponding heights can be taken for the
      * bar's CSS file.
      */
     status?: NotificationBarStatus | keyof typeof NotificationBarStatus;
   }
+
+  export type NotificationBar$ResizeEvent = Event<NotificationBar$ResizeEventParameters>;
 }
 
 declare module "sap/ui/ux3/Notifier" {
@@ -10713,8 +10712,6 @@ declare module "sap/ui/ux3/Notifier" {
 
   import Message from "sap/ui/core/Message";
 
-  import Event from "sap/ui/base/Event";
-
   import { URI } from "sap/ui/core/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
@@ -10724,12 +10721,14 @@ declare module "sap/ui/ux3/Notifier" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38)
    *
    * This element can be docked to a notification bar to show notification items
    */
-  class Notifier extends UI5Element {
+  export default class Notifier extends UI5Element {
     /**
      * Constructor for a new Notifier.
      *
@@ -10821,7 +10820,7 @@ declare module "sap/ui/ux3/Notifier" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$NotifierMessageSelectedEventParameters>) => void,
+      fnFunction: (p1: Notifier$MessageSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Notifier` itself
        */
@@ -10842,7 +10841,7 @@ declare module "sap/ui/ux3/Notifier" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$NotifierMessageSelectedEventParameters>) => void,
+      fnFunction: (p1: Notifier$MessageSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Notifier` itself
        */
@@ -10866,14 +10865,14 @@ declare module "sap/ui/ux3/Notifier" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$NotifierMessageSelectedEventParameters>) => void,
+      fnFunction: (p1: Notifier$MessageSelectedEvent) => 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:messageSelected messageSelected} to attached listeners.
      *
@@ -10883,7 +10882,7 @@ declare module "sap/ui/ux3/Notifier" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $NotifierMessageSelectedEventParameters
+      mParameters?: Notifier$MessageSelectedEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getIcon icon}.
@@ -10990,7 +10989,6 @@ declare module "sap/ui/ux3/Notifier" {
       sTitle?: string
     ): this;
   }
-  export default Notifier;
 
   export interface $NotifierSettings extends $ElementSettings {
     /**
@@ -11011,12 +11009,10 @@ declare module "sap/ui/ux3/Notifier" {
     /**
      * Event is fired when a message of the notifiers was selected.
      */
-    messageSelected?: (
-      oEvent: Event<$NotifierMessageSelectedEventParameters>
-    ) => void;
+    messageSelected?: (oEvent: Notifier$MessageSelectedEvent) => void;
   }
 
-  export interface $NotifierMessageSelectedEventParameters {
+  export interface Notifier$MessageSelectedEventParameters {
     /**
      * The message that was selected
      */
@@ -11027,6 +11023,8 @@ declare module "sap/ui/ux3/Notifier" {
      */
     notifier?: Notifier;
   }
+
+  export type Notifier$MessageSelectedEvent = Event<Notifier$MessageSelectedEventParameters>;
 }
 
 declare module "sap/ui/ux3/Overlay" {
@@ -11034,18 +11032,18 @@ declare module "sap/ui/ux3/Overlay" {
 
   import { PopupInterface } from "sap/ui/core/library";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38)
    *
    * Overlay Control
    */
-  class Overlay extends Control implements PopupInterface {
+  export default class Overlay extends Control implements PopupInterface {
     __implements__sap_ui_core_PopupInterface: boolean;
     /**
      * Constructor for a new Overlay.
@@ -11126,7 +11124,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayCloseEventParameters>) => void,
+      fnFunction: (p1: Overlay$CloseEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Overlay` itself
        */
@@ -11146,7 +11144,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayCloseEventParameters>) => void,
+      fnFunction: (p1: Overlay$CloseEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Overlay` itself
        */
@@ -11171,7 +11169,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayClosedEventParameters>) => void,
+      fnFunction: (p1: Overlay$ClosedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Overlay` itself
        */
@@ -11191,7 +11189,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayClosedEventParameters>) => void,
+      fnFunction: (p1: Overlay$ClosedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Overlay` itself
        */
@@ -11216,7 +11214,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayOpenEventParameters>) => void,
+      fnFunction: (p1: Overlay$OpenEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Overlay` itself
        */
@@ -11236,7 +11234,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayOpenEventParameters>) => void,
+      fnFunction: (p1: Overlay$OpenEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Overlay` itself
        */
@@ -11261,7 +11259,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayOpenNewEventParameters>) => void,
+      fnFunction: (p1: Overlay$OpenNewEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Overlay` itself
        */
@@ -11281,7 +11279,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayOpenNewEventParameters>) => void,
+      fnFunction: (p1: Overlay$OpenNewEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Overlay` itself
        */
@@ -11302,7 +11300,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayCloseEventParameters>) => void,
+      fnFunction: (p1: Overlay$CloseEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -11319,7 +11317,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayClosedEventParameters>) => void,
+      fnFunction: (p1: Overlay$ClosedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -11336,7 +11334,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayOpenEventParameters>) => void,
+      fnFunction: (p1: Overlay$OpenEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -11353,14 +11351,14 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$OverlayOpenNewEventParameters>) => void,
+      fnFunction: (p1: Overlay$OpenNewEvent) => 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:close close} to attached listeners.
      *
@@ -11373,10 +11371,10 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $OverlayCloseEventParameters
+      mParameters?: Overlay$CloseEventParameters
     ): boolean;
     /**
-     * @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:closed closed} to attached listeners.
      *
@@ -11389,10 +11387,10 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $OverlayClosedEventParameters
+      mParameters?: Overlay$ClosedEventParameters
     ): boolean;
     /**
-     * @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:open open} to attached listeners.
      *
@@ -11402,10 +11400,10 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $OverlayOpenEventParameters
+      mParameters?: Overlay$OpenEventParameters
     ): 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:openNew openNew} to attached listeners.
      *
@@ -11415,7 +11413,7 @@ declare module "sap/ui/ux3/Overlay" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $OverlayOpenNewEventParameters
+      mParameters?: Overlay$OpenNewEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCloseButtonVisible closeButtonVisible}.
@@ -11485,7 +11483,6 @@ declare module "sap/ui/ux3/Overlay" {
       bOpenButtonVisible?: boolean
     ): this;
   }
-  export default Overlay;
 
   export interface $OverlaySettings extends $ControlSettings {
     /**
@@ -11501,51 +11498,59 @@ declare module "sap/ui/ux3/Overlay" {
     /**
      * Event is fired when the Overlay starts closing.
      */
-    close?: (oEvent: Event<$OverlayCloseEventParameters>) => void;
+    close?: (oEvent: Overlay$CloseEvent) => void;
 
     /**
      * Event is fired when the Overlay is closed.
      */
-    closed?: (oEvent: Event<$OverlayClosedEventParameters>) => void;
+    closed?: (oEvent: Overlay$ClosedEvent) => void;
 
     /**
      * Event is fired when the 'Open' button of the Overlay is clicked.
      */
-    openNew?: (oEvent: Event<$OverlayOpenNewEventParameters>) => void;
+    openNew?: (oEvent: Overlay$OpenNewEvent) => void;
 
     /**
      * Event is fired when the Overlay is opened.
      */
-    open?: (oEvent: Event<$OverlayOpenEventParameters>) => void;
+    open?: (oEvent: Overlay$OpenEvent) => void;
   }
 
-  export interface $OverlayCloseEventParameters {
+  export interface Overlay$CloseEventParameters {
     /**
      * The ID of the Overlay instance.
      */
     id?: string;
   }
 
-  export interface $OverlayClosedEventParameters {
+  export type Overlay$CloseEvent = Event<Overlay$CloseEventParameters>;
+
+  export interface Overlay$ClosedEventParameters {
     /**
      * The ID of the Overlay instance.
      */
     id?: string;
   }
 
-  export interface $OverlayOpenEventParameters {
+  export type Overlay$ClosedEvent = Event<Overlay$ClosedEventParameters>;
+
+  export interface Overlay$OpenEventParameters {
     /**
      * The ID of the Overlay instance
      */
     id?: string;
   }
 
-  export interface $OverlayOpenNewEventParameters {
+  export type Overlay$OpenEvent = Event<Overlay$OpenEventParameters>;
+
+  export interface Overlay$OpenNewEventParameters {
     /**
      * The ID of the Overlay instance.
      */
     id?: string;
   }
+
+  export type Overlay$OpenNewEvent = Event<Overlay$OpenNewEventParameters>;
 }
 
 declare module "sap/ui/ux3/OverlayContainer" {
@@ -11562,7 +11567,7 @@ declare module "sap/ui/ux3/OverlayContainer" {
    *
    * Is to be embedded into the Overlay control as content container
    */
-  class OverlayContainer extends Overlay {
+  export default class OverlayContainer extends Overlay {
     /**
      * Constructor for a new OverlayContainer.
      *
@@ -11695,7 +11700,6 @@ declare module "sap/ui/ux3/OverlayContainer" {
       vContent: int | string | Control
     ): Control | null;
   }
-  export default OverlayContainer;
 
   export interface $OverlayContainerSettings extends $OverlaySettings {
     /**
@@ -11725,7 +11729,7 @@ declare module "sap/ui/ux3/OverlayDialog" {
    * Dialog implementation based on the Overlay. If used in a Shell it leaves the Tool-Palette, Pane-Bar and
    * Header-Items accessible.
    */
-  class OverlayDialog extends Overlay {
+  export default class OverlayDialog extends Overlay {
     /**
      * Constructor for a new OverlayDialog.
      *
@@ -11894,7 +11898,6 @@ declare module "sap/ui/ux3/OverlayDialog" {
      */
     setWidth(sWidth: CSSSize): void;
   }
-  export default OverlayDialog;
 
   export interface $OverlayDialogSettings extends $OverlaySettings {
     /**
@@ -11926,8 +11929,6 @@ declare module "sap/ui/ux3/QuickView" {
 
   import UI5Element from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import ActionBar from "sap/ui/ux3/ActionBar";
 
   import { FollowActionState } from "sap/ui/ux3/library";
@@ -11941,13 +11942,15 @@ declare module "sap/ui/ux3/QuickView" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38) - Instead, use the `sap.m.QuickView` control.
    *
    * QuickView is a small popup with a short overview of a Thing. QuickView is shown when a user holds the
    * mouse pointer over a related screen element.
    */
-  class QuickView extends CalloutBase {
+  export default class QuickView extends CalloutBase {
     /**
      * Constructor for a new QuickView.
      *
@@ -12050,7 +12053,7 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$QuickViewActionSelectedEventParameters>) => void,
+      fnFunction: (p1: QuickView$ActionSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.QuickView` itself
        */
@@ -12071,7 +12074,7 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$QuickViewActionSelectedEventParameters>) => void,
+      fnFunction: (p1: QuickView$ActionSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.QuickView` itself
        */
@@ -12096,7 +12099,7 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$QuickViewFeedSubmitEventParameters>) => void,
+      fnFunction: (p1: QuickView$FeedSubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.QuickView` itself
        */
@@ -12116,7 +12119,7 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$QuickViewFeedSubmitEventParameters>) => void,
+      fnFunction: (p1: QuickView$FeedSubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.QuickView` itself
        */
@@ -12142,7 +12145,7 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$QuickViewNavigateEventParameters>) => void,
+      fnFunction: (p1: QuickView$NavigateEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.QuickView` itself
        */
@@ -12163,7 +12166,7 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$QuickViewNavigateEventParameters>) => void,
+      fnFunction: (p1: QuickView$NavigateEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.QuickView` itself
        */
@@ -12199,7 +12202,7 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$QuickViewActionSelectedEventParameters>) => void,
+      fnFunction: (p1: QuickView$ActionSelectedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -12216,7 +12219,7 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$QuickViewFeedSubmitEventParameters>) => void,
+      fnFunction: (p1: QuickView$FeedSubmitEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -12233,14 +12236,14 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$QuickViewNavigateEventParameters>) => void,
+      fnFunction: (p1: QuickView$NavigateEvent) => 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:actionSelected actionSelected} to attached listeners.
      *
@@ -12250,10 +12253,10 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $QuickViewActionSelectedEventParameters
+      mParameters?: QuickView$ActionSelectedEventParameters
     ): 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:feedSubmit feedSubmit} to attached listeners.
      *
@@ -12263,10 +12266,10 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $QuickViewFeedSubmitEventParameters
+      mParameters?: QuickView$FeedSubmitEventParameters
     ): 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:navigate navigate} to attached listeners.
      *
@@ -12279,7 +12282,7 @@ declare module "sap/ui/ux3/QuickView" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $QuickViewNavigateEventParameters
+      mParameters?: QuickView$NavigateEventParameters
     ): boolean;
     /**
      * Gets content of aggregation {@link #getActionBar actionBar}.
@@ -12793,7 +12796,6 @@ declare module "sap/ui/ux3/QuickView" {
       sWidth?: CSSSize
     ): this;
   }
-  export default QuickView;
 
   export interface $QuickViewSettings extends $CalloutBaseSettings {
     /**
@@ -12903,23 +12905,21 @@ declare module "sap/ui/ux3/QuickView" {
     /**
      * Action is selected in Action Bar
      */
-    actionSelected?: (
-      oEvent: Event<$QuickViewActionSelectedEventParameters>
-    ) => void;
+    actionSelected?: (oEvent: QuickView$ActionSelectedEvent) => void;
 
     /**
      * Fired when a new feed entry is submitted.
      */
-    feedSubmit?: (oEvent: Event<$QuickViewFeedSubmitEventParameters>) => void;
+    feedSubmit?: (oEvent: QuickView$FeedSubmitEvent) => void;
 
     /**
      * Event is fired when a user clicks on the firstTitle link. Call the preventDefault method of the event
      * object to cancel browser navigation.
      */
-    navigate?: (oEvent: Event<$QuickViewNavigateEventParameters>) => void;
+    navigate?: (oEvent: QuickView$NavigateEvent) => void;
   }
 
-  export interface $QuickViewActionSelectedEventParameters {
+  export interface QuickView$ActionSelectedEventParameters {
     /**
      * Id of selected ThingAction
      */
@@ -12937,19 +12937,25 @@ declare module "sap/ui/ux3/QuickView" {
     newState?: string;
   }
 
-  export interface $QuickViewFeedSubmitEventParameters {
+  export type QuickView$ActionSelectedEvent = Event<QuickView$ActionSelectedEventParameters>;
+
+  export interface QuickView$FeedSubmitEventParameters {
     /**
      * Feed text
      */
     text?: string;
   }
 
-  export interface $QuickViewNavigateEventParameters {
+  export type QuickView$FeedSubmitEvent = Event<QuickView$FeedSubmitEventParameters>;
+
+  export interface QuickView$NavigateEventParameters {
     /**
      * URI of the Thing Inspector application.
      */
     href?: string;
   }
+
+  export type QuickView$NavigateEvent = Event<QuickView$NavigateEventParameters>;
 }
 
 declare module "sap/ui/ux3/Shell" {
@@ -12985,7 +12991,7 @@ declare module "sap/ui/ux3/Shell" {
    * to be added to a direct child of the BODY tag of a page and there should be no other parts of the page
    * consuming space outside the Shell.
    */
-  class Shell extends Control {
+  export default class Shell extends Control {
     /**
      * Constructor for a new Shell.
      *
@@ -13223,7 +13229,7 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ShellPaneBarItemSelectedEventParameters>) => void,
+      fnFunction: (p1: Shell$PaneBarItemSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Shell` itself
        */
@@ -13245,14 +13251,14 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ShellPaneBarItemSelectedEventParameters>) => void,
+      fnFunction: (p1: Shell$PaneBarItemSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Shell` itself
        */
       oListener?: object
     ): this;
     /**
-     * @SINCE 1.12.0
+     * @since 1.12.0
      *
      * Attaches event handler `fnFunction` to the {@link #event:paneClosed paneClosed} event of this `sap.ui.ux3.Shell`.
      *
@@ -13273,14 +13279,14 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ShellPaneClosedEventParameters>) => void,
+      fnFunction: (p1: Shell$PaneClosedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Shell` itself
        */
       oListener?: object
     ): this;
     /**
-     * @SINCE 1.12.0
+     * @since 1.12.0
      *
      * Attaches event handler `fnFunction` to the {@link #event:paneClosed paneClosed} event of this `sap.ui.ux3.Shell`.
      *
@@ -13296,7 +13302,7 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ShellPaneClosedEventParameters>) => void,
+      fnFunction: (p1: Shell$PaneClosedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Shell` itself
        */
@@ -13370,7 +13376,7 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ShellWorksetItemSelectedEventParameters>) => void,
+      fnFunction: (p1: Shell$WorksetItemSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Shell` itself
        */
@@ -13394,7 +13400,7 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ShellWorksetItemSelectedEventParameters>) => void,
+      fnFunction: (p1: Shell$WorksetItemSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.Shell` itself
        */
@@ -13419,7 +13425,7 @@ declare module "sap/ui/ux3/Shell" {
      */
     destroyHeaderItems(): this;
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Destroys the notificationBar in the aggregation {@link #getNotificationBar notificationBar}.
      *
@@ -13496,14 +13502,14 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ShellPaneBarItemSelectedEventParameters>) => void,
+      fnFunction: (p1: Shell$PaneBarItemSelectedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
       oListener?: object
     ): this;
     /**
-     * @SINCE 1.12.0
+     * @since 1.12.0
      *
      * Detaches event handler `fnFunction` from the {@link #event:paneClosed paneClosed} event of this `sap.ui.ux3.Shell`.
      *
@@ -13515,7 +13521,7 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ShellPaneClosedEventParameters>) => void,
+      fnFunction: (p1: Shell$PaneClosedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13550,14 +13556,14 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ShellWorksetItemSelectedEventParameters>) => void,
+      fnFunction: (p1: Shell$WorksetItemSelectedEvent) => 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:feedSubmit feedSubmit} to attached listeners.
      *
@@ -13570,7 +13576,7 @@ declare module "sap/ui/ux3/Shell" {
       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:logout logout} to attached listeners.
      *
@@ -13583,7 +13589,7 @@ declare module "sap/ui/ux3/Shell" {
       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:paneBarItemSelected paneBarItemSelected} to attached listeners.
      *
@@ -13593,11 +13599,11 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ShellPaneBarItemSelectedEventParameters
+      mParameters?: Shell$PaneBarItemSelectedEventParameters
     ): this;
     /**
-     * @SINCE 1.12.0
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @since 1.12.0
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:paneClosed paneClosed} to attached listeners.
      *
@@ -13607,10 +13613,10 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ShellPaneClosedEventParameters
+      mParameters?: Shell$PaneClosedEventParameters
     ): 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:search search} to attached listeners.
      *
@@ -13623,7 +13629,7 @@ declare module "sap/ui/ux3/Shell" {
       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:worksetItemSelected worksetItemSelected} to attached listeners.
      *
@@ -13636,10 +13642,10 @@ declare module "sap/ui/ux3/Shell" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ShellWorksetItemSelectedEventParameters
+      mParameters?: Shell$WorksetItemSelectedEventParameters
     ): boolean;
     /**
-     * @SINCE 1.14.0
+     * @since 1.14.0
      *
      * Gets current value of property {@link #getAllowOverlayHeaderAccess allowOverlayHeaderAccess}.
      *
@@ -13671,7 +13677,7 @@ declare module "sap/ui/ux3/Shell" {
      */
     getAppIconTooltip(): string;
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Gets current value of property {@link #getApplyContentPadding applyContentPadding}.
      *
@@ -13699,7 +13705,7 @@ declare module "sap/ui/ux3/Shell" {
      */
     getContent(): Control[];
     /**
-     * @SINCE 1.12.0
+     * @since 1.12.0
      *
      * Gets current value of property {@link #getDesignType designType}.
      *
@@ -13711,7 +13717,7 @@ declare module "sap/ui/ux3/Shell" {
      */
     getDesignType(): ShellDesignType | keyof typeof ShellDesignType;
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Gets current value of property {@link #getFullHeightContent fullHeightContent}.
      *
@@ -13743,7 +13749,7 @@ declare module "sap/ui/ux3/Shell" {
      */
     getHeaderType(): ShellHeaderType | keyof typeof ShellHeaderType;
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Gets current value of property {@link #getLogoutButtonTooltip logoutButtonTooltip}.
      *
@@ -13754,7 +13760,7 @@ declare module "sap/ui/ux3/Shell" {
      */
     getLogoutButtonTooltip(): string;
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * Gets content of aggregation {@link #getNotificationBar notificationBar}.
      *
@@ -14195,7 +14201,7 @@ declare module "sap/ui/ux3/Shell" {
       vWorksetItem: int | string | NavigationItem
     ): NavigationItem | null;
     /**
-     * @SINCE 1.14.0
+     * @since 1.14.0
      *
      * Sets a new value for property {@link #getAllowOverlayHeaderAccess allowOverlayHeaderAccess}.
      *
@@ -14248,7 +14254,7 @@ declare module "sap/ui/ux3/Shell" {
       sAppIconTooltip?: string
     ): this;
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Sets a new value for property {@link #getApplyContentPadding applyContentPadding}.
      *
@@ -14304,7 +14310,7 @@ declare module "sap/ui/ux3/Shell" {
       bDestroyOldContent: boolean
     ): Control[];
     /**
-     * @SINCE 1.12.0
+     * @since 1.12.0
      *
      * Sets a new value for property {@link #getDesignType designType}.
      *
@@ -14323,7 +14329,7 @@ declare module "sap/ui/ux3/Shell" {
       sDesignType?: ShellDesignType | keyof typeof ShellDesignType
     ): this;
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Sets a new value for property {@link #getFullHeightContent fullHeightContent}.
      *
@@ -14362,7 +14368,7 @@ declare module "sap/ui/ux3/Shell" {
       sHeaderType?: ShellHeaderType | keyof typeof ShellHeaderType
     ): this;
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Sets a new value for property {@link #getLogoutButtonTooltip logoutButtonTooltip}.
      *
@@ -14380,8 +14386,8 @@ declare module "sap/ui/ux3/Shell" {
       sLogoutButtonTooltip?: string
     ): this;
     /**
-     * @SINCE 1.7.0
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @since 1.7.0
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Moves the complete Shell away from the right window border by the given number of pixels (left border
      * in RTL case).
@@ -14564,7 +14570,6 @@ declare module "sap/ui/ux3/Shell" {
       bShowTools?: boolean
     ): this;
   }
-  export default Shell;
 
   export interface $ShellSettings extends $ControlSettings {
     /**
@@ -14592,7 +14597,7 @@ declare module "sap/ui/ux3/Shell" {
     showLogoutButton?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * The tooltip to be displayed for the Logout Button of the Shell. If not set, a text meaning "Logout" in
      * the current language will be displayed.
@@ -14638,7 +14643,7 @@ declare module "sap/ui/ux3/Shell" {
       | `{${string}}`;
 
     /**
-     * @SINCE 1.12.0
+     * @since 1.12.0
      *
      * Defines which design type is to be used.
      */
@@ -14654,14 +14659,14 @@ declare module "sap/ui/ux3/Shell" {
     paneWidth?: int | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * Whether the Shell content area should have a theme-dependent padding or not.
      */
     applyContentPadding?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.9.0
+     * @since 1.9.0
      *
      * If set to true, the content area has a defined height. This means that any content put inside can use
      * "100%" height in CSS and will then consume all available space. However, if content is larger, scrollbars
@@ -14670,7 +14675,7 @@ declare module "sap/ui/ux3/Shell" {
     fullHeightContent?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.14.0
+     * @since 1.14.0
      *
      * Whether the Shell header (Title Area + Header Items) can be accessed when an Overlay, OverlayContainer
      * or ThingInspector is open.
@@ -14718,7 +14723,7 @@ declare module "sap/ui/ux3/Shell" {
     headerItems?: Control[] | Control | AggregationBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.7.0
+     * @since 1.7.0
      *
      * The NotificationBar which should be integrated into the Shell.
      */
@@ -14739,17 +14744,13 @@ declare module "sap/ui/ux3/Shell" {
      * is responsible for displaying the correct content for the selected one of the newly created sub-items.
      * The Shell will currently always mark the first sub-item as selected.
      */
-    worksetItemSelected?: (
-      oEvent: Event<$ShellWorksetItemSelectedEventParameters>
-    ) => void;
+    worksetItemSelected?: (oEvent: Shell$WorksetItemSelectedEvent) => void;
 
     /**
      * An item in the right-hand-side pane bar has been selected, the pane is now visible and can be filled
      * with UI elements.
      */
-    paneBarItemSelected?: (
-      oEvent: Event<$ShellPaneBarItemSelectedEventParameters>
-    ) => void;
+    paneBarItemSelected?: (oEvent: Shell$PaneBarItemSelectedEvent) => void;
 
     /**
      * Fired when the user clicks the "Log-off" button
@@ -14767,19 +14768,23 @@ declare module "sap/ui/ux3/Shell" {
     feedSubmit?: (oEvent: Event) => void;
 
     /**
-     * @SINCE 1.12.0
+     * @since 1.12.0
      *
      * Fired after a side pane of the shell is closed. It is also fired, when an open pane is closed by calling
      * setShowPane(false), if and only if the pane was opened before.
      */
-    paneClosed?: (oEvent: Event<$ShellPaneClosedEventParameters>) => void;
+    paneClosed?: (oEvent: Shell$PaneClosedEvent) => void;
   }
 
-  export interface $ShellFeedSubmitEventParameters {}
+  export interface Shell$FeedSubmitEventParameters {}
+
+  export type Shell$FeedSubmitEvent = Event<Shell$FeedSubmitEventParameters>;
 
-  export interface $ShellLogoutEventParameters {}
+  export interface Shell$LogoutEventParameters {}
 
-  export interface $ShellPaneBarItemSelectedEventParameters {
+  export type Shell$LogoutEvent = Event<Shell$LogoutEventParameters>;
+
+  export interface Shell$PaneBarItemSelectedEventParameters {
     /**
      * The ID of the selected PaneBarItem.
      */
@@ -14796,16 +14801,22 @@ declare module "sap/ui/ux3/Shell" {
     key?: string;
   }
 
-  export interface $ShellPaneClosedEventParameters {
+  export type Shell$PaneBarItemSelectedEvent = Event<Shell$PaneBarItemSelectedEventParameters>;
+
+  export interface Shell$PaneClosedEventParameters {
     /**
      * The id of the PaneBarItem to which the closed pane belonged.
      */
     id?: string;
   }
 
-  export interface $ShellSearchEventParameters {}
+  export type Shell$PaneClosedEvent = Event<Shell$PaneClosedEventParameters>;
+
+  export interface Shell$SearchEventParameters {}
+
+  export type Shell$SearchEvent = Event<Shell$SearchEventParameters>;
 
-  export interface $ShellWorksetItemSelectedEventParameters {
+  export interface Shell$WorksetItemSelectedEventParameters {
     /**
      * The id of the workset item that has been newly selected by the user. If a top-level item has been clicked
      * which has sub-items, the ID of the currently active sub-item (/leaf) is given.
@@ -14822,23 +14833,25 @@ declare module "sap/ui/ux3/Shell" {
      */
     key?: string;
   }
+
+  export type Shell$WorksetItemSelectedEvent = Event<Shell$WorksetItemSelectedEventParameters>;
 }
 
 declare module "sap/ui/ux3/ThingAction" {
   import { default as UI5Element, $ElementSettings } from "sap/ui/core/Element";
 
-  import Event from "sap/ui/base/Event";
-
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38)
    *
    * Thing Action for Swatch, QuickView, Thinginspector
    */
-  class ThingAction extends UI5Element {
+  export default class ThingAction extends UI5Element {
     /**
      * Constructor for a new ThingAction.
      *
@@ -14918,7 +14931,7 @@ declare module "sap/ui/ux3/ThingAction" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ThingActionSelectEventParameters>) => void,
+      fnFunction: (p1: ThingAction$SelectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingAction` itself
        */
@@ -14938,7 +14951,7 @@ declare module "sap/ui/ux3/ThingAction" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ThingActionSelectEventParameters>) => void,
+      fnFunction: (p1: ThingAction$SelectEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingAction` itself
        */
@@ -14955,14 +14968,14 @@ declare module "sap/ui/ux3/ThingAction" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ThingActionSelectEventParameters>) => void,
+      fnFunction: (p1: ThingAction$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:select select} to attached listeners.
      *
@@ -14972,7 +14985,7 @@ declare module "sap/ui/ux3/ThingAction" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ThingActionSelectEventParameters
+      mParameters?: ThingAction$SelectEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getEnabled enabled}.
@@ -15025,7 +15038,6 @@ declare module "sap/ui/ux3/ThingAction" {
       sText?: string
     ): this;
   }
-  export default ThingAction;
 
   export interface $ThingActionSettings extends $ElementSettings {
     /**
@@ -15041,10 +15053,10 @@ declare module "sap/ui/ux3/ThingAction" {
     /**
      * Event will be fired when the action was triggered.
      */
-    select?: (oEvent: Event<$ThingActionSelectEventParameters>) => void;
+    select?: (oEvent: ThingAction$SelectEvent) => void;
   }
 
-  export interface $ThingActionSelectEventParameters {
+  export interface ThingAction$SelectEventParameters {
     /**
      * Id of selected action
      */
@@ -15055,6 +15067,8 @@ declare module "sap/ui/ux3/ThingAction" {
      */
     action?: ThingAction;
   }
+
+  export type ThingAction$SelectEvent = Event<ThingAction$SelectEventParameters>;
 }
 
 declare module "sap/ui/ux3/ThingGroup" {
@@ -15074,7 +15088,7 @@ declare module "sap/ui/ux3/ThingGroup" {
    *
    * Thing Group Area
    */
-  class ThingGroup extends UI5Element {
+  export default class ThingGroup extends UI5Element {
     /**
      * Constructor for a new ThingGroup.
      *
@@ -15328,7 +15342,6 @@ declare module "sap/ui/ux3/ThingGroup" {
       sTitle?: string
     ): this;
   }
-  export default ThingGroup;
 
   export interface $ThingGroupSettings extends $ElementSettings {
     /**
@@ -15366,8 +15379,6 @@ declare module "sap/ui/ux3/ThingInspector" {
 
   import ThingGroup from "sap/ui/ux3/ThingGroup";
 
-  import Event from "sap/ui/base/Event";
-
   import ActionBar from "sap/ui/ux3/ActionBar";
 
   import { FollowActionState, ThingViewerHeaderType } from "sap/ui/ux3/library";
@@ -15381,12 +15392,14 @@ declare module "sap/ui/ux3/ThingInspector" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
    * @deprecated (since 1.38) - There is not an exact replacement.
    *
    * Thing Inspector
    */
-  class ThingInspector extends Overlay {
+  export default class ThingInspector extends Overlay {
     /**
      * Constructor for a new ThingInspector.
      *
@@ -15511,9 +15524,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ThingInspectorActionSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ThingInspector$ActionSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingInspector` itself
        */
@@ -15534,9 +15545,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ThingInspectorActionSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ThingInspector$ActionSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingInspector` itself
        */
@@ -15562,9 +15571,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ThingInspectorFacetSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ThingInspector$FacetSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingInspector` itself
        */
@@ -15585,9 +15592,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ThingInspectorFacetSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ThingInspector$FacetSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingInspector` itself
        */
@@ -15612,7 +15617,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ThingInspectorFeedSubmitEventParameters>) => void,
+      fnFunction: (p1: ThingInspector$FeedSubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingInspector` itself
        */
@@ -15632,7 +15637,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ThingInspectorFeedSubmitEventParameters>) => void,
+      fnFunction: (p1: ThingInspector$FeedSubmitEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingInspector` itself
        */
@@ -15680,9 +15685,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ThingInspectorActionSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ThingInspector$ActionSelectedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15700,9 +15703,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (
-        p1: Event<$ThingInspectorFacetSelectedEventParameters>
-      ) => void,
+      fnFunction: (p1: ThingInspector$FacetSelectedEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15719,14 +15720,14 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ThingInspectorFeedSubmitEventParameters>) => void,
+      fnFunction: (p1: ThingInspector$FeedSubmitEvent) => 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:actionSelected actionSelected} to attached listeners.
      *
@@ -15736,10 +15737,10 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ThingInspectorActionSelectedEventParameters
+      mParameters?: ThingInspector$ActionSelectedEventParameters
     ): 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:facetSelected facetSelected} to attached listeners.
      *
@@ -15752,10 +15753,10 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ThingInspectorFacetSelectedEventParameters
+      mParameters?: ThingInspector$FacetSelectedEventParameters
     ): boolean;
     /**
-     * @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:feedSubmit feedSubmit} to attached listeners.
      *
@@ -15765,7 +15766,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ThingInspectorFeedSubmitEventParameters
+      mParameters?: ThingInspector$FeedSubmitEventParameters
     ): this;
     /**
      * Gets content of aggregation {@link #getActionBar actionBar}.
@@ -15866,7 +15867,7 @@ declare module "sap/ui/ux3/ThingInspector" {
      */
     getHeaderContent(): ThingGroup[];
     /**
-     * @SINCE 1.16.3
+     * @since 1.16.3
      *
      * Gets current value of property {@link #getHeaderType headerType}.
      *
@@ -16241,7 +16242,7 @@ declare module "sap/ui/ux3/ThingInspector" {
       sFollowState?: FollowActionState | keyof typeof FollowActionState
     ): this;
     /**
-     * @SINCE 1.16.3
+     * @since 1.16.3
      *
      * Sets a new value for property {@link #getHeaderType headerType}.
      *
@@ -16334,7 +16335,6 @@ declare module "sap/ui/ux3/ThingInspector" {
       bUpdateActionEnabled?: boolean
     ): this;
   }
-  export default ThingInspector;
 
   export interface $ThingInspectorSettings extends $OverlaySettings {
     /**
@@ -16396,7 +16396,7 @@ declare module "sap/ui/ux3/ThingInspector" {
     flagActionEnabled?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.16.3
+     * @since 1.16.3
      *
      * Defines which header type should be used.
      */
@@ -16454,27 +16454,21 @@ declare module "sap/ui/ux3/ThingInspector" {
     /**
      * Further thing related Action selected
      */
-    actionSelected?: (
-      oEvent: Event<$ThingInspectorActionSelectedEventParameters>
-    ) => void;
+    actionSelected?: (oEvent: ThingInspector$ActionSelectedEvent) => void;
 
     /**
      * Event for facet selection. The application is responsible for displaying the correct content for the
      * selected one. The ThingInspector will currently always mark the first facet as selected.
      */
-    facetSelected?: (
-      oEvent: Event<$ThingInspectorFacetSelectedEventParameters>
-    ) => void;
+    facetSelected?: (oEvent: ThingInspector$FacetSelectedEvent) => void;
 
     /**
      * Fired when a new feed entry is submitted.
      */
-    feedSubmit?: (
-      oEvent: Event<$ThingInspectorFeedSubmitEventParameters>
-    ) => void;
+    feedSubmit?: (oEvent: ThingInspector$FeedSubmitEvent) => void;
   }
 
-  export interface $ThingInspectorActionSelectedEventParameters {
+  export interface ThingInspector$ActionSelectedEventParameters {
     /**
      * Id of selected ThingAction
      */
@@ -16486,7 +16480,9 @@ declare module "sap/ui/ux3/ThingInspector" {
     action?: ThingAction;
   }
 
-  export interface $ThingInspectorFacetSelectedEventParameters {
+  export type ThingInspector$ActionSelectedEvent = Event<ThingInspector$ActionSelectedEventParameters>;
+
+  export interface ThingInspector$FacetSelectedEventParameters {
     /**
      * Id of selected NavigationItem
      */
@@ -16503,12 +16499,16 @@ declare module "sap/ui/ux3/ThingInspector" {
     key?: string;
   }
 
-  export interface $ThingInspectorFeedSubmitEventParameters {
+  export type ThingInspector$FacetSelectedEvent = Event<ThingInspector$FacetSelectedEventParameters>;
+
+  export interface ThingInspector$FeedSubmitEventParameters {
     /**
      * Feed text
      */
     text?: string;
   }
+
+  export type ThingInspector$FeedSubmitEvent = Event<ThingInspector$FeedSubmitEventParameters>;
 }
 
 declare module "sap/ui/ux3/ThingViewer" {
@@ -16518,8 +16518,6 @@ declare module "sap/ui/ux3/ThingViewer" {
 
   import ThingGroup from "sap/ui/ux3/ThingGroup";
 
-  import Event from "sap/ui/base/Event";
-
   import ActionBar from "sap/ui/ux3/ActionBar";
 
   import { ThingViewerHeaderType } from "sap/ui/ux3/library";
@@ -16533,15 +16531,17 @@ declare module "sap/ui/ux3/ThingViewer" {
     AggregationBindingInfo,
   } from "sap/ui/base/ManagedObject";
 
+  import Event from "sap/ui/base/Event";
+
   /**
-   * @SINCE 1.9.1
+   * @since 1.9.1
    * @deprecated (since 1.38) - There is not an exact replacement.
    *
    * ThingViewer: Same as ThingInspector but decoupled from the Overlay and the ActionBar. The control can
    * be added to a Parent container that has a defined width. The ThingViewer fill the whole container. If
    * the parent container has no width defined the control will not work properly.
    */
-  class ThingViewer extends Control {
+  export default class ThingViewer extends Control {
     /**
      * Constructor for a new ThingViewer.
      *
@@ -16655,7 +16655,7 @@ declare module "sap/ui/ux3/ThingViewer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ThingViewerFacetSelectedEventParameters>) => void,
+      fnFunction: (p1: ThingViewer$FacetSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingViewer` itself
        */
@@ -16676,7 +16676,7 @@ declare module "sap/ui/ux3/ThingViewer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ThingViewerFacetSelectedEventParameters>) => void,
+      fnFunction: (p1: ThingViewer$FacetSelectedEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ThingViewer` itself
        */
@@ -16718,14 +16718,14 @@ declare module "sap/ui/ux3/ThingViewer" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ThingViewerFacetSelectedEventParameters>) => void,
+      fnFunction: (p1: ThingViewer$FacetSelectedEvent) => 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:facetSelected facetSelected} to attached listeners.
      *
@@ -16738,7 +16738,7 @@ declare module "sap/ui/ux3/ThingViewer" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ThingViewerFacetSelectedEventParameters
+      mParameters?: ThingViewer$FacetSelectedEventParameters
     ): boolean;
     /**
      * Gets content of aggregation {@link #getActionBar actionBar}.
@@ -16765,7 +16765,7 @@ declare module "sap/ui/ux3/ThingViewer" {
      */
     getHeaderContent(): ThingGroup[];
     /**
-     * @SINCE 1.16.3
+     * @since 1.16.3
      *
      * Gets current value of property {@link #getHeaderType headerType}.
      *
@@ -16989,7 +16989,7 @@ declare module "sap/ui/ux3/ThingViewer" {
       oActionBar: ActionBar
     ): this;
     /**
-     * @SINCE 1.16.3
+     * @since 1.16.3
      *
      * Sets a new value for property {@link #getHeaderType headerType}.
      *
@@ -17114,7 +17114,6 @@ declare module "sap/ui/ux3/ThingViewer" {
       sWidth?: CSSSize
     ): this;
   }
-  export default ThingViewer;
 
   export interface $ThingViewerSettings extends $ControlSettings {
     /**
@@ -17148,7 +17147,7 @@ declare module "sap/ui/ux3/ThingViewer" {
     height?: CSSSize | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.16.3
+     * @since 1.16.3
      *
      * Defines which header type should be used.
      */
@@ -17198,12 +17197,10 @@ declare module "sap/ui/ux3/ThingViewer" {
      * Event for facet selection. The application is responsible for displaying the correct content for the
      * selected one. The ThingInspector will currently always mark the first facet as selected.
      */
-    facetSelected?: (
-      oEvent: Event<$ThingViewerFacetSelectedEventParameters>
-    ) => void;
+    facetSelected?: (oEvent: ThingViewer$FacetSelectedEvent) => void;
   }
 
-  export interface $ThingViewerFacetSelectedEventParameters {
+  export interface ThingViewer$FacetSelectedEventParameters {
     /**
      * Id of selected NavigationItem
      */
@@ -17219,6 +17216,8 @@ declare module "sap/ui/ux3/ThingViewer" {
      */
     key?: string;
   }
+
+  export type ThingViewer$FacetSelectedEvent = Event<ThingViewer$FacetSelectedEventParameters>;
 }
 
 declare module "sap/ui/ux3/ToolPopup" {
@@ -17245,7 +17244,7 @@ declare module "sap/ui/ux3/ToolPopup" {
    * look like any common dialog box. A ToolPopup can have any content. Depending on the application type
    * and design, the structure of the texts and input fields can be for example form-like.
    */
-  class ToolPopup extends Control implements PopupInterface {
+  export default class ToolPopup extends Control implements PopupInterface {
     __implements__sap_ui_core_PopupInterface: boolean;
     /**
      * Constructor for a new ToolPopup.
@@ -17330,7 +17329,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       oContent: Control
     ): this;
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Adds an ID to the Popup that should be focusable as well when using `autoclose`. Chaining is only possible
      * if a valid type (string) is given.
@@ -17454,7 +17453,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ToolPopupEnterEventParameters>) => void,
+      fnFunction: (p1: ToolPopup$EnterEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ToolPopup` itself
        */
@@ -17474,7 +17473,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event<$ToolPopupEnterEventParameters>) => void,
+      fnFunction: (p1: ToolPopup$EnterEvent) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.ux3.ToolPopup` itself
        */
@@ -17573,7 +17572,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       oListener?: object
     ): this;
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Attaches event handler `fnFunction` to the {@link #event:opened opened} event of this `sap.ui.ux3.ToolPopup`.
      *
@@ -17600,7 +17599,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       oListener?: object
     ): this;
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Attaches event handler `fnFunction` to the {@link #event:opened opened} event of this `sap.ui.ux3.ToolPopup`.
      *
@@ -17690,7 +17689,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event<$ToolPopupEnterEventParameters>) => void,
+      fnFunction: (p1: ToolPopup$EnterEvent) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -17731,7 +17730,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       oListener?: object
     ): this;
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Detaches event handler `fnFunction` from the {@link #event:opened opened} event of this `sap.ui.ux3.ToolPopup`.
      *
@@ -17750,7 +17749,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       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:close close} to attached listeners.
      *
@@ -17766,7 +17765,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       mParameters?: object
     ): boolean;
     /**
-     * @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:closed closed} to attached listeners.
      *
@@ -17779,7 +17778,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       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:enter enter} to attached listeners.
      *
@@ -17789,10 +17788,10 @@ declare module "sap/ui/ux3/ToolPopup" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: $ToolPopupEnterEventParameters
+      mParameters?: ToolPopup$EnterEventParameters
     ): 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:iconChanged iconChanged} to attached listeners.
      *
@@ -17805,7 +17804,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       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:open open} to attached listeners.
      *
@@ -17818,8 +17817,8 @@ declare module "sap/ui/ux3/ToolPopup" {
       mParameters?: object
     ): this;
     /**
-     * @SINCE 1.19.0
-     * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
+     * @since 1.19.0
+     * @ui5-protected Do not call from applications (only from related classes in the framework)
      *
      * Fires event {@link #event:opened opened} to attached listeners.
      *
@@ -17832,7 +17831,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       mParameters?: object
     ): this;
     /**
-     * @SINCE 1.13.2
+     * @since 1.13.2
      *
      * Gets current value of property {@link #getAutoClose autoClose}.
      *
@@ -17852,7 +17851,7 @@ declare module "sap/ui/ux3/ToolPopup" {
      */
     getButtons(): Control[];
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Gets current value of property {@link #getCloseDuration closeDuration}.
      *
@@ -17870,14 +17869,14 @@ declare module "sap/ui/ux3/ToolPopup" {
      */
     getContent(): Control[];
     /**
-     * @SINCE 1.20.1
+     * @since 1.20.1
      *
      * ID of the element which is the current target of the association {@link #getDefaultButton defaultButton},
      * or `null`.
      */
     getDefaultButton(): ID;
     /**
-     * @SINCE 1.13.1
+     * @since 1.13.1
      *
      * Indicates whether the ToolPopup is currently enabled or not.
      *
@@ -17923,7 +17922,7 @@ declare module "sap/ui/ux3/ToolPopup" {
      */
     getInitialFocus(): ID;
     /**
-     * @SINCE 1.11.1
+     * @since 1.11.1
      *
      * Gets current value of property {@link #getInverted inverted}.
      *
@@ -17936,7 +17935,7 @@ declare module "sap/ui/ux3/ToolPopup" {
      */
     getInverted(): boolean;
     /**
-     * @SINCE 1.13.2
+     * @since 1.13.2
      *
      * Gets current value of property {@link #getMaxHeight maxHeight}.
      *
@@ -17947,7 +17946,7 @@ declare module "sap/ui/ux3/ToolPopup" {
      */
     getMaxHeight(): CSSSize;
     /**
-     * @SINCE 1.15.0
+     * @since 1.15.0
      *
      * Gets current value of property {@link #getMaxWidth maxWidth}.
      *
@@ -17970,7 +17969,7 @@ declare module "sap/ui/ux3/ToolPopup" {
      */
     getModal(): boolean;
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Gets current value of property {@link #getOpenDuration openDuration}.
      *
@@ -18112,7 +18111,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       vContent: int | string | Control
     ): Control | null;
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Removes an ID to the Popup that should be focusable as well when using `autoclose`. Chaining is only
      * possible if a valid type (string) is given.
@@ -18124,7 +18123,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       sID?: string
     ): void;
     /**
-     * @SINCE 1.13.2
+     * @since 1.13.2
      *
      * Sets a new value for property {@link #getAutoClose autoClose}.
      *
@@ -18145,13 +18144,13 @@ declare module "sap/ui/ux3/ToolPopup" {
       bAutoClose?: boolean
     ): this;
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * This is just a forward to the Popup's function (sap.ui.core.Popup.setAutoCloseAreas) with the same functionality.
      */
     setAutoCloseAreas(aAutoCloseAreas: Element[]): void;
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Sets a new value for property {@link #getCloseDuration closeDuration}.
      *
@@ -18170,7 +18169,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       iCloseDuration?: int
     ): this;
     /**
-     * @SINCE 1.20.1
+     * @since 1.20.1
      *
      * Sets the associated {@link #getDefaultButton defaultButton}.
      *
@@ -18196,7 +18195,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       oInitialFocus: ID | Control
     ): this;
     /**
-     * @SINCE 1.11.1
+     * @since 1.11.1
      *
      * Sets a new value for property {@link #getInverted inverted}.
      *
@@ -18216,7 +18215,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       bInverted?: boolean
     ): this;
     /**
-     * @SINCE 1.13.2
+     * @since 1.13.2
      *
      * Sets a new value for property {@link #getMaxHeight maxHeight}.
      *
@@ -18254,7 +18253,7 @@ declare module "sap/ui/ux3/ToolPopup" {
       bModal?: boolean
     ): this;
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Sets a new value for property {@link #getOpenDuration openDuration}.
      *
@@ -18304,7 +18303,6 @@ declare module "sap/ui/ux3/ToolPopup" {
       sTitle?: string
     ): this;
   }
-  export default ToolPopup;
 
   export interface $ToolPopupSettings extends $ControlSettings {
     /**
@@ -18340,7 +18338,7 @@ declare module "sap/ui/ux3/ToolPopup" {
     modal?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.11.1
+     * @since 1.11.1
      *
      * Specifies whether the ToolPopup has a dark or bright background. If set to true the background and borders
      * will be dark. If false they will be bright. This property only has an effect for the GoldReflection-theme.
@@ -18348,7 +18346,7 @@ declare module "sap/ui/ux3/ToolPopup" {
     inverted?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.13.2
+     * @since 1.13.2
      *
      * Determines whether the ToolPopup will auto close when it loses focus. If the user e.g. clicks outside
      * of the ToolPopup it will be closed. Please don't use "modal" and "autoclose" at the same time. In this
@@ -18357,7 +18355,7 @@ declare module "sap/ui/ux3/ToolPopup" {
     autoClose?: boolean | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.13.2
+     * @since 1.13.2
      *
      * Forces a maximum height of the ToolPopup in pixels. If the ToolPopup content is higher than the ToolPopup,
      * the content will be scrollable.
@@ -18365,21 +18363,21 @@ declare module "sap/ui/ux3/ToolPopup" {
     maxHeight?: CSSSize | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.15.0
+     * @since 1.15.0
      *
      * Forces a maximum width of the ToolPopup in pixels.
      */
     maxWidth?: CSSSize | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Time in milliseconds for the open animation.
      */
     openDuration?: int | PropertyBindingInfo | `{${string}}`;
 
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Time in milliseconds for the close animation.
      */
@@ -18408,7 +18406,7 @@ declare module "sap/ui/ux3/ToolPopup" {
     opener?: Control | string;
 
     /**
-     * @SINCE 1.20.1
+     * @since 1.20.1
      *
      * Defines one of the buttons that have been provided via button aggregation to be the default button. This
      * default button is initially selected, if no control is set via the initialFocus association explicitly.
@@ -18431,7 +18429,7 @@ declare module "sap/ui/ux3/ToolPopup" {
     /**
      * Event is fired whenever the user clicks the Enter or the Enter key inside the pop up
      */
-    enter?: (oEvent: Event<$ToolPopupEnterEventParameters>) => void;
+    enter?: (oEvent: ToolPopup$EnterEvent) => void;
 
     /**
      * Event is fired when one of the icon properties is modified (Note: The icon is not rendered by the ToolPopup).
@@ -18446,18 +18444,22 @@ declare module "sap/ui/ux3/ToolPopup" {
     closed?: (oEvent: Event) => void;
 
     /**
-     * @SINCE 1.19.0
+     * @since 1.19.0
      *
      * Event is being fired after the ToolPopup has been opened.
      */
     opened?: (oEvent: Event) => void;
   }
 
-  export interface $ToolPopupCloseEventParameters {}
+  export interface ToolPopup$CloseEventParameters {}
+
+  export type ToolPopup$CloseEvent = Event<ToolPopup$CloseEventParameters>;
+
+  export interface ToolPopup$ClosedEventParameters {}
 
-  export interface $ToolPopupClosedEventParameters {}
+  export type ToolPopup$ClosedEvent = Event<ToolPopup$ClosedEventParameters>;
 
-  export interface $ToolPopupEnterEventParameters {
+  export interface ToolPopup$EnterEventParameters {
     /**
      * The onsapenter event, received by the pop up
      */
@@ -18469,11 +18471,19 @@ declare module "sap/ui/ux3/ToolPopup" {
     originalSrcControl?: Control;
   }
 
-  export interface $ToolPopupIconChangedEventParameters {}
+  export type ToolPopup$EnterEvent = Event<ToolPopup$EnterEventParameters>;
+
+  export interface ToolPopup$IconChangedEventParameters {}
+
+  export type ToolPopup$IconChangedEvent = Event<ToolPopup$IconChangedEventParameters>;
+
+  export interface ToolPopup$OpenEventParameters {}
+
+  export type ToolPopup$OpenEvent = Event<ToolPopup$OpenEventParameters>;
 
-  export interface $ToolPopupOpenEventParameters {}
+  export interface ToolPopup$OpenedEventParameters {}
 
-  export interface $ToolPopupOpenedEventParameters {}
+  export type ToolPopup$OpenedEvent = Event<ToolPopup$OpenedEventParameters>;
 }
 
 declare namespace sap {