diff --git a/src/app/pages/dashboard/feed/feed.component.ts b/src/app/pages/dashboard/feed/feed.component.ts
index 54367977..0b696d4d 100644
--- a/src/app/pages/dashboard/feed/feed.component.ts
+++ b/src/app/pages/dashboard/feed/feed.component.ts
@@ -1,13 +1,13 @@
 import {Component, ViewEncapsulation} from '@angular/core';
 
-import {ProfilePicturePipe, BaAppPicturePipe} from '../../../theme/pipes';
+import {BaProfilePicturePipe, BaAppPicturePipe} from '../../../theme/pipes';
 import {FeedService} from './feed.service';
 
 @Component({
   selector: 'feed',
   encapsulation: ViewEncapsulation.None,
   providers: [FeedService],
-  pipes: [ProfilePicturePipe, BaAppPicturePipe],
+  pipes: [BaProfilePicturePipe, BaAppPicturePipe],
   styles: [require('./feed.scss')],
   template: require('./feed.html')
 })
diff --git a/src/app/pages/dashboard/feed/feed.html b/src/app/pages/dashboard/feed/feed.html
index 576332c5..9286ebe9 100644
--- a/src/app/pages/dashboard/feed/feed.html
+++ b/src/app/pages/dashboard/feed/feed.html
@@ -1,10 +1,10 @@
 <div class="feed-messages-container">
   <div class="feed-message" *ngFor="let message of feed" (click)="expandMessage(message)">
     <div class="message-icon" *ngIf="message.type == 'text-message'">
-      <img class="photo-icon" src="{{ ( message.author | profilePicture ) }}">
+      <img class="photo-icon" src="{{ ( message.author | baProfilePicture ) }}">
     </div>
     <div class="message-icon" *ngIf="message.type != 'text-message'">
-      <img class="photo-icon" src="{{ ( message.author | profilePicture ) }}">
+      <img class="photo-icon" src="{{ ( message.author | baProfilePicture ) }}">
       <span class="sub-photo-icon" [ngClass]="message.type"></span>
     </div>
     <div class="text-block text-message">
diff --git a/src/app/theme/components/msgCenter/msgCenter.component.ts b/src/app/theme/components/msgCenter/msgCenter.component.ts
index 1c30a2a3..b71a0283 100644
--- a/src/app/theme/components/msgCenter/msgCenter.component.ts
+++ b/src/app/theme/components/msgCenter/msgCenter.component.ts
@@ -1,12 +1,12 @@
 import {Component} from '@angular/core';
 
