diff --git a/projects/common/src/lib/components/auth-callback/auth-callback.component.ts b/projects/common/src/lib/components/auth-callback/auth-callback.component.ts
index df8ef29..9c4bb53 100644
--- a/projects/common/src/lib/components/auth-callback/auth-callback.component.ts
+++ b/projects/common/src/lib/components/auth-callback/auth-callback.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 
 
 @Component({
-    selector: 'auth-callback',
+    selector: 'fm-auth-callback',
     template:'<div></div>'
 })
 export class AuthCallbackComponent {
diff --git a/projects/common/src/lib/components/not-found/not-found.component.ts b/projects/common/src/lib/components/not-found/not-found.component.ts
index 0ebd7e9..e36c407 100644
--- a/projects/common/src/lib/components/not-found/not-found.component.ts
+++ b/projects/common/src/lib/components/not-found/not-found.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 
 @Component({
-    selector: 'not-found',
+    selector: 'fm-not-found',
     templateUrl: './not-found.component.html'
     // styleUrls: ['./not-found.component.css']
 })
diff --git a/projects/common/src/lib/components/resumable-file-upload/resumable-file-upload.component.ts b/projects/common/src/lib/components/resumable-file-upload/resumable-file-upload.component.ts
index f6f8f84..0e6076f 100644
--- a/projects/common/src/lib/components/resumable-file-upload/resumable-file-upload.component.ts
+++ b/projects/common/src/lib/components/resumable-file-upload/resumable-file-upload.component.ts
@@ -7,7 +7,7 @@ import * as commonActions from '../../actions/app-common.actions';
 
 
 @Component({
-    selector: 'resumable-file-upload',
+    selector: 'fm-resumable-file-upload',
     templateUrl: './resumable-file-upload.component.html',
     styleUrls: ['./resumable-file-upload.component.scss']
 })
diff --git a/projects/common/src/lib/components/session-cleared/session-cleared.component.ts b/projects/common/src/lib/components/session-cleared/session-cleared.component.ts
index ed0cef5..9b61f13 100644
--- a/projects/common/src/lib/components/session-cleared/session-cleared.component.ts
+++ b/projects/common/src/lib/components/session-cleared/session-cleared.component.ts
@@ -7,7 +7,7 @@ import * as appCommonActions from '../../actions/app-common.actions';
 
 
 @Component({
-  selector: 'session-cleared',
+  selector: 'fm-session-cleared',
   templateUrl: 'session-cleared.component.html',
   styleUrls: ['session-cleared.component.scss']
 })
diff --git a/projects/common/src/lib/components/side-panel/side-panel.component.ts b/projects/common/src/lib/components/side-panel/side-panel.component.ts
index b92e1ac..1da66c5 100644
--- a/projects/common/src/lib/components/side-panel/side-panel.component.ts
+++ b/projects/common/src/lib/components/side-panel/side-panel.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input,ViewChild,ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef  } from '@angular/core';
 
 @Component({
-  selector: 'side-panel',
+  selector: 'fm-side-panel',
   templateUrl: 'side-panel.component.html',
   styleUrls: ['side-panel.component.scss']
 })
diff --git a/projects/common/src/lib/components/tag-input/tag-input.component.ts b/projects/common/src/lib/components/tag-input/tag-input.component.ts
index 6042764..9109e0b 100644
--- a/projects/common/src/lib/components/tag-input/tag-input.component.ts
+++ b/projects/common/src/lib/components/tag-input/tag-input.component.ts
@@ -5,7 +5,7 @@ import { tap,catchError,debounceTime,distinctUntilChanged,switchMap } from 'rxjs
 import { TypeaheadService } from '../../services/typeahead.service';
 
 @Component({
-  selector: 'tag-input',
+  selector: 'fm-tag-input',
   templateUrl: 'tag-input.component.html',
   styleUrls: ['tag-input.component.scss'],
   providers: [
diff --git a/projects/common/src/lib/components/timespan/timespan.component.ts b/projects/common/src/lib/components/timespan/timespan.component.ts
index 7deb6bf..557f6f5 100644
--- a/projects/common/src/lib/components/timespan/timespan.component.ts
+++ b/projects/common/src/lib/components/timespan/timespan.component.ts
@@ -8,7 +8,7 @@ export interface TimeSpan {
 }
 
 @Component({
-  selector: 'timespan',
+  selector: 'fm-timespan',
   templateUrl: './timespan.component.html',
   styleUrls: ['./timespan.component.css']
 })