diff --git a/src/modules/common/components/step/Step.tsx b/src/modules/common/components/step/Step.tsx
index d61119e5b..327bc68bd 100644
--- a/src/modules/common/components/step/Step.tsx
+++ b/src/modules/common/components/step/Step.tsx
@@ -18,7 +18,7 @@ type Props = {
   img?: string;
   title?: string;
   children?: React.ReactNode;
-  next?: (number: number) => void;
+  next?: (stepNumber: number) => void;
   nextButton?: React.ReactNode;
   save?: (name: string, e: React.MouseEvent) => void;
   message?: any;
diff --git a/src/modules/deals/components/editForm/EditForm.tsx b/src/modules/deals/components/editForm/EditForm.tsx
index fc8718345..bdcefc786 100644
--- a/src/modules/deals/components/editForm/EditForm.tsx
+++ b/src/modules/deals/components/editForm/EditForm.tsx
@@ -16,7 +16,7 @@ type Props = {
   users: IUser[];
   addDeal: (doc: IDealParams, callback: () => void) => void;
   saveDeal: (doc: IDealParams, callback: () => void) => void;
-  removeDeal: (_id: string, callback: () => void) => void;
+  removeDeal: (dealId: string, callback: () => void) => void;
   closeModal: () => void;
 };
 
diff --git a/src/modules/deals/components/editForm/Sidebar.tsx b/src/modules/deals/components/editForm/Sidebar.tsx
index d8c6613fc..a18742036 100644
--- a/src/modules/deals/components/editForm/Sidebar.tsx
+++ b/src/modules/deals/components/editForm/Sidebar.tsx
@@ -20,7 +20,7 @@ type Props = {
     value: any
   ) => void;
   copyDeal: () => void;
-  removeDeal: (_id: string) => void;
+  removeDeal: (dealId: string) => void;
   saveProductsData: () => void;
 };
 
diff --git a/src/modules/deals/components/portable/Deal.tsx b/src/modules/deals/components/portable/Deal.tsx
index 903dc76a8..6201ec954 100644
--- a/src/modules/deals/components/portable/Deal.tsx
+++ b/src/modules/deals/components/portable/Deal.tsx
@@ -19,7 +19,7 @@ import { IDeal } from '../../types';
 type Props = {
   deal: IDeal;
   onAdd: (stageId: string, deal: IDeal) => void;
-  onRemove: (_id: string, stageId: string) => void;
+  onRemove: (dealId: string, stageId: string) => void;
   onUpdate: (deal: IDeal) => void;
 };
 
diff --git a/src/modules/deals/components/product/ProductForm.tsx b/src/modules/deals/components/product/ProductForm.tsx
index d11abf7cf..a25962b91 100644
--- a/src/modules/deals/components/product/ProductForm.tsx
+++ b/src/modules/deals/components/product/ProductForm.tsx
@@ -62,10 +62,10 @@ class ProductForm extends React.Component<Props, State> {
     onChangeProductsData(productsData);
   }
 
