diff --git a/client/src/config/sidebarMenu.js b/client/src/config/sidebarMenu.js
index 3e5c7cf18..41829981c 100644
--- a/client/src/config/sidebarMenu.js
+++ b/client/src/config/sidebarMenu.js
@@ -40,7 +40,7 @@ export default [
         newTabHref: '/estimates/new',
       },
       {
-        text: <T id={'invocies'} />,
+        text: <T id={'invoices'} />,
         href: '/invoices',
         newTabHref: '/invoices/new',
       },
diff --git a/client/src/containers/Customers/Customer.js b/client/src/containers/Customers/CustomerFormPage.js
similarity index 97%
rename from client/src/containers/Customers/Customer.js
rename to client/src/containers/Customers/CustomerFormPage.js
index 17f4b5bba..cf76e2f6f 100644
--- a/client/src/containers/Customers/Customer.js
+++ b/client/src/containers/Customers/CustomerFormPage.js
@@ -13,7 +13,7 @@ import { compose } from 'utils';
 
 import 'style/pages/Customers/PageForm.scss';
 
-function Customer({
+function CustomerFormPage({
   // // #withDashboardActions
   // changePageTitle,
 
@@ -69,4 +69,4 @@ function Customer({
   );
 }
 
-export default compose(withCustomersActions, withCurrenciesActions)(Customer);
+export default compose(withCustomersActions, withCurrenciesActions)(CustomerFormPage);
diff --git a/client/src/containers/Customers/CustomersList.js b/client/src/containers/Customers/CustomersList.js
index 8ce331458..89eb52f5a 100644
--- a/client/src/containers/Customers/CustomersList.js
+++ b/client/src/containers/Customers/CustomersList.js
@@ -71,8 +71,8 @@ function CustomersList({
   );
 
   const handleEditCustomer = useCallback(
-    (cusomter) => {
-      history.push(`/customers/${cusomter.id}/edit`);
+    (customer) => {
+      history.push(`/customers/${customer.id}/edit`);
     },
     [history],
   );
diff --git a/client/src/containers/ExchangeRates/ExchangeRate.js b/client/src/containers/ExchangeRates/ExchangeRatesList.js
similarity index 98%
rename from client/src/containers/ExchangeRates/ExchangeRate.js
rename to client/src/containers/ExchangeRates/ExchangeRatesList.js
index 06de38537..f019ccb53 100644
--- a/client/src/containers/ExchangeRates/ExchangeRate.js
+++ b/client/src/containers/ExchangeRates/ExchangeRatesList.js
@@ -21,7 +21,7 @@ import withExchangeRatesActions from 'containers/ExchangeRates/withExchangeRates
 
 import { compose } from 'utils';
 
-function ExchangeRate({
+function ExchangeRatesList({
   // #withDashboardActions
   changePageTitle,
 
@@ -51,7 +51,7 @@ function ExchangeRate({
   useEffect(() => {
     id
       ? changePageTitle(formatMessage({ id: 'exchange_rate_details' }))
-      : changePageTitle(formatMessage({ id: 'exchange_rate_list' }));
+      : changePageTitle(formatMessage({ id: 'exchange_rates_list' }));
   }, [id, changePageTitle, formatMessage]);
 
   const handelDeleteExchangeRate = useCallback(
@@ -201,4 +201,4 @@ export default compose(
   withResourceActions,
   withDashboardActions,
   withDialogActions,
-)(ExchangeRate);
+)(ExchangeRatesList);
diff --git a/client/src/containers/Expenses/Expenses.js b/client/src/containers/Expenses/ExpenseFormPage.js
similarity index 98%
rename from client/src/containers/Expenses/Expenses.js
rename to client/src/containers/Expenses/ExpenseFormPage.js
index cd78f8611..c2ee0a98d 100644
--- a/client/src/containers/Expenses/Expenses.js
+++ b/client/src/containers/Expenses/ExpenseFormPage.js
@@ -18,7 +18,7 @@ import 'style/pages/Expense/PageForm.scss';
 /**
  * Expense page form.
  */
-function Expenses({
+function ExpenseFormPage({
   // #withwithAccountsActions
   requestFetchAccounts,
   requestFetchAccountTypes,
@@ -109,4 +109,4 @@ export default compose(
   withExpensesActions,
   withCustomersActions,
   withDashboardActions,
-)(Expenses);
+)(ExpenseFormPage);
diff --git a/client/src/containers/Purchases/Bill/Bills.js b/client/src/containers/Purchases/Bill/BillFormPage.js
similarity index 98%
rename from client/src/containers/Purchases/Bill/Bills.js
rename to client/src/containers/Purchases/Bill/BillFormPage.js
index 815f5cc2c..19fbe39e5 100644
--- a/client/src/containers/Purchases/Bill/Bills.js
+++ b/client/src/containers/Purchases/Bill/BillFormPage.js
@@ -16,7 +16,7 @@ import { compose } from 'utils';
 
 import 'style/pages/Bills/PageForm.scss';
 
-function Bills({
+function BillFormPage({
   // #withwithAccountsActions
   requestFetchAccounts,
 
@@ -112,4 +112,4 @@ export default compose(
   withAccountsActions,
   withSettingsActions,
   withDashboardActions
-)(Bills);
+)(BillFormPage);
diff --git a/client/src/containers/Purchases/Bill/BillList.js b/client/src/containers/Purchases/Bill/BillsList.js
similarity index 98%
rename from client/src/containers/Purchases/Bill/BillList.js
rename to client/src/containers/Purchases/Bill/BillsList.js
index bce467bae..2b37cad0d 100644
--- a/client/src/containers/Purchases/Bill/BillList.js
+++ b/client/src/containers/Purchases/Bill/BillsList.js
@@ -24,7 +24,7 @@ import { compose } from 'utils';
 /**
  * Bills list.
  */
-function BillList({
+function BillsList({
   // #withDashboardActions
   changePageTitle,
 
@@ -48,7 +48,7 @@ function BillList({
   const [selectedRows, setSelectedRows] = useState([]);
 
   useEffect(() => {
-    changePageTitle(formatMessage({ id: 'bill_list' }));
+    changePageTitle(formatMessage({ id: 'bills_list' }));
   }, [changePageTitle, formatMessage]);
 
   const fetchResourceViews = useQuery(
@@ -195,4 +195,4 @@ export default compose(
   withBills(({ billsTableQuery }) => ({
     billsTableQuery,
   })),
-)(BillList);
+)(BillsList);
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentMade.js b/client/src/containers/Purchases/PaymentMades/PaymentMadeFormPage.js
similarity index 98%
rename from client/src/containers/Purchases/PaymentMades/PaymentMade.js
rename to client/src/containers/Purchases/PaymentMades/PaymentMadeFormPage.js
index 1e863c682..81a3ed7b9 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentMade.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentMadeFormPage.js
@@ -21,7 +21,7 @@ import 'style/pages/PaymentMade/PageForm.scss'
 /**
  * Payment made - Page form.
  */
-function PaymentMade({
+function PaymentMadeFormPage({
   //#withAccountsActions
   requestFetchAccounts,
 
@@ -119,5 +119,5 @@ export default compose(
   withPaymentMadeActions,
   withSettingsActions,
   withDashboardActions,
-)(PaymentMade);
+)(PaymentMadeFormPage);
 
diff --git a/client/src/containers/Sales/Estimate/Estimates.js b/client/src/containers/Sales/Estimate/EstimateFormPage.js
similarity index 98%
rename from client/src/containers/Sales/Estimate/Estimates.js
rename to client/src/containers/Sales/Estimate/EstimateFormPage.js
index d01f90943..9dbb3ed63 100644
--- a/client/src/containers/Sales/Estimate/Estimates.js
+++ b/client/src/containers/Sales/Estimate/EstimateFormPage.js
@@ -15,7 +15,7 @@ import { compose } from 'utils';
 
 import 'style/pages/SaleEstimate/PageForm.scss';
 
-function Estimates({
+function EstimateFormPage({
   // #withCustomersActions
   requestFetchCustomers,
 
@@ -101,4 +101,4 @@ export default compose(
   withItemsActions,
   withSettingsActions,
   withDashboardActions,
-)(Estimates);
+)(EstimateFormPage);
diff --git a/client/src/containers/Sales/Estimate/EstimateList.js b/client/src/containers/Sales/Estimate/EstimatesList.js
similarity index 98%
rename from client/src/containers/Sales/Estimate/EstimateList.js
rename to client/src/containers/Sales/Estimate/EstimatesList.js
index 65629c6af..e3a5e9dce 100644
--- a/client/src/containers/Sales/Estimate/EstimateList.js
+++ b/client/src/containers/Sales/Estimate/EstimatesList.js
@@ -20,7 +20,7 @@ import withViewsActions from 'containers/Views/withViewsActions';
 
 import { compose } from 'utils';
 
-function EstimateList({
+function EstimatesList({
   // #withDashboardActions
   changePageTitle,
 
@@ -65,7 +65,7 @@ function EstimateList({
   );
 
   useEffect(() => {
-    changePageTitle(formatMessage({ id: 'estimate_list' }));
+    changePageTitle(formatMessage({ id: 'estimates_list' }));
   }, [changePageTitle, formatMessage]);
 
   // handle delete estimate click
@@ -288,4 +288,4 @@ export default compose(
     estimatesTableQuery,
     estimateViews,
   })),
-)(EstimateList);
+)(EstimatesList);
diff --git a/client/src/containers/Sales/Invoice/Invoices.js b/client/src/containers/Sales/Invoice/InvoiceFormPage.js
similarity index 98%
rename from client/src/containers/Sales/Invoice/Invoices.js
rename to client/src/containers/Sales/Invoice/InvoiceFormPage.js
index 49c31ad4c..9790b262c 100644
--- a/client/src/containers/Sales/Invoice/Invoices.js
+++ b/client/src/containers/Sales/Invoice/InvoiceFormPage.js
@@ -15,7 +15,7 @@ import { compose } from 'utils';
 
 import 'style/pages/SaleInvoice/PageForm.scss';
 
-function Invoices({
+function InvoiceFormPage({
   // #withCustomersActions
   requestFetchCustomers,
 
@@ -100,4 +100,4 @@ export default compose(
   withItemsActions,
   withSettingsActions,
   withDashboardActions,
-)(Invoices);
+)(InvoiceFormPage);
diff --git a/client/src/containers/Sales/Invoice/InvoiceList.js b/client/src/containers/Sales/Invoice/InvoicesList.js
similarity index 98%
rename from client/src/containers/Sales/Invoice/InvoiceList.js
rename to client/src/containers/Sales/Invoice/InvoicesList.js
index 261f37163..60623bb6b 100644
--- a/client/src/containers/Sales/Invoice/InvoiceList.js
+++ b/client/src/containers/Sales/Invoice/InvoicesList.js
@@ -23,7 +23,7 @@ import { compose } from 'utils';
 /**
  * Invoices list.
  */
-function InvoiceList({
+function InvoicesList({
   // #withDashboardActions
   changePageTitle,
 
@@ -48,7 +48,7 @@ function InvoiceList({
   const [selectedRows, setSelectedRows] = useState([]);
 
   useEffect(() => {
-    changePageTitle(formatMessage({ id: 'invoice_list' }));
+    changePageTitle(formatMessage({ id: 'invoices_list' }));
   }, [changePageTitle, formatMessage]);
 
   const fetchResourceViews = useQuery(
@@ -222,4 +222,4 @@ export default compose(
   withInvoices(({ invoicesTableQuery }) => ({
     invoicesTableQuery,
   })),
-)(InvoiceList);
+)(InvoicesList);
diff --git a/client/src/containers/Sales/PaymentReceive/PaymentReceiveList.js b/client/src/containers/Sales/PaymentReceive/PaymentReceivesList.js
similarity index 98%
rename from client/src/containers/Sales/PaymentReceive/PaymentReceiveList.js
rename to client/src/containers/Sales/PaymentReceive/PaymentReceivesList.js
index 8161a7db0..4e4d104c8 100644
--- a/client/src/containers/Sales/PaymentReceive/PaymentReceiveList.js
+++ b/client/src/containers/Sales/PaymentReceive/PaymentReceivesList.js
@@ -42,7 +42,7 @@ function PaymentReceiveList({
   const [selectedRows, setSelectedRows] = useState([]);
 
   useEffect(() => {
-    changePageTitle(formatMessage({ id: 'payment_Receive_list' }));
+    changePageTitle(formatMessage({ id: 'payment_Receives_list' }));
   }, [changePageTitle, formatMessage]);
 
   const fetchResourceViews = useQuery(
diff --git a/client/src/containers/Sales/Receipt/Receipts.js b/client/src/containers/Sales/Receipt/ReceiptFormPage.js
similarity index 98%
rename from client/src/containers/Sales/Receipt/Receipts.js
rename to client/src/containers/Sales/Receipt/ReceiptFormPage.js
index 6e2603249..dc94d2ea9 100644
--- a/client/src/containers/Sales/Receipt/Receipts.js
+++ b/client/src/containers/Sales/Receipt/ReceiptFormPage.js
@@ -14,7 +14,7 @@ import withDashboardActions from 'containers/Dashboard/withDashboardActions';
 
 import { compose } from 'utils';
 
-function Receipts({
+function ReceiptFormPage({
   //#withwithAccountsActions
   requestFetchAccounts,
 
@@ -107,4 +107,4 @@ export default compose(
   withAccountsActions,
   withSettingsActions,
   withDashboardActions,
-)(Receipts);
+)(ReceiptFormPage);
diff --git a/client/src/containers/Sales/Receipt/ReceiptList.js b/client/src/containers/Sales/Receipt/ReceiptsList.js
similarity index 98%
rename from client/src/containers/Sales/Receipt/ReceiptList.js
rename to client/src/containers/Sales/Receipt/ReceiptsList.js
index 283dc3f23..ab8cf7101 100644
--- a/client/src/containers/Sales/Receipt/ReceiptList.js
+++ b/client/src/containers/Sales/Receipt/ReceiptsList.js
@@ -20,7 +20,7 @@ import withViewsActions from 'containers/Views/withViewsActions';
 
 import { compose } from 'utils';
 
-function ReceiptList({
+function ReceiptsList({
   // #withDashboardActions
   changePageTitle,
 
@@ -54,7 +54,7 @@ function ReceiptList({
   );
 
   useEffect(() => {
-    changePageTitle(formatMessage({ id: 'receipt_list' }));
+    changePageTitle(formatMessage({ id: 'receipts_list' }));
   }, [changePageTitle, formatMessage]);
 
   // handle delete receipt click
@@ -206,4 +206,4 @@ export default compose(
   withReceipts(({ receiptTableQuery }) => ({
     receiptTableQuery,
   })),
-)(ReceiptList);
+)(ReceiptsList);
diff --git a/client/src/containers/Vendors/Vendor.js b/client/src/containers/Vendors/VendorFormPage.js
similarity index 97%
rename from client/src/containers/Vendors/Vendor.js
rename to client/src/containers/Vendors/VendorFormPage.js
index 032da663e..454a63d0f 100644
--- a/client/src/containers/Vendors/Vendor.js
+++ b/client/src/containers/Vendors/VendorFormPage.js
@@ -11,7 +11,7 @@ import withCurrenciesActions from 'containers/Currencies/withCurrenciesActions';
 
 import { compose } from 'utils';
 
-function Vendor({
+function VendorFormPage({
   // #withVendorActions
   requestFetchVendorsTable,
   requsetFetchVendor,
@@ -65,4 +65,4 @@ function Vendor({
   );
 }
 
-export default compose(withCurrenciesActions, withVendorActions)(Vendor);
+export default compose(withCurrenciesActions, withVendorActions)(VendorFormPage);
diff --git a/client/src/routes/dashboard.js b/client/src/routes/dashboard.js
index ff05aa653..7127cb81e 100644
--- a/client/src/routes/dashboard.js
+++ b/client/src/routes/dashboard.js
@@ -63,6 +63,7 @@ export default [
     }),
     breadcrumb: 'Categories',
   },
+  // Items.
   {
     path: `/items/:id/edit`,
     component: LazyLoader({
@@ -77,8 +78,6 @@ export default [
     }),
     breadcrumb: 'New Item',
   },
-
-  // Items.
   {
     path: `/items`,
     component: LazyLoader({
@@ -86,6 +85,7 @@ export default [
     }),
     breadcrumb: 'Items',
   },
+
   // Inventory adjustments.
   {
     path: `/inventory-adjustments`,
@@ -136,9 +136,7 @@ export default [
     path: '/financial-reports/receivable-aging-summary',
     component: LazyLoader({
       loader: () =>
-        import(
-          'containers/FinancialStatements/ARAgingSummary/ARAgingSummary'
-        ),
+        import('containers/FinancialStatements/ARAgingSummary/ARAgingSummary'),
     }),
     breadcrumb: 'Receivable Aging Summary',
   },
@@ -156,10 +154,11 @@ export default [
     }),
     breadcrumb: 'Financial Reports',
   },
+  // Exchange Rates
   {
     path: `/exchange-rates`,
     component: LazyLoader({
-      loader: () => import('containers/ExchangeRates/ExchangeRate'),
+      loader: () => import('containers/ExchangeRates/ExchangeRatesList'),
     }),
     breadcrumb: 'Exchange Rates',
   },
@@ -167,14 +166,14 @@ export default [
   {
     path: `/expenses/new`,
     component: LazyLoader({
-      loader: () => import('containers/Expenses/Expenses'),
+      loader: () => import('containers/Expenses/ExpenseFormPage'),
     }),
     breadcrumb: 'Expenses',
   },
   {
     path: `/expenses/:id/edit`,
     component: LazyLoader({
-      loader: () => import('containers/Expenses/Expenses'),
+      loader: () => import('containers/Expenses/ExpenseFormPage'),
     }),
     breadcrumb: 'Edit',
   },
@@ -185,23 +184,22 @@ export default [
     }),
     breadcrumb: 'Expenses List',
   },
+
+  // Customers
   {
     path: `/customers/:id/edit`,
     component: LazyLoader({
-      loader: () => import('containers/Customers/Customer'),
+      loader: () => import('containers/Customers/CustomerFormPage'),
     }),
     breadcrumb: 'Edit Customer',
   },
-
   {
     path: `/customers/new`,
     component: LazyLoader({
-      loader: () => import('containers/Customers/Customer'),
+      loader: () => import('containers/Customers/CustomerFormPage'),
     }),
     breadcrumb: 'New Customer',
   },
-
-  // Customers
   {
     path: `/customers`,
     component: LazyLoader({
@@ -214,14 +212,14 @@ export default [
   {
     path: `/vendors/:id/edit`,
     component: LazyLoader({
-      loader: () => import('containers/Vendors/Vendor'),
+      loader: () => import('containers/Vendors/VendorFormPage'),
     }),
     breadcrumb: 'Edit Vendor',
   },
   {
     path: `/vendors/new`,
     component: LazyLoader({
-      loader: () => import('containers/Vendors/Vendor'),
+      loader: () => import('containers/Vendors/VendorFormPage'),
     }),
     breadcrumb: 'New Vendor',
   },
@@ -237,21 +235,21 @@ export default [
   {
     path: `/estimates/:id/edit`,
     component: LazyLoader({
-      loader: () => import('containers/Sales/Estimate/Estimates'),
+      loader: () => import('containers/Sales/Estimate/EstimateFormPage'),
     }),
     breadcrumb: 'Edit',
   },
   {
     path: `/estimates/new`,
     component: LazyLoader({
-      loader: () => import('containers/Sales/Estimate/Estimates'),
+      loader: () => import('containers/Sales/Estimate/EstimateFormPage'),
     }),
-    breadcrumb: 'New Estimates',
+    breadcrumb: 'New Estimate',
   },
   {
     path: `/estimates`,
     component: LazyLoader({
-      loader: () => import('containers/Sales/Estimate/EstimateList'),
+      loader: () => import('containers/Sales/Estimate/EstimatesList'),
     }),
     breadcrumb: 'Estimates List',
   },
@@ -260,21 +258,21 @@ export default [
   {
     path: `/invoices/:id/edit`,
     component: LazyLoader({
-      loader: () => import('containers/Sales/Invoice/Invoices'),
+      loader: () => import('containers/Sales/Invoice/InvoiceFormPage'),
     }),
     breadcrumb: 'Edit',
   },
   {
     path: `/invoices/new`,
     component: LazyLoader({
-      loader: () => import('containers/Sales/Invoice/Invoices'),
+      loader: () => import('containers/Sales/Invoice/InvoiceFormPage'),
     }),
     breadcrumb: 'New Invoice',
   },
   {
     path: `/invoices`,
     component: LazyLoader({
-      loader: () => import('containers/Sales/Invoice/InvoiceList'),
+      loader: () => import('containers/Sales/Invoice/InvoicesList'),
     }),
     breadcrumb: 'Invoices List',
   },
@@ -283,23 +281,23 @@ export default [
   {
     path: `/receipts/:id/edit`,
     component: LazyLoader({
-      loader: () => import('containers/Sales/Receipt/Receipts'),
+      loader: () => import('containers/Sales/Receipt/ReceiptFormPage'),
     }),
     breadcrumb: 'Edit',
   },
   {
     path: `/receipts/new`,
     component: LazyLoader({
-      loader: () => import('containers/Sales/Receipt/Receipts'),
+      loader: () => import('containers/Sales/Receipt/ReceiptFormPage'),
     }),
     breadcrumb: 'New Receipt',
   },
   {
     path: `/receipts`,
     component: LazyLoader({
-      loader: () => import('containers/Sales/Receipt/ReceiptList'),
+      loader: () => import('containers/Sales/Receipt/ReceiptsList'),
     }),
-    breadcrumb: 'Receipt List',
+    breadcrumb: 'Receipts List',
   },
 
   // Payment receives
@@ -323,40 +321,34 @@ export default [
     path: `/payment-receives`,
     component: LazyLoader({
       loader: () =>
-        import('containers/Sales/PaymentReceive/PaymentReceiveList'),
+        import('containers/Sales/PaymentReceive/PaymentReceivesList'),
     }),
-    breadcrumb: 'Payment Receive List',
+    breadcrumb: 'Payment Receives List',
   },
 
   // Bills
   {
     path: `/bills/:id/edit`,
     component: LazyLoader({
-      loader: () => import('containers/Purchases/Bill/Bills'),
+      loader: () => import('containers/Purchases/Bill/BillFormPage'),
     }),
     breadcrumb: 'Edit',
   },
   {
     path: `/bills/new`,
     component: LazyLoader({
-      loader: () => import('containers/Purchases/Bill/Bills'),
+      loader: () => import('containers/Purchases/Bill/BillFormPage'),
     }),
     breadcrumb: 'New Bill',
   },
   {
     path: `/bills`,
     component: LazyLoader({
-      loader: () => import('containers/Purchases/Bill/BillList'),
+      loader: () => import('containers/Purchases/Bill/BillsList'),
     }),
-    breadcrumb: 'Bill List',
-  },
-  {
-    path: `/receipts`,
-    component: LazyLoader({
-      loader: () => import('containers/Sales/Receipt/ReceiptList'),
-    }),
-    breadcrumb: 'Receipt List',
+    breadcrumb: 'Bills List',
   },
+
   // Subscription billing.
   {
     path: `/billing`,
@@ -365,18 +357,18 @@ export default [
     }),
     breadcrumb: 'New Billing',
   },
-  // Payment mades.
+  // Payment modes.
   {
     path: `/payment-mades/:id/edit`,
     component: LazyLoader({
-      loader: () => import('containers/Purchases/PaymentMades/PaymentMade'),
+      loader: () => import('containers/Purchases/PaymentMades/PaymentMadeFormPage'),
     }),
     breadcrumb: 'Edit',
   },
   {
     path: `/payment-mades/new`,
     component: LazyLoader({
-      loader: () => import('containers/Purchases/PaymentMades/PaymentMade'),
+      loader: () => import('containers/Purchases/PaymentMades/PaymentMadeFormPage'),
     }),
     breadcrumb: 'New Payment Made',
   },