diff --git a/src/sql/parts/modelComponents/checkbox.component.ts b/src/sql/parts/modelComponents/checkbox.component.ts
index 362eaf333b..53f26fc35f 100644
--- a/src/sql/parts/modelComponents/checkbox.component.ts
+++ b/src/sql/parts/modelComponents/checkbox.component.ts
@@ -18,7 +18,7 @@ import { CommonServiceInterface } from 'sql/services/common/commonServiceInterfa
 import { attachInputBoxStyler, attachListStyler } from 'vs/platform/theme/common/styler';
 
 @Component({
-	selector: 'checkbox',
+	selector: 'modelview-checkbox',
 	template: `
 		<div #input style="width: 100%"></div>
 	`
diff --git a/src/sql/parts/modelComponents/dropdown.component.ts b/src/sql/parts/modelComponents/dropdown.component.ts
index 47fd40589a..a72dda3396 100644
--- a/src/sql/parts/modelComponents/dropdown.component.ts
+++ b/src/sql/parts/modelComponents/dropdown.component.ts
@@ -23,7 +23,7 @@ import Event, { Emitter } from 'vs/base/common/event';
 import { attachListStyler } from 'vs/platform/theme/common/styler';
 
 @Component({
-	selector: 'dropdown',
+	selector: 'modelview-dropdown',
 	template: `
 
 	<div>
diff --git a/src/sql/parts/modelComponents/inputbox.component.ts b/src/sql/parts/modelComponents/inputbox.component.ts
index fd4f93d08a..e4d0617410 100644
--- a/src/sql/parts/modelComponents/inputbox.component.ts
+++ b/src/sql/parts/modelComponents/inputbox.component.ts
@@ -21,7 +21,7 @@ import Event, { Emitter } from 'vs/base/common/event';
 import * as nls from 'vs/nls';
 
 @Component({
-	selector: 'inputBox',
+	selector: 'modelview-inputBox',
 	template: `
 		<div #input style="width: 100%"></div>
 	`
diff --git a/src/sql/parts/modelComponents/radioButton.component.ts b/src/sql/parts/modelComponents/radioButton.component.ts
index ff793223e8..cbd065c086 100644
--- a/src/sql/parts/modelComponents/radioButton.component.ts
+++ b/src/sql/parts/modelComponents/radioButton.component.ts
@@ -18,7 +18,7 @@ import { RadioButton } from 'sql/base/browser/ui/radioButton/radioButton';
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
 
 @Component({
-	selector: 'radioButton',
+	selector: 'modelview-radioButton',
 	template: `
 		<div #input class="modelview-radiobutton-container">
 
diff --git a/src/sql/parts/modelComponents/text.component.ts b/src/sql/parts/modelComponents/text.component.ts
index b8446f842c..924b9b090c 100644
--- a/src/sql/parts/modelComponents/text.component.ts
+++ b/src/sql/parts/modelComponents/text.component.ts
@@ -17,7 +17,7 @@ import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } fro
 import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
 
 @Component({
-	selector: 'label',
+	selector: 'modelview-text',
 	template: `
 		<p>{{getValue()}}</p>`
 })
diff --git a/src/sql/parts/modelComponents/webview.component.ts b/src/sql/parts/modelComponents/webview.component.ts
index 31b73393ce..a0050e4dea 100644
--- a/src/sql/parts/modelComponents/webview.component.ts
+++ b/src/sql/parts/modelComponents/webview.component.ts
@@ -23,7 +23,7 @@ import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } fro
 
 @Component({
 	template: '',
-	selector: 'webview-component'
+	selector: 'modelview-webview-component'
 })
 export default class WebViewComponent extends ComponentBase implements IComponent, OnDestroy {
 	@Input() descriptor: IComponentDescriptor;