diff --git a/packages/main/src/ComboBox.ts b/packages/main/src/ComboBox.ts
index 199caced910f..9ada9efca5d0 100644
--- a/packages/main/src/ComboBox.ts
+++ b/packages/main/src/ComboBox.ts
@@ -402,7 +402,7 @@ class ComboBox extends UI5Element implements IFormInputElement {
 	 * **Note:** If not specified, a default text (in the respective language) will be displayed.
 	 *
 	 * **Note:** The `valueStateMessage` would be displayed,
-	 * when the `ui5-combobox` is in `Information`, `Warning` or `Error` value state.
+	 * when the `ui5-combobox` is in `Information`, `Critical` or `Negative` value state.
 	 * @since 1.0.0-rc.9
 	 * @public
 	 */
diff --git a/packages/main/src/DatePicker.ts b/packages/main/src/DatePicker.ts
index a4d20cb1362e..d2f1fcdb545a 100644
--- a/packages/main/src/DatePicker.ts
+++ b/packages/main/src/DatePicker.ts
@@ -365,7 +365,7 @@ class DatePicker extends DateComponentBase implements IFormInputElement {
 	 * **Note:** If not specified, a default text (in the respective language) will be displayed.
 	 *
 	 * **Note:** The `valueStateMessage` would be displayed,
-	 * when the component is in `Information`, `Warning` or `Error` value state.
+	 * when the component is in `Information`, `Critical` or `Negative` value state.
 	 * @since 1.0.0-rc.7
 	 * @public
 	 */
diff --git a/packages/main/src/FileUploader.ts b/packages/main/src/FileUploader.ts
index d880086158ff..c03ef92af991 100644
--- a/packages/main/src/FileUploader.ts
+++ b/packages/main/src/FileUploader.ts
@@ -186,7 +186,7 @@ class FileUploader extends UI5Element implements IFormInputElement {
 	 * **Note:** If not specified, a default text (in the respective language) will be displayed.
 	 *
 	 * **Note:** The `valueStateMessage` would be displayed,
-	 * when the component is in `Information`, `Warning` or `Error` value state.
+	 * when the component is in `Information`, `Critical` or `Negative` value state.
 	 * @since 1.0.0-rc.9
 	 * @public
 	 */
diff --git a/packages/main/src/Input.ts b/packages/main/src/Input.ts
index b91828aab1ad..7e4adaeff63a 100644
--- a/packages/main/src/Input.ts
+++ b/packages/main/src/Input.ts
@@ -158,7 +158,7 @@ type InputSuggestionScrollEventDetail = {
  *
  * The text field can be editable or read-only (`readonly` property),
  * and it can be enabled or disabled (`disabled` property).
- * To visualize semantic states, such as "error" or "warning", the `valueState` property is provided.
+ * To visualize semantic states, such as "Negative" or "Critical", the `valueState` property is provided.
  * When the user makes changes to the text, the change event is fired,
  * which enables you to react on any text change.
  *
@@ -530,7 +530,7 @@ class Input extends UI5Element implements SuggestionComponent, IFormInputElement
 	 * **Note:** If not specified, a default text (in the respective language) will be displayed.
 	 *
 	 * **Note:** The `valueStateMessage` would be displayed,
-	 * when the component is in `Information`, `Warning` or `Error` value state.
+	 * when the component is in `Information`, `Critical` or `Negative` value state.
 	 *
 	 * **Note:** If the component has `suggestionItems`,
 	 * the `valueStateMessage` would be displayed as part of the same popover, if used on desktop, or dialog - on phone.
diff --git a/packages/main/src/MultiComboBox.ts b/packages/main/src/MultiComboBox.ts
index d3db25dc016e..da5901f20065 100644
--- a/packages/main/src/MultiComboBox.ts
+++ b/packages/main/src/MultiComboBox.ts
@@ -471,7 +471,7 @@ class MultiComboBox extends UI5Element implements IFormInputElement {
 	 * **Note:** If not specified, a default text (in the respective language) will be displayed.
 	 *
 	 * **Note:** The `valueStateMessage` would be displayed,
-	 * when the component is in `Information`, `Warning` or `Error` value state.
+	 * when the component is in `Information`, `Critical` or `Negative` value state.
 	 * @since 1.0.0-rc.9
 	 * @public
 	 */
diff --git a/packages/main/src/RatingIndicator.ts b/packages/main/src/RatingIndicator.ts
index 051e2d519f34..646323b7e734 100644
--- a/packages/main/src/RatingIndicator.ts
+++ b/packages/main/src/RatingIndicator.ts
@@ -243,6 +243,7 @@ class RatingIndicator extends UI5Element {
 
 	_onkeydown(e: KeyboardEvent) {
 		if (this.disabled || this.readonly) {
+			e.preventDefault();
 			return;
 		}
 
diff --git a/packages/main/src/Select.ts b/packages/main/src/Select.ts
index 3f1729617ca3..617387eaf712 100644
--- a/packages/main/src/Select.ts
+++ b/packages/main/src/Select.ts
@@ -306,7 +306,7 @@ class Select extends UI5Element implements IFormInputElement {
 	 * **Note:** If not specified, a default text (in the respective language) will be displayed.
 	 *
 	 * **Note:** The `valueStateMessage` would be displayed,
-	 * when the component is in `Information`, `Warning` or `Error` value state.
+	 * when the component is in `Information`, `Critical` or `Negative` value state.
 	 *
 	 * **Note:** If the component has `suggestionItems`,
 	 * the `valueStateMessage` would be displayed as part of the same popover, if used on desktop, or dialog - on phone.
diff --git a/packages/main/src/StepInput.ts b/packages/main/src/StepInput.ts
index afcca4d517b4..dbb2e0cdbfd0 100644
--- a/packages/main/src/StepInput.ts
+++ b/packages/main/src/StepInput.ts
@@ -279,7 +279,7 @@ class StepInput extends UI5Element implements IFormInputElement {
 	 * **Note:** If not specified, a default text (in the respective language) will be displayed.
 	 *
 	 * **Note:** The `valueStateMessage` would be displayed,
-	 * when the component is in `Information`, `Warning` or `Error` value state.
+	 * when the component is in `Information`, `Critical` or `Negative` value state.
 	 * @public
 	 */
 	@slot()
diff --git a/packages/main/src/TextArea.ts b/packages/main/src/TextArea.ts
index 44d9b9041581..44d31026af36 100644
--- a/packages/main/src/TextArea.ts
+++ b/packages/main/src/TextArea.ts
@@ -161,8 +161,8 @@ class TextArea extends UI5Element implements IFormInputElement {
 	 * Defines the value state of the component.
 	 *
 	 * **Note:** If `maxlength` property is set,
-	 * the component turns into "Warning" state once the characters exceeds the limit.
-	 * In this case, only the "Error" state is considered and can be applied.
+	 * the component turns into "Critical" state once the characters exceeds the limit.
+	 * In this case, only the "Negative" state is considered and can be applied.
 	 * @default "None"
 	 * @since 1.0.0-rc.7
 	 * @public
diff --git a/packages/main/src/TimePicker.ts b/packages/main/src/TimePicker.ts
index 4c769e8ba4bf..f04f6328c6b2 100644
--- a/packages/main/src/TimePicker.ts
+++ b/packages/main/src/TimePicker.ts
@@ -320,7 +320,7 @@ class TimePicker extends UI5Element implements IFormInputElement {
 	 * **Note:** If not specified, a default text (in the respective language) will be displayed.
 	 *
 	 * **Note:** The `valueStateMessage` would be displayed,
-	 * when the `ui5-time-picker` is in `Information`, `Warning` or `Error` value state.
+	 * when the `ui5-time-picker` is in `Information`, `Critical` or `Negative` value state.
 	 * @since 1.0.0-rc.8
 	 * @public
 	 */