diff --git a/src/components/autocomplete/AutoComplete.d.ts b/src/components/autocomplete/AutoComplete.d.ts
index 3d91fba65..c462d3702 100644
--- a/src/components/autocomplete/AutoComplete.d.ts
+++ b/src/components/autocomplete/AutoComplete.d.ts
@@ -12,8 +12,8 @@ export declare class AutoComplete extends Vue {
     delay?: number;
     ariaLabelledBy?: string;
     $emit(eventName: 'input', value: any): this;
-    $emit(eventName: 'select', e: {originalEvent: Event, value: any}): this;
-    $emit(eventName: 'unselect', e: {originalEvent: Event, value: any}): this;
+    $emit(eventName: 'item-select', e: {originalEvent: Event, value: any}): this;
+    $emit(eventName: 'item-unselect', e: {originalEvent: Event, value: any}): this;
     $emit(eventName: 'dropdown-click', e: {originalEvent: Event, query: string}): this;
     $emit(eventName: 'complete', e: {originalEvent: Event, query: string}): this;
     $emit(eventName: 'clear'): this;
diff --git a/src/components/autocomplete/AutoComplete.vue b/src/components/autocomplete/AutoComplete.vue
index 7b0943448..7b53c8488 100644
--- a/src/components/autocomplete/AutoComplete.vue
+++ b/src/components/autocomplete/AutoComplete.vue
@@ -152,7 +152,7 @@ export default {
                 this.$emit('input', item);
             }
 
-            this.$emit('select', {
+            this.$emit('item-select', {
                 originalEvent: event,
                 value: item
             });
@@ -167,7 +167,7 @@ export default {
             let removedValue = this.value[index];
             let newValue = this.value.filter((val, i) => (index !== i));
             this.$emit('input', newValue);
-            this.$emit('unselect', {
+            this.$emit('item-unselect', {
                 originalEvent: event,
                 value: removedValue
             });
@@ -323,7 +323,7 @@ export default {
                             let newValue = this.value.slice(0, -1);
 
                             this.$emit('input', newValue);
-                            this.$emit('unselect', {
+                            this.$emit('item-unselect', {
                                 originalEvent: event,
                                 value: removedValue
                             });
diff --git a/src/components/calendar/Calendar.d.ts b/src/components/calendar/Calendar.d.ts
index 4b4cdc788..7479a144f 100644
--- a/src/components/calendar/Calendar.d.ts
+++ b/src/components/calendar/Calendar.d.ts
@@ -57,7 +57,7 @@ export declare class Calendar extends Vue {
     $emit(eventName: 'hide'): this;
     $emit(eventName: 'month-change', e: { month: number, year: number }): this;
     $emit(eventName: 'year-change', e: { month: number, year: number }): this;
-    $emit(eventName: 'select', value: Date): this;
+    $emit(eventName: 'date-select', value: Date): this;
     $emit(eventName: 'input', value: Date): this;
     $emit(eventName: 'today-click', value: Date): this;
     $emit(eventName: 'clear-click', event: Event): this;
diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue
index 48ff3f439..bbebf094f 100644
--- a/src/components/calendar/Calendar.vue
+++ b/src/components/calendar/Calendar.vue
@@ -783,7 +783,7 @@ export default {
                 this.updateModel(modelVal);
                 this.updateInputFieldValue(modelVal);
             }
-            this.$emit('select', date);
+            this.$emit('date-select', date);
         },
         updateModel(value) {
             this.$emit('input', value);
@@ -1221,7 +1221,7 @@ export default {
 
             this.updateModel(value);
             this.updateInputFieldValue(value);
-            this.$emit('select', value);
+            this.$emit('date-select', value);
         },
         toggleAMPM(event) {
             this.pm = !this.pm;
diff --git a/src/views/autocomplete/AutoCompleteDoc.vue b/src/views/autocomplete/AutoCompleteDoc.vue
index 51050675d..02ada83cb 100644
--- a/src/views/autocomplete/AutoCompleteDoc.vue
+++ b/src/views/autocomplete/AutoCompleteDoc.vue
@@ -167,13 +167,13 @@ export default {
                                 <td>Callback to invoke to search for suggestions.</td>
                             </tr>
                             <tr>
-                                <td>select</td>
+                                <td>item-select</td>
                                 <td>event.originalEvent: Browser event <br />
                                     event.value: Selected item</td>
                                 <td>Callback to invoke when a suggestion is selected.</td>
                             </tr>
                             <tr>
-                                <td>unselect</td>
+                                <td>item-unselect</td>
                                 <td>event.originalEvent: Browser event <br />
                                     event.value: Unselected item</td>
                                 <td>Callback to invoke when a selected value is removed.</td>
diff --git a/src/views/calendar/CalendarDoc.vue b/src/views/calendar/CalendarDoc.vue
index 4e398fcbb..a960356b3 100644
--- a/src/views/calendar/CalendarDoc.vue
+++ b/src/views/calendar/CalendarDoc.vue
@@ -424,10 +424,9 @@ export default {
                         </thead>
                         <tbody>
                             <tr>
-                                <td>select</td>
+                                <td>date-select</td>
                                 <td>value: Selected value</td>
-                                <td>Callback to invoke when a date is selected.
-                                </td>
+                                <td>Callback to invoke when a date is selected.</td>
                             </tr>
                             <tr>
                                 <td>show</td>