diff --git a/packages/fiori/src/SideNavigation.js b/packages/fiori/src/SideNavigation.js
index 646671821d51..16dbc074f5b3 100644
--- a/packages/fiori/src/SideNavigation.js
+++ b/packages/fiori/src/SideNavigation.js
@@ -39,7 +39,7 @@ const metadata = {
 	slots: /** @lends sap.ui.webcomponents.fiori.SideNavigation.prototype */ {
 		/**
 		 * Defines the main items of the <code>ui5-side-navigation</code>. Use the <code>ui5-side-navigation-item</code> component
-		 * for the top-level items, and the <code>ui5-side-navigation-subitem</code> component for second-level items, nested
+		 * for the top-level items, and the <code>ui5-side-navigation-sub-item</code> component for second-level items, nested
 		 * inside the items.
 		 *
 		 * @public
@@ -53,7 +53,7 @@ const metadata = {
 
 		/**
 		 * Defines the fixed items at the bottom of the <code>ui5-side-navigation</code>. Use the <code>ui5-side-navigation-item</code> component
-		 * for the fixed items, and optionally the <code>ui5-side-navigation-subitem</code> component to provide second-level items inside them.
+		 * for the fixed items, and optionally the <code>ui5-side-navigation-sub-item</code> component to provide second-level items inside them.
 		 *
 		 * <b>Note:</b> In order to achieve the best user experience, it is recommended that you keep the fixed items "flat" (do not pass sub-items)
 		 *
diff --git a/packages/main/src/DatePicker.js b/packages/main/src/DatePicker.js
index 60f6d4c3106f..c530d1f61702 100644
--- a/packages/main/src/DatePicker.js
+++ b/packages/main/src/DatePicker.js
@@ -142,7 +142,7 @@ const metadata = {
 		},
 
 		/**
-		 * Defines whether the <code>ui5-datepicker</code> is required.
+		 * Defines whether the <code>ui5-date-picker</code> is required.
 		 *
 		 * @since 1.0.0-rc.9
 		 * @type {Boolean}
diff --git a/packages/main/src/FileUploader.js b/packages/main/src/FileUploader.js
index 36e04aa6d679..f56fccbe15e9 100644
--- a/packages/main/src/FileUploader.js
+++ b/packages/main/src/FileUploader.js
@@ -168,7 +168,7 @@ const metadata = {
 		 * <b>Note:</b> If not specified, a default text (in the respective language) will be displayed.
 		 * <br>
 		 * <b>Note:</b> The <code>valueStateMessage</code> would be displayed,
-		 * when the <code>ui5--file-uploader</code> is in <code>Information</code>, <code>Warning</code> or <code>Error</code> value state.
+		 * when the <code>ui5-file-uploader</code> is in <code>Information</code>, <code>Warning</code> or <code>Error</code> value state.
 		 * @type {HTMLElement[]}
 		 * @since 1.0.0-rc.9
 		 * @slot
diff --git a/packages/main/src/MultiComboBox.js b/packages/main/src/MultiComboBox.js
index b55db7c4ead9..149c8902f892 100644
--- a/packages/main/src/MultiComboBox.js
+++ b/packages/main/src/MultiComboBox.js
@@ -87,13 +87,13 @@ const metadata = {
 	   },
 
 		/**
-		 * Defines the value state message that will be displayed as pop up under the <code>ui5-multicombobox</code>.
+		 * Defines the value state message that will be displayed as pop up under the <code>ui5-multi-combobox</code>.
 		 * <br><br>
 		 *
 		 * <b>Note:</b> If not specified, a default text (in the respective language) will be displayed.
 		 * <br>
 		 * <b>Note:</b> The <code>valueStateMessage</code> would be displayed,
-		 * when the <code>ui5-select</code> is in <code>Information</code>, <code>Warning</code> or <code>Error</code> value state.
+		 * when the <code>ui5-multi-combobox</code> is in <code>Information</code>, <code>Warning</code> or <code>Error</code> value state.
 		 * @type {HTMLElement[]}
 		 * @since 1.0.0-rc.9
 		 * @slot
diff --git a/packages/main/src/MultiComboBoxItem.js b/packages/main/src/MultiComboBoxItem.js
index a521428949ea..476743aefeee 100644
--- a/packages/main/src/MultiComboBoxItem.js
+++ b/packages/main/src/MultiComboBoxItem.js
@@ -18,7 +18,7 @@ const metadata = {
 
 /**
  * @class
- * The <code>ui5-cb-item</code> represents the item for a <code>ui5-multi-combobox</code>.
+ * The <code>ui5-mcb-item</code> represents the item for a <code>ui5-multi-combobox</code>.
  *
  * @constructor
  * @author SAP SE