-import {ProfilePicturePipe} from '../../pipes';
+import {BaProfilePicturePipe} from '../../pipes';
 
 @Component({
   selector: 'msg-center',
   styles: [require('./msgCenter.scss')],
   template: require('./msgCenter.html'),
-  pipes: [ProfilePicturePipe]
+  pipes: [BaProfilePicturePipe]
 })
 export class MsgCenter {
 
diff --git a/src/app/theme/components/msgCenter/msgCenter.html b/src/app/theme/components/msgCenter/msgCenter.html
index 75240934..76713ad3 100644
--- a/src/app/theme/components/msgCenter/msgCenter.html
+++ b/src/app/theme/components/msgCenter/msgCenter.html
@@ -17,7 +17,7 @@
       <div class="msg-list">
         <a *ngFor="let msg of notifications" href class="clearfix">
           <div class="img-area"><img [ngClass]="{'photo-msg-item': !msg.image}"
-                                     src="{{ ( msg.image ||  (msg.name | profilePicture)) }}"></div>
+                                     src="{{ ( msg.image ||  (msg.name | baProfilePicture)) }}"></div>
           <div class="msg-area">
             <div>{{ msg.text }}</div>
             <span>{{ msg.time }}</span>
@@ -42,7 +42,7 @@
       <div class="msg-list">
         <a *ngFor="let msg of messages" href class="clearfix">
           <div class="img-area"><img [ngClass]="{'photo-msg-item': !msg.image}"
-                                     src="{{ ( msg.image ||  (msg.name | profilePicture)) }}"></div>
+                                     src="{{ ( msg.image ||  (msg.name | baProfilePicture)) }}"></div>
           <div class="msg-area">
             <div>{{ msg.text }}</div>
             <span>{{ msg.time }}</span>
diff --git a/src/app/theme/components/pageTop/pageTop.component.ts b/src/app/theme/components/pageTop/pageTop.component.ts
index d797e065..556ab852 100644
--- a/src/app/theme/components/pageTop/pageTop.component.ts
+++ b/src/app/theme/components/pageTop/pageTop.component.ts
@@ -1,7 +1,7 @@
 import {Component, ViewEncapsulation} from '@angular/core';
 
 import {AppState} from '../../../app.state';
-import {ProfilePicturePipe} from '../../pipes';
+import {BaProfilePicturePipe} from '../../pipes';
 import {MsgCenter} from '../../components/msgCenter';
 import {BaScrollPosition} from '../../directives';
 
@@ -10,7 +10,7 @@ import {BaScrollPosition} from '../../directives';
   styles: [require('./pageTop.scss')],
   template: require('./pageTop.html'),
   directives: [MsgCenter, BaScrollPosition],
-  pipes: [ProfilePicturePipe],
+  pipes: [BaProfilePicturePipe],
   encapsulation: ViewEncapsulation.None
 })
 export class PageTop {
diff --git a/src/app/theme/components/pageTop/pageTop.html b/src/app/theme/components/pageTop/pageTop.html
index bd59c4af..a537e1ac 100644
--- a/src/app/theme/components/pageTop/pageTop.html
+++ b/src/app/theme/components/pageTop/pageTop.html
@@ -11,7 +11,7 @@
   <div class="user-profile clearfix">
     <div class="dropdown al-user-profile">
       <a class="profile-toggle-link dropdown-toggle" id="user-profile-dd" data-toggle="dropdown" aria-expanded="false">
-        <img src="{{ ( 'Nasta' | profilePicture ) }}">
+        <img src="{{ ( 'Nasta' | baProfilePicture ) }}">
       </a>
       <div class="dropdown-menu top-dropdown-menu profile-dropdown" aria-labelledby="user-profile-dd">
         <li class="dropdown-item"><i class="dropdown-arr"></i></li>
diff --git a/src/app/theme/pipes/profilePicture/profilePicture.pipe.ts b/src/app/theme/pipes/baProfilePicture/baProfilePicture.pipe.ts
similarity index 68%
rename from src/app/theme/pipes/profilePicture/profilePicture.pipe.ts
rename to src/app/theme/pipes/baProfilePicture/baProfilePicture.pipe.ts
index 828da945..17027de1 100644
--- a/src/app/theme/pipes/profilePicture/profilePicture.pipe.ts
+++ b/src/app/theme/pipes/baProfilePicture/baProfilePicture.pipe.ts
@@ -1,8 +1,8 @@
 import {Pipe, PipeTransform} from '@angular/core';
 import {layoutPaths} from '../../../theme';
 
-@Pipe({name: 'profilePicture'})
-export class ProfilePicturePipe implements PipeTransform {
+@Pipe({name: 'baProfilePicture'})
+export class BaProfilePicturePipe implements PipeTransform {
 
   transform(input:string, ext = 'png'):string {
     return layoutPaths.images.profile + input + '.' + ext;
diff --git a/src/app/theme/pipes/baProfilePicture/index.ts b/src/app/theme/pipes/baProfilePicture/index.ts
new file mode 100644
index 00000000..76a89c6a
--- /dev/null
+++ b/src/app/theme/pipes/baProfilePicture/index.ts
@@ -0,0 +1 @@
+export * from './baProfilePicture.pipe.ts';
diff --git a/src/app/theme/pipes/index.ts b/src/app/theme/pipes/index.ts
index 70126d50..51219d61 100644
--- a/src/app/theme/pipes/index.ts
+++ b/src/app/theme/pipes/index.ts
@@ -1,3 +1,3 @@
-export * from './profilePicture';
+export * from './baProfilePicture';
 export * from './baAppPicture';
 export * from './kameleonPicture';
diff --git a/src/app/theme/pipes/profilePicture/index.ts b/src/app/theme/pipes/profilePicture/index.ts
deleted file mode 100644
index b952ed87..00000000
--- a/src/app/theme/pipes/profilePicture/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './profilePicture.pipe.ts';