diff --git a/src/components/selectbutton/SelectButton.vue b/src/components/selectbutton/SelectButton.vue
index 37cecac69..48e3d31e2 100644
--- a/src/components/selectbutton/SelectButton.vue
+++ b/src/components/selectbutton/SelectButton.vue
@@ -18,13 +18,12 @@ export default {
     props: {
         value: null,
         options: Array,
-		optionLabel: null,
+        optionLabel: null,
+        optionValue: null,
+        optionDisabled: null,
 		multiple: Boolean,
         disabled: Boolean,
-        dataKey: null,
-        name: String,
-        optionValue: null,
-        optionDisabled: null
+        dataKey: null
     },
     data() {
         return {
diff --git a/src/views/dropdown/DropdownDoc.vue b/src/views/dropdown/DropdownDoc.vue
index ff93acfe1..89c65486c 100644
--- a/src/views/dropdown/DropdownDoc.vue
+++ b/src/views/dropdown/DropdownDoc.vue
@@ -8,7 +8,7 @@ import Dropdown from 'primevue/dropdown';
 </CodeHighlight>
 
 				<h3>Getting Started</h3>
-				<p>Dropdown requires a value to bind and a collection of arbitrary objects along with the <i>optionLabel</i> property to specify the field name of the option.</p>
+				<p>Dropdown requires a value to bind and a collection of arbitrary objects along with the <i>optionLabel</i> property to specify the label property of the option.</p>
 <CodeHighlight>
 &lt;Dropdown v-model=&quot;selectedCity&quot; :options=&quot;cities&quot; optionLabel=&quot;name&quot; placeholder=&quot;Select a City&quot; /&gt;
 </CodeHighlight>
diff --git a/src/views/multiselect/MultiSelectDoc.vue b/src/views/multiselect/MultiSelectDoc.vue
index 60a4ddfc9..57c3ed4f2 100644
--- a/src/views/multiselect/MultiSelectDoc.vue
+++ b/src/views/multiselect/MultiSelectDoc.vue
@@ -8,7 +8,7 @@ import MultiSelect from 'primevue/multiselect';
 </CodeHighlight>
 
 				<h3>Getting Started</h3>
-				<p>MultiSelect requires a value to bind and a collection of arbitrary objects along with the <i>optionLabel</i> property to specify the field name of the option.</p>
+				<p>MultiSelect requires a value to bind and a collection of arbitrary objects along with the <i>optionLabel</i> property to specify the label property of the option.</p>
 <CodeHighlight>
 &lt;MultiSelect v-model=&quot;selectedCars&quot; :options=&quot;cars&quot; optionLabel=&quot;brand&quot; placeholder=&quot;Select Brands&quot; /&gt;
 </CodeHighlight>
diff --git a/src/views/selectbutton/SelectButtonDoc.vue b/src/views/selectbutton/SelectButtonDoc.vue
index c7dc87113..911d27794 100644
--- a/src/views/selectbutton/SelectButtonDoc.vue
+++ b/src/views/selectbutton/SelectButtonDoc.vue
@@ -8,7 +8,7 @@ import SelectButton from 'primevue/selectbutton';
 </CodeHighlight>
 
 				<h3>Getting Started</h3>
-				<p>SelectButton requires a value to bind, optionLabel and a collection of options. How to define the options property; Providing an array of arbitrary objects along with the <i>optionLabel</i> property to specify the field name of the option.</p>
+				<p>SelectButton requires a value to bind and a collection of arbitrary objects along with the <i>optionLabel</i> property to specify the label property of the option.</p>
 <CodeHighlight>
 &lt;SelectButton v-model=&quot;selectedCity&quot; :options=&quot;cities&quot; optionLabel=&quot;name&quot; /&gt;
 </CodeHighlight>
@@ -34,11 +34,8 @@ export default {
 &lt;SelectButton v-model=&quot;selectedCity&quot; :options=&quot;cities&quot; optionLabel=&quot;brand&quot; :multiple=&quot;true&quot; /&gt;
 </CodeHighlight>
 
-				<h3>Disabled Options</h3>
-				<p>Particular options can be prevented from selection using the optionDisabled property.</p>
-
 				<h3>Templating</h3>
-				<p>Items support templating to display custom content inside the buttons using an template that receives the option as the implicit variable. </p>
+				<p>Label of an option is used as the display text of an item by default, for custom content support define an <i>option</i> template that gets the option instance as a parameter.</p>
 <CodeHighlight>
 <template v-pre>
 &lt;SelectButton v-model=&quot;selectedCar&quot; :options=&quot;cars&quot; optionLabel=&quot;brand&quot;&gt;
@@ -56,68 +53,62 @@ export default {
 				<div class="doc-tablewrapper">
 					<table class="doc-table">
 						<thead>
-						<tr>
-							<th>Name</th>
-							<th>Type</th>
-							<th>Default</th>
-							<th>Description</th>
-						</tr>
+                            <tr>
+                                <th>Name</th>
+                                <th>Type</th>
+                                <th>Default</th>
+                                <th>Description</th>
+                            </tr>
 						</thead>
 						<tbody>
-						<tr>
-							<td>value</td>
-							<td>any</td>
-							<td>null</td>
-							<td>Value of the component.</td>
-						</tr>
-						<tr>
-							<td>options</td>
-							<td>array</td>
-							<td>null</td>
-							<td>An array of objects to display as the available options.</td>
-						</tr>
-						<tr>
-							<td>optionLabel</td>
-							<td>string</td>
-							<td>null</td>
-							<td>Name of the label field of an option when an arbitrary objects instead of SelectItems are used as options.</td>
-						</tr>
-						<tr>
-							<td>multiple</td>
-							<td>boolean</td>
-							<td>false</td>
-							<td>When specified, allows selecting multiple values.</td>
-						</tr>
-						<tr>
-							<td>disabled</td>
-							<td>boolean</td>
-							<td>false</td>
-							<td>When present, it specifies that the element should be disabled.</td>
-						</tr>
-						<tr>
-							<td>dataKey</td>
-							<td>string</td>
-							<td>null</td>
-							<td>A property to uniquely match the value in options for better performance.</td>
-						</tr>
-						<tr>
-							<td>name</td>
-							<td>string</td>
-							<td>null</td>
-							<td>???</td>
-						</tr>
-						<tr>
-							<td>optionValue</td>
-							<td>any</td>
-							<td>null</td>
-							<td>???</td>
-						</tr>
-						<tr>
-							<td>optionDisabled</td>
-							<td>boolean</td>
-							<td>null</td>
-							<td>???</td>
-						</tr>
+                            <tr>
+                                <td>value</td>
+                                <td>any</td>
+                                <td>null</td>
+                                <td>Value of the component.</td>
+                            </tr>
+                            <tr>
+                                <td>options</td>
+                                <td>array</td>
+                                <td>null</td>
+                                <td>An array of selectitems to display as the available options.</td>
+                            </tr>
+                            <tr>
+                                <td>optionLabel</td>
+                                <td>string</td>
+                                <td>null</td>
+                                <td>Property name to use as the label of an option.</td>
+                            </tr>
+                            <tr>
+                                <td>optionValue</td>
+                                <td>string</td>
+                                <td>null</td>
+                                <td>Property name to use as the value of an option, defaults to the option itself when not defined.</td>
+                            </tr>
+                            <tr>
+                                <td>optionDisabled</td>
+                                <td>boolean</td>
+                                <td>null</td>
+                                <td>Property name to use as the disabled flag of an option, defaults to false when not defined.</td>
+                            </tr>
+                            <tr>
+                                <td>multiple</td>
+                                <td>boolean</td>
+                                <td>false</td>
+                                <td>When specified, allows selecting multiple values.</td>
+                            </tr>
+                            <tr>
+                                <td>disabled</td>
+                                <td>boolean</td>
+                                <td>false</td>
+                                <td>When present, it specifies that the element should be disabled.</td>
+                            </tr>
+                            <tr>
+                                <td>dataKey</td>
+                                <td>string</td>
+                                <td>null</td>
+                                <td>A property to uniquely match the value in options for better performance.</td>
+                            </tr>
 						</tbody>
 					</table>
 				</div>
@@ -126,28 +117,28 @@ export default {
 				<div class="doc-tablewrapper">
 					<table class="doc-table">
 						<thead>
-						<tr>
-							<th>Name</th>
-							<th>Parameters</th>
-							<th>Description</th>
-						</tr>
+                            <tr>
+                                <th>Name</th>
+                                <th>Parameters</th>
+                                <th>Description</th>
+                            </tr>
 						</thead>
 						<tbody>
-						<tr>
-							<td>input</td>
-							<td>event: Single value or an array of values that are selected.</td>
-							<td>Callback to invoke on value change.</td>
-						</tr>
-						<tr>
-							<td>focus</td>
-							<td>event: Browser event</td>
-							<td>Callback to invoke on focus.</td>
-						</tr>
-						<tr>
-							<td>blur</td>
-							<td>event: Browser event</td>
-							<td>Callback to invoke on blur.</td>
-						</tr>
+                            <tr>
+                                <td>input</td>
+                                <td>event: Single value or an array of values that are selected.</td>
+                                <td>Callback to invoke on value change.</td>
+                            </tr>
+                            <tr>
+                                <td>focus</td>
+                                <td>event: Browser event</td>
+                                <td>Callback to invoke on focus.</td>
+                            </tr>
+                            <tr>
+                                <td>blur</td>
+                                <td>event: Browser event</td>
+                                <td>Callback to invoke on blur.</td>
+                            </tr>
 						</tbody>
 					</table>
 				</div>