-  removeProductItem(_id) {
+  removeProductItem(productId) {
     const { productsData, onChangeProductsData } = this.props;
 
-    const removedProductsData = productsData.filter(p => p._id !== _id);
+    const removedProductsData = productsData.filter(p => p._id !== productId);
 
     onChangeProductsData(removedProductsData);
 
diff --git a/src/modules/deals/components/product/ProductItemForm.tsx b/src/modules/deals/components/product/ProductItemForm.tsx
index 0850d60a6..b27ea94c6 100644
--- a/src/modules/deals/components/product/ProductItemForm.tsx
+++ b/src/modules/deals/components/product/ProductItemForm.tsx
@@ -19,7 +19,7 @@ type Props = {
   currencies: string[];
   productsData?: IProductData[];
   productData: IProductData;
-  removeProductItem?: (_id: string) => void;
+  removeProductItem?: (productId: string) => void;
   onChangeProductsData?: (productsData: IProductData[]) => void;
   updateTotal?: () => void;
 };
@@ -70,11 +70,11 @@ class ProductItemForm extends React.Component<Props> {
     }
   }
 
-  onChangeField(type, value, _id) {
+  onChangeField(type, value, productId) {
     const { productsData, onChangeProductsData } = this.props;
 
     if (productsData) {
-      const productData = productsData.find(p => p._id === _id);
+      const productData = productsData.find(p => p._id === productId);
       if (productData) {
         productData[type] = value;
       }
diff --git a/src/modules/deals/components/stage/DealItem.tsx b/src/modules/deals/components/stage/DealItem.tsx
index dcf94fda8..342d63182 100644
--- a/src/modules/deals/components/stage/DealItem.tsx
+++ b/src/modules/deals/components/stage/DealItem.tsx
@@ -21,7 +21,7 @@ type Props = {
   isDragging: boolean;
   provided;
   onAdd: (stageId: string, deal: IDeal) => void;
-  onRemove: (_id: string, stageId: string) => void;
+  onRemove: (dealId: string, stageId: string) => void;
   onUpdate: (deal: IDeal) => void;
 };
 
diff --git a/src/modules/deals/containers/PipelineContext.tsx b/src/modules/deals/containers/PipelineContext.tsx
index b97f5be9f..7c1c43a1f 100644
--- a/src/modules/deals/containers/PipelineContext.tsx
+++ b/src/modules/deals/containers/PipelineContext.tsx
@@ -20,7 +20,7 @@ interface IStore {
   stageIds: string[];
   onDragEnd: (result: IDragResult) => void;
   onAddDeal: (stageId: string, deal: IDeal) => void;
-  onRemoveDeal: (_id: string, stageId: string) => void;
+  onRemoveDeal: (dealId: string, stageId: string) => void;
   onUpdateDeal: (deal: IDeal, prevStageId?: string) => void;
 }
 
@@ -129,10 +129,10 @@ export class PipelineProvider extends React.Component<Props, State> {
     });
   };
 
-  onRemoveDeal = (_id: string, stageId: string) => {
+  onRemoveDeal = (dealId: string, stageId: string) => {
     const { dealMap } = this.state;
 
-    const deals = dealMap[stageId].filter(deal => deal._id !== _id);
+    const deals = dealMap[stageId].filter(deal => deal._id !== dealId);
 
     this.setState({
       dealMap: { ...dealMap, [stageId]: deals }
diff --git a/src/modules/deals/containers/editForm/EditForm.tsx b/src/modules/deals/containers/editForm/EditForm.tsx
index 9c91aa289..a4a216ee3 100644
--- a/src/modules/deals/containers/editForm/EditForm.tsx
+++ b/src/modules/deals/containers/editForm/EditForm.tsx
@@ -22,7 +22,7 @@ type Props = {
   editMutation: SaveDealMutation;
   removeMutation: RemoveDealMutation;
   onAdd?: (stageId: string, deal: IDeal) => void;
-  onRemove?: (_id: string, stageId: string) => void;
+  onRemove?: (dealId: string, stageId: string) => void;
   onUpdate?: (deal: IDeal, prevStageId: string) => void;
   closeModal: () => void;
 };
@@ -72,16 +72,16 @@ class EditFormContainer extends React.Component<Props> {
       });
   }
 
-  removeDeal(_id: string, callback) {
+  removeDeal(dealId: string, callback) {
     const { removeMutation, onRemove, stageId } = this.props;
 
     confirm().then(() =>
-      removeMutation({ variables: { _id } })
+      removeMutation({ variables: { _id: dealId } })
         .then(() => {
           callback();
 
           if (onRemove) {
-            onRemove(_id, stageId);
+            onRemove(dealId, stageId);
           }
         })
 
diff --git a/src/modules/deals/data.ts b/src/modules/deals/data.ts
index f5308954c..4da4a515e 100644
--- a/src/modules/deals/data.ts
+++ b/src/modules/deals/data.ts
@@ -4,10 +4,10 @@ import { IDeal } from './types';
 type StagesWithDeals = IStage & { deals: IDeal[] };
 
 const dealFactory = (pipeline: IPipeline, stage: IStage): IDeal => {
-  const _id = Math.random().toString();
+  const id = Math.random().toString();
 
   return {
-    _id,
+    _id: id,
     order: 1,
     stageId: stage._id,
     assignedUsers: [],
@@ -18,7 +18,7 @@ const dealFactory = (pipeline: IPipeline, stage: IStage): IDeal => {
     pipeline,
     products: [],
     amount: 10000,
-    name: `Deal_${_id}`
+    name: `Deal_${id}`
   };
 };
 
@@ -26,11 +26,11 @@ const stageFactory = (
   pipeline: IPipeline,
   dealCount: number
 ): StagesWithDeals => {
-  const _id = Math.random().toString();
+  const id = Math.random().toString();
 
   const stage: IStage = {
-    _id,
-    name: `Stage_${_id}`,
+    _id: id,
+    name: `Stage_${id}`,
     pipelineId: pipeline._id
   };
 
diff --git a/src/modules/deals/types.ts b/src/modules/deals/types.ts
index 0d966e038..1da35142f 100644
--- a/src/modules/deals/types.ts
+++ b/src/modules/deals/types.ts
@@ -100,8 +100,11 @@ export interface IStageMap {
 }
 
 export type SaveDealMutation = ({ variables: IDealParams }) => Promise<any>;
+
+interface IRemoveDealVariables {
+  _id: string;
+}
+
 export type RemoveDealMutation = (
-  {
-    variables: { _id: string }
-  }
+  { variables: IRemoveDealVariables }
 ) => Promise<any>;
diff --git a/src/modules/engage/components/Scheduler.tsx b/src/modules/engage/components/Scheduler.tsx
index 2fdd47948..cd5a60fa8 100644
--- a/src/modules/engage/components/Scheduler.tsx
+++ b/src/modules/engage/components/Scheduler.tsx
@@ -37,10 +37,10 @@ class Scheduler extends React.Component<Props, State> {
     this.props.onChange('scheduleDate', scheduleDate);
   }
 
-  generateOptions(number) {
+  generateOptions(length) {
     const options: React.ReactNode[] = [];
 
-    for (let i = 1; i <= number; i++) {
+    for (let i = 1; i <= length; i++) {
       options.push(
         <option key={i} value={i}>
           {i}
diff --git a/src/modules/engage/containers/MessageListRow.tsx b/src/modules/engage/containers/MessageListRow.tsx
index baadd1fb3..2f7a502a7 100755
--- a/src/modules/engage/containers/MessageListRow.tsx
+++ b/src/modules/engage/containers/MessageListRow.tsx
@@ -10,7 +10,7 @@ import { IEngageMessage } from '../types';
 import { crudMutationsOptions } from '../utils';
 
 type Props = {
-  removeMutation: (_id: string) => Promise<void>;
+  removeMutation: (engageId: string) => Promise<void>;
   setPauseMutation: (params: { vairables: { _id: string } }) => Promise<void>;
   setLiveMutation: (params: { vairables: { _id: string } }) => Promise<void>;
   setLiveManualMutation: (
diff --git a/src/modules/forms/components/List.tsx b/src/modules/forms/components/List.tsx
index 233068df7..9ebb6e320 100644
--- a/src/modules/forms/components/List.tsx
+++ b/src/modules/forms/components/List.tsx
@@ -27,7 +27,7 @@ type Props = {
   toggleBulk: (target: IFormIntegration, toAdd: boolean) => void;
   toggleAll: (bulk: IFormIntegration[], name: string) => void;
   loading: boolean;
-  remove: (_id: string, callback: (error: Error) => void) => void;
+  remove: (integrationId: string, callback: (error: Error) => void) => void;
 };
 
 class List extends React.Component<Props, {}> {
diff --git a/src/modules/forms/components/Row.tsx b/src/modules/forms/components/Row.tsx
index c795ba2af..8aac347fd 100644
--- a/src/modules/forms/components/Row.tsx
+++ b/src/modules/forms/components/Row.tsx
@@ -18,7 +18,7 @@ type Props = {
   integration: IFormIntegration;
 
   toggleBulk: (integration: IFormIntegration, checked: boolean) => void;
-  remove: (_id: string, callback: (error: Error) => void) => void;
+  remove: (integrationId: string, callback: (error: Error) => void) => void;
 
   isChecked: boolean;
 };
diff --git a/src/modules/forms/containers/List.tsx b/src/modules/forms/containers/List.tsx
index 0a4abae98..12145659a 100755
--- a/src/modules/forms/containers/List.tsx
+++ b/src/modules/forms/containers/List.tsx
@@ -31,9 +31,9 @@ class ListContainer extends React.Component<Props, {}> {
 
     const integrations = integrationsQuery.integrations || [];
 
-    const remove = (_id: string, callback: (error?: any) => void) => {
+    const remove = (integrationId: string, callback: (error?: any) => void) => {
       removeMutation({
-        variables: { _id }
+        variables: { _id: integrationId }
       }).then(() => {
         // refresh queries
         integrationsQuery.refetch();
diff --git a/src/modules/knowledgeBase/components/article/ArticleList.tsx b/src/modules/knowledgeBase/components/article/ArticleList.tsx
index 15bd87ad0..2c3ecfefd 100644
--- a/src/modules/knowledgeBase/components/article/ArticleList.tsx
+++ b/src/modules/knowledgeBase/components/article/ArticleList.tsx
@@ -8,7 +8,7 @@ type Props = {
   queryParams: any;
   currentCategoryId: string;
   topicIds: string;
-  remove: (_id: string) => void;
+  remove: (articleId: string) => void;
   loading: boolean;
 };
 
diff --git a/src/modules/knowledgeBase/components/article/ArticleRow.tsx b/src/modules/knowledgeBase/components/article/ArticleRow.tsx
index aa9916e00..7ab1053bd 100644
--- a/src/modules/knowledgeBase/components/article/ArticleRow.tsx
+++ b/src/modules/knowledgeBase/components/article/ArticleRow.tsx
@@ -24,7 +24,7 @@ type Props = {
   queryParams: any;
   currentCategoryId: string;
   topicIds: string;
-  remove: (_id: string) => void;
+  remove: (articleId: string) => void;
 };
 
 class ArticleRow extends React.Component<Props> {
diff --git a/src/modules/knowledgeBase/components/category/CategoryList.tsx b/src/modules/knowledgeBase/components/category/CategoryList.tsx
index 43bbd0fe5..7dfd30d39 100644
--- a/src/modules/knowledgeBase/components/category/CategoryList.tsx
+++ b/src/modules/knowledgeBase/components/category/CategoryList.tsx
@@ -8,7 +8,7 @@ type Props = {
   topicIds: string;
   categories: ICategory[];
   articlesCount: number;
-  remove: (_id: string) => void;
+  remove: (categoryId: string) => void;
 };
 
 class CategoryList extends React.Component<Props> {
diff --git a/src/modules/knowledgeBase/components/category/CategoryRow.tsx b/src/modules/knowledgeBase/components/category/CategoryRow.tsx
index 14624682a..6cba92829 100644
--- a/src/modules/knowledgeBase/components/category/CategoryRow.tsx
+++ b/src/modules/knowledgeBase/components/category/CategoryRow.tsx
@@ -10,7 +10,7 @@ type Props = {
   topicIds: string;
   category: ICategory;
   articlesCount: number;
-  remove: (_id: string) => void;
+  remove: (categoryId: string) => void;
   isActive: boolean;
 };
 
diff --git a/src/modules/knowledgeBase/components/knowledge/KnowledgeForm.tsx b/src/modules/knowledgeBase/components/knowledge/KnowledgeForm.tsx
index e9ca8f89e..f7989797f 100644
--- a/src/modules/knowledgeBase/components/knowledge/KnowledgeForm.tsx
+++ b/src/modules/knowledgeBase/components/knowledge/KnowledgeForm.tsx
@@ -40,7 +40,7 @@ type Props = {
     callback: () => void,
     topic: ITopic
   ) => void;
-  remove?: (_id: string) => void;
+  remove?: (knowledgeBaseId: string) => void;
   closeModal: () => void;
 };
 
diff --git a/src/modules/knowledgeBase/components/knowledge/KnowledgeList.tsx b/src/modules/knowledgeBase/components/knowledge/KnowledgeList.tsx
index 5eed62cf7..5c2ded7df 100644
--- a/src/modules/knowledgeBase/components/knowledge/KnowledgeList.tsx
+++ b/src/modules/knowledgeBase/components/knowledge/KnowledgeList.tsx
@@ -30,7 +30,7 @@ type Props = {
     callback: () => void,
     object: any
   ) => void;
-  remove: (_id: string) => void;
+  remove: (knowledgeBaseId: string) => void;
 };
 
 class KnowledgeList extends React.Component<Props> {
diff --git a/src/modules/knowledgeBase/components/knowledge/KnowledgeRow.tsx b/src/modules/knowledgeBase/components/knowledge/KnowledgeRow.tsx
index e5828247c..5bfe6d505 100644
--- a/src/modules/knowledgeBase/components/knowledge/KnowledgeRow.tsx
+++ b/src/modules/knowledgeBase/components/knowledge/KnowledgeRow.tsx
@@ -17,7 +17,7 @@ type Props = {
   currentCategoryId: string;
   topic: ITopic;
   articlesCount: number;
-  remove: (_id: string) => void;
+  remove: (knowledgeBaseId: string) => void;
 
   save: (
     params: {
diff --git a/src/modules/knowledgeBase/containers/article/ArticleList.tsx b/src/modules/knowledgeBase/containers/article/ArticleList.tsx
index 8b98f9ccd..e5ba6046a 100644
--- a/src/modules/knowledgeBase/containers/article/ArticleList.tsx
+++ b/src/modules/knowledgeBase/containers/article/ArticleList.tsx
@@ -25,10 +25,10 @@ const ArticleContainer = (props: Props) => {
   } = props;
 
   // remove action
-  const remove = _id => {
+  const remove = articleId => {
     confirm().then(() => {
       removeArticlesMutation({
-        variables: { _id }
+        variables: { _id: articleId }
       })
         .then(() => {
           articlesQuery.refetch();
diff --git a/src/modules/knowledgeBase/containers/category/CategoryList.tsx b/src/modules/knowledgeBase/containers/category/CategoryList.tsx
index b5f324166..7032fcb71 100644
--- a/src/modules/knowledgeBase/containers/category/CategoryList.tsx
+++ b/src/modules/knowledgeBase/containers/category/CategoryList.tsx
@@ -25,10 +25,10 @@ const KnowledgeBaseContainer = (props: Props) => {
   } = props;
 
   // remove action
-  const remove = _id => {
+  const remove = categoryId => {
     confirm().then(() => {
       removeCategoriesMutation({
-        variables: { _id }
+        variables: { _id: categoryId }
       })
         .then(() => {
           categoriesQuery.refetch();
diff --git a/src/modules/knowledgeBase/containers/knowledge/KnowledgeList.tsx b/src/modules/knowledgeBase/containers/knowledge/KnowledgeList.tsx
index 0111151a8..aa150a8e6 100644
--- a/src/modules/knowledgeBase/containers/knowledge/KnowledgeList.tsx
+++ b/src/modules/knowledgeBase/containers/knowledge/KnowledgeList.tsx
@@ -40,10 +40,10 @@ const KnowledgeBaseContainer = (props: Props) => {
   } = props;
 
   // remove action
-  const remove = _id => {
+  const remove = topicId => {
     confirm().then(() => {
       removeTopicsMutation({
-        variables: { _id }
+        variables: { _id: topicId }
       })
         .then(() => {
           topicsQuery.refetch();
diff --git a/src/modules/notifications/components/NotificationList.tsx b/src/modules/notifications/components/NotificationList.tsx
index 145203a17..c464dd8b3 100644
--- a/src/modules/notifications/components/NotificationList.tsx
+++ b/src/modules/notifications/components/NotificationList.tsx
@@ -9,7 +9,7 @@ import { NotifList } from './styles';
 
 type Props = {
   notifications: INotification[];
-  markAsRead: (_ids?: string[]) => void;
+  markAsRead: (notificationIds?: string[]) => void;
   count: number;
 };
 
diff --git a/src/modules/notifications/components/NotificationRow.tsx b/src/modules/notifications/components/NotificationRow.tsx
index b9a051d27..51c52acce 100644
--- a/src/modules/notifications/components/NotificationRow.tsx
+++ b/src/modules/notifications/components/NotificationRow.tsx
@@ -9,7 +9,7 @@ import { INotification } from '../types';
 
 interface IProps extends IRouterProps {
   notification: INotification;
-  markAsRead: (_ids?: string[]) => void;
+  markAsRead: (notificationIds?: string[]) => void;
   createdUser?: IUser;
 }
 
diff --git a/src/modules/notifications/components/NotificationsLatest.tsx b/src/modules/notifications/components/NotificationsLatest.tsx
index dc5c25019..fc94c9cef 100644
--- a/src/modules/notifications/components/NotificationsLatest.tsx
+++ b/src/modules/notifications/components/NotificationsLatest.tsx
@@ -13,7 +13,7 @@ import {
 
 type Props = {
   notifications: INotification[];
-  markAsRead: (_ids?: string[]) => void;
+  markAsRead: (notificationIds?: string[]) => void;
   update?: () => void;
 };
 
diff --git a/src/modules/notifications/containers/NotificationList.tsx b/src/modules/notifications/containers/NotificationList.tsx
index f0e245dbf..af2bff3b1 100644
--- a/src/modules/notifications/containers/NotificationList.tsx
+++ b/src/modules/notifications/containers/NotificationList.tsx
@@ -22,8 +22,10 @@ class NotificationListContainer extends React.Component<Props> {
       notificationsMarkAsReadMutation
     } = this.props;
 
-    const markAsRead = (_ids?: string[]) => {
-      notificationsMarkAsReadMutation({ variables: { _ids: _ids || [] } })
+    const markAsRead = (notificationIds?: string[]) => {
+      notificationsMarkAsReadMutation({
+        variables: { _ids: notificationIds || [] }
+      })
         .then(() => {
           notificationsQuery.refetch();
           Alert.success('Notification have been seen');
diff --git a/src/modules/notifications/containers/NotificationsLatest.tsx b/src/modules/notifications/containers/NotificationsLatest.tsx
index e631516d6..f2c5a34c4 100644
--- a/src/modules/notifications/containers/NotificationsLatest.tsx
+++ b/src/modules/notifications/containers/NotificationsLatest.tsx
@@ -26,8 +26,8 @@ class NotificationsLatestContainer extends React.Component<Props> {
       return <Spinner objective={true} />;
     }
 
-    const markAsRead = _ids => {
-      notificationsMarkAsReadMutation({ variables: { _ids } })
+    const markAsRead = notificationIds => {
+      notificationsMarkAsReadMutation({ variables: { _ids: notificationIds } })
         .then(() => {
           notificationsQuery.refetch();
           Alert.success('Notification have been seen');
diff --git a/src/modules/segments/components/Filter.tsx b/src/modules/segments/components/Filter.tsx
index a9b909368..6c7d72f2c 100755
--- a/src/modules/segments/components/Filter.tsx
+++ b/src/modules/segments/components/Filter.tsx
@@ -13,7 +13,7 @@ import { ISegment } from '../types';
 
 type Props = {
   currentSegment?: string;
-  setSegment: (_id: string) => void;
+  setSegment: (segmentId: string) => void;
   removeSegment: () => void;
   contentType?: string;
   counts?: any;
diff --git a/src/modules/segments/components/SegmentsList.tsx b/src/modules/segments/components/SegmentsList.tsx
index 5763b9cd3..70d174301 100755
--- a/src/modules/segments/components/SegmentsList.tsx
+++ b/src/modules/segments/components/SegmentsList.tsx
@@ -14,7 +14,7 @@ import { ISegment } from '../types';
 type Props = {
   contentType?: string;
   segments: ISegment[];
-  removeSegment: (_id: string) => void;
+  removeSegment: (segmentId: string) => void;
 };
 
 class SegmentsList extends React.Component<Props> {
diff --git a/src/modules/segments/containers/SegmentsList.tsx b/src/modules/segments/containers/SegmentsList.tsx
index 59012c188..7d3f5a214 100755
--- a/src/modules/segments/containers/SegmentsList.tsx
+++ b/src/modules/segments/containers/SegmentsList.tsx
@@ -14,10 +14,10 @@ type Props = {
 const SegmentListContainer = (props: Props) => {
   const { segmentsQuery, removeMutation } = props;
 
-  const removeSegment = _id => {
+  const removeSegment = segmentId => {
     confirm().then(() => {
       removeMutation({
-        variables: { _id }
+        variables: { _id: segmentId }
       })
         .then(() => {
           segmentsQuery.refetch();
diff --git a/src/modules/settings/brands/components/Sidebar.tsx b/src/modules/settings/brands/components/Sidebar.tsx
index 8bb7ffefa..54bf43e60 100644
--- a/src/modules/settings/brands/components/Sidebar.tsx
+++ b/src/modules/settings/brands/components/Sidebar.tsx
@@ -14,7 +14,7 @@ import { IBrand } from '../types';
 
 type Props = {
   brands: IBrand[];
-  remove: (_id: string) => void;
+  remove: (brandId: string) => void;
   save: (
     params: {
       doc: {
diff --git a/src/modules/settings/brands/containers/Sidebar.tsx b/src/modules/settings/brands/containers/Sidebar.tsx
index bef99e3bc..dbb68bc62 100644
--- a/src/modules/settings/brands/containers/Sidebar.tsx
+++ b/src/modules/settings/brands/containers/Sidebar.tsx
@@ -31,10 +31,10 @@ const SidebarContainer = (props: ChildProps<QueryResponse>) => {
   const brandsTotalCount = brandsCountQuery.brandsTotalCount || 0;
 
   // remove action
-  const remove = _id => {
+  const remove = brandId => {
     confirm().then(() => {
       removeMutation({
-        variables: { _id }
+        variables: { _id: brandId }
       })
         .then(() => {
           brandsQuery.refetch();
diff --git a/src/modules/settings/channels/components/Sidebar.tsx b/src/modules/settings/channels/components/Sidebar.tsx
index 0b453cb9f..9bda33216 100644
--- a/src/modules/settings/channels/components/Sidebar.tsx
+++ b/src/modules/settings/channels/components/Sidebar.tsx
@@ -17,7 +17,7 @@ import { ChannelRow } from './';
 type Props = {
   channels: IChannel[];
   members: IUser[];
-  remove: (_id: string) => void;
+  remove: (channelId: string) => void;
   save: (
     params: {
       doc: {
diff --git a/src/modules/settings/channels/containers/Sidebar.tsx b/src/modules/settings/channels/containers/Sidebar.tsx
index bf56c4c85..ab8db30b7 100644
--- a/src/modules/settings/channels/containers/Sidebar.tsx
+++ b/src/modules/settings/channels/containers/Sidebar.tsx
@@ -48,10 +48,10 @@ const SidebarContainer = (props: Props) => {
   const channelsTotalCount = channelsCountQuery.channelsTotalCount || 0;
 
   // remove action
-  const remove = _id => {
+  const remove = channelId => {
     confirm().then(() => {
       removeMutation({
-        variables: { _id }
+        variables: { _id: channelId }
       })
         .then(() => {
           Alert.success('Successfully deleted.');
diff --git a/src/modules/settings/common/components/RowActions.tsx b/src/modules/settings/common/components/RowActions.tsx
index 9d03b032b..d59c7bcc6 100644
--- a/src/modules/settings/common/components/RowActions.tsx
+++ b/src/modules/settings/common/components/RowActions.tsx
@@ -14,7 +14,7 @@ type Props = {
   renderForm: (
     doc: { object: any; closeModal: () => void; save: () => void }
   ) => void;
-  remove: (_id: string) => void;
+  remove: (id: string) => void;
   save: () => void;
 };
 
diff --git a/src/modules/settings/common/types.ts b/src/modules/settings/common/types.ts
index 9518c72ac..ed54363e2 100644
--- a/src/modules/settings/common/types.ts
+++ b/src/modules/settings/common/types.ts
@@ -1,7 +1,7 @@
 export interface ICommonListProps {
   objects: any;
   history: any;
-  remove: (_id: string) => void;
+  remove: (id: string) => void;
   save: () => void;
   refetch: () => void;
   totalCount: number;
@@ -11,7 +11,7 @@ export interface ICommonListProps {
 export interface ICommonRowActionProps {
   size?: string;
   object: any;
-  remove: (_id: string) => void;
+  remove: (id: string) => void;
   save: () => void;
 }
 
diff --git a/src/modules/settings/deals/components/BoardRow.tsx b/src/modules/settings/deals/components/BoardRow.tsx
index 1f1ee035f..a4d607ab2 100644
--- a/src/modules/settings/deals/components/BoardRow.tsx
+++ b/src/modules/settings/deals/components/BoardRow.tsx
@@ -8,7 +8,7 @@ import { BoardForm } from './';
 
 type Props = {
   board: IBoard;
-  remove: (_id: string) => void;
+  remove: (boardId: string) => void;
   save: (
     params: { doc: { name: string } },
     callback: () => void,
diff --git a/src/modules/settings/deals/components/Boards.tsx b/src/modules/settings/deals/components/Boards.tsx
index 60f717717..ec84706bf 100644
--- a/src/modules/settings/deals/components/Boards.tsx
+++ b/src/modules/settings/deals/components/Boards.tsx
@@ -9,7 +9,7 @@ import { BoardForm, BoardRow } from './';
 type Props = {
   currentBoardId?: string;
   boards: IBoard[];
-  remove: (_id: string) => void;
+  remove: (boardId: string) => void;
   save: (
     params: { doc: { name: string } },
     callback: () => void,
diff --git a/src/modules/settings/deals/components/PipelineRow.tsx b/src/modules/settings/deals/components/PipelineRow.tsx
index 2e3129508..25a8a37f9 100644
--- a/src/modules/settings/deals/components/PipelineRow.tsx
+++ b/src/modules/settings/deals/components/PipelineRow.tsx
@@ -6,7 +6,7 @@ import { IPipeline } from '../types';
 type Props = {
   pipeline: IPipeline;
   edit: () => void;
-  remove: (_id: string) => void;
+  remove: (pipelineId: string) => void;
 };
 
 class PipelineRow extends React.Component<Props> {
diff --git a/src/modules/settings/deals/components/Pipelines.tsx b/src/modules/settings/deals/components/Pipelines.tsx
index cf061d8aa..fc44846f3 100644
--- a/src/modules/settings/deals/components/Pipelines.tsx
+++ b/src/modules/settings/deals/components/Pipelines.tsx
@@ -16,7 +16,7 @@ type Props = {
     pipeline?: IPipeline
   ) => void;
   updateOrder?: any;
-  remove: (_id: string) => void;
+  remove: (pipelineId: string) => void;
   boardId: string;
 };
 
diff --git a/src/modules/settings/deals/components/StageItem.tsx b/src/modules/settings/deals/components/StageItem.tsx
index 18125f3cf..64062cd2c 100755
--- a/src/modules/settings/deals/components/StageItem.tsx
+++ b/src/modules/settings/deals/components/StageItem.tsx
@@ -6,8 +6,8 @@ import { IStage } from '../types';
 
 type Props = {
   stage: IStage;
-  remove: (_id: string) => void;
-  onChange: (_id: string, e: any) => void;
+  remove: (stageId: string) => void;
+  onChange: (stageId: string, e: any) => void;
   onKeyPress: (e: any) => void;
 };
 
diff --git a/src/modules/settings/deals/components/Stages.tsx b/src/modules/settings/deals/components/Stages.tsx
index 350469668..eae2f7234 100644
--- a/src/modules/settings/deals/components/Stages.tsx
+++ b/src/modules/settings/deals/components/Stages.tsx
@@ -25,11 +25,11 @@ class Stages extends React.Component<Props, {}> {
     }
   }
 
-  onChange(_id, e) {
+  onChange(stageId, e) {
     const { name, value } = e.target;
     const { stages, onChangeStages } = this.props;
 
-    const stage = stages.find(s => s._id === _id);
+    const stage = stages.find(s => s._id === stageId);
     stage[name] = value;
 
     onChangeStages(stages);
@@ -46,10 +46,10 @@ class Stages extends React.Component<Props, {}> {
     onChangeStages(stages);
   }
 
-  remove(_id) {
+  remove(stageId) {
     const { stages, onChangeStages } = this.props;
 
-    const remainedStages = stages.filter(stage => stage._id !== _id);
+    const remainedStages = stages.filter(stage => stage._id !== stageId);
 
     onChangeStages(remainedStages);
   }
diff --git a/src/modules/settings/deals/containers/Boards.tsx b/src/modules/settings/deals/containers/Boards.tsx
index 6be2f7d3a..2257f5c1c 100644
--- a/src/modules/settings/deals/containers/Boards.tsx
+++ b/src/modules/settings/deals/containers/Boards.tsx
@@ -30,14 +30,14 @@ class BoardsContainer extends React.Component<IProps> {
     const boards = boardsQuery.dealBoards || [];
 
     // remove action
-    const remove = _id => {
+    const remove = boardId => {
       confirm().then(() => {
         removeMutation({
-          variables: { _id }
+          variables: { _id: boardId }
         })
           .then(() => {
             // if deleted board is default board
-            if (localStorage.getItem(STORAGE_BOARD_KEY) === _id) {
+            if (localStorage.getItem(STORAGE_BOARD_KEY) === boardId) {
               localStorage.removeItem(STORAGE_BOARD_KEY);
             }
 
diff --git a/src/modules/settings/deals/containers/Pipelines.tsx b/src/modules/settings/deals/containers/Pipelines.tsx
index 4f705d384..e44ccabd9 100644
--- a/src/modules/settings/deals/containers/Pipelines.tsx
+++ b/src/modules/settings/deals/containers/Pipelines.tsx
@@ -54,10 +54,10 @@ class PipelinesContainer extends React.Component<Props> {
     const pipelines = pipelinesQuery.dealPipelines;
 
     // remove action
-    const remove = _id => {
+    const remove = pipelineId => {
       confirm().then(() => {
         removePipelineMutation({
-          variables: { _id }
+          variables: { _id: pipelineId }
         })
           .then(() => {
             pipelinesQuery.refetch();
diff --git a/src/modules/settings/importHistory/components/Histories.tsx b/src/modules/settings/importHistory/components/Histories.tsx
index 73fbd466e..b44fadcb8 100644
--- a/src/modules/settings/importHistory/components/Histories.tsx
+++ b/src/modules/settings/importHistory/components/Histories.tsx
@@ -10,7 +10,7 @@ type Props = {
   queryParams: any;
   currentType: string;
   histories: IImportHistory[];
-  removeHistory: (_id: string) => void;
+  removeHistory: (historyId: string) => void;
   loading: boolean;
 };
 
diff --git a/src/modules/settings/importHistory/components/Row.tsx b/src/modules/settings/importHistory/components/Row.tsx
index b39c7ed5f..0ed67f1c9 100644
--- a/src/modules/settings/importHistory/components/Row.tsx
+++ b/src/modules/settings/importHistory/components/Row.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
 
 type Props = {
   history?: any;
-  removeHistory: (_id: string) => void;
+  removeHistory: (historyId: string) => void;
 };
 
 function HistoryRow({ history, removeHistory }: Props) {
diff --git a/src/modules/settings/importHistory/containers/Histories.tsx b/src/modules/settings/importHistory/containers/Histories.tsx
index e9ae71c42..480bb6d2c 100644
--- a/src/modules/settings/importHistory/containers/Histories.tsx
+++ b/src/modules/settings/importHistory/containers/Histories.tsx
@@ -37,11 +37,11 @@ class HistoriesContainer extends React.Component<IProps, State> {
 
     const currentType = router.getParam(history, 'type');
 
-    const removeHistory = _id => {
+    const removeHistory = historyId => {
       this.setState({ loading: true });
 
       importHistoriesRemove({
-        variables: { _id }
+        variables: { _id: historyId }
       })
         .then(() => {
           Alert.success(__('Successfully Removed all customers'));
diff --git a/src/modules/settings/productService/components/List.tsx b/src/modules/settings/productService/components/List.tsx
index b9d3fe9db..4cf74de3d 100755
--- a/src/modules/settings/productService/components/List.tsx
+++ b/src/modules/settings/productService/components/List.tsx
@@ -23,7 +23,7 @@ type Doc = {
 type Props = {
   products: IProduct[];
   productsCount: number;
-  remove: (_id: string) => void;
+  remove: (productId: string) => void;
   save: (doc: Doc, callback: () => void, product?: IProduct) => void;
   loading: boolean;
 };
diff --git a/src/modules/settings/productService/components/Row.tsx b/src/modules/settings/productService/components/Row.tsx
index b773fbe3f..375a09e7f 100644
--- a/src/modules/settings/productService/components/Row.tsx
+++ b/src/modules/settings/productService/components/Row.tsx
@@ -22,7 +22,7 @@ type Doc = {
 
 type Props = {
   product: IProduct;
-  remove: (_id: string) => void;
+  remove: (productId: string) => void;
   save: (doc: Doc, callback: () => void, product?: IProduct) => void;
 };
 
diff --git a/src/modules/settings/productService/containers/List.tsx b/src/modules/settings/productService/containers/List.tsx
index da7e627c1..ac9901539 100644
--- a/src/modules/settings/productService/containers/List.tsx
+++ b/src/modules/settings/productService/containers/List.tsx
@@ -36,10 +36,10 @@ class ProductListContainer extends React.Component<Props> {
     const products = productsQuery.products || [];
 
     // remove action
-    const remove = _id => {
+    const remove = productId => {
       confirm().then(() => {
         removeMutation({
-          variables: { _id }
+          variables: { _id: productId }
         })
           .then(() => {
             productsQuery.refetch();
diff --git a/src/modules/settings/utils/commonListComposer.tsx b/src/modules/settings/utils/commonListComposer.tsx
index b71e54da7..953260997 100755
--- a/src/modules/settings/utils/commonListComposer.tsx
+++ b/src/modules/settings/utils/commonListComposer.tsx
@@ -3,6 +3,10 @@ import { Alert } from 'modules/common/utils';
 import * as React from 'react';
 import { compose } from 'react-apollo';
 
+interface IRemoveMutationVariables {
+  _id: string;
+}
+
 const commonListComposer = options => {
   const {
     name,
@@ -18,12 +22,12 @@ const commonListComposer = options => {
     totalCountQuery: any;
     listQuery: any;
     history: any;
-    addMutation: ({ variables: any }) => Promise<any>;
-    editMutation: ({ variables: any }) => Promise<any>;
+    addMutation: ({ variables }: { variables: any }) => Promise<any>;
+    editMutation: ({ variables }: { variables: any }) => Promise<any>;
     removeMutation: (
       {
-        variables: { _id: string }
-      }
+        variables: { _id }
+      }: { variables: IRemoveMutationVariables }
     ) => Promise<any>;
   };
 
@@ -42,10 +46,10 @@ const commonListComposer = options => {
     const objects = listQuery[name] || [];
 
     // remove action
-    const remove = _id => {
+    const remove = id => {
       confirm().then(() => {
         removeMutation({
-          variables: { _id }
+          variables: { _id: id }
         })
           .then(() => {
             // update queries
diff --git a/tslint.json b/tslint.json
index 0d8032e3b..d4ada5dae 100644
--- a/tslint.json
+++ b/tslint.json
@@ -8,7 +8,6 @@
     "object-literal-sort-keys": false,
     "no-unused-expression": [true, "allow-tagged-template"],
     "interface-over-type-literal": false,
-    "variable-name": false,
     "no-empty": false,
     "one-variable-per-declaration": false,
     "no-console": false, // allow some console statements for debugging