diff --git a/components/admin/tools/form/ToolsForm.js b/components/admin/tools/form/ToolsForm.js
index 8b2de4517..a2dad4e55 100644
--- a/components/admin/tools/form/ToolsForm.js
+++ b/components/admin/tools/form/ToolsForm.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Serializer } from 'jsonapi-serializer';
 
 // Services
-import ToolsService from 'services/ToolsService';
+import ToolsService from 'services/tools';
 import { toastr } from 'react-redux-toastr';
 
 import { STATE_DEFAULT, FORM_ELEMENTS } from 'components/admin/tools/form/constants';
diff --git a/components/admin/tools/table/actions/DeleteAction.js b/components/admin/tools/table/actions/DeleteAction.js
index 803d8de14..c6fc62023 100644
--- a/components/admin/tools/table/actions/DeleteAction.js
+++ b/components/admin/tools/table/actions/DeleteAction.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 // Services
-import ToolsService from 'services/ToolsService';
+import ToolsService from 'services/tools';
 import { toastr } from 'react-redux-toastr';
 
 class DeleteAction extends React.Component {
diff --git a/layout/admin/tools-detail/component.js b/layout/admin/tools-detail/component.js
index 5d6fb6799..7a8e37dbc 100644
--- a/layout/admin/tools-detail/component.js
+++ b/layout/admin/tools-detail/component.js
@@ -14,7 +14,7 @@ import Title from 'components/ui/Title';
 import { capitalizeFirstLetter } from 'utils/utils';
 
 // services
-import { fetchTool } from 'services/ToolsService';
+import { fetchTool } from 'services/tools';
 
 class LayoutAdminToolsDetail extends PureComponent {
   static propTypes = {
diff --git a/redactions/admin/tools.js b/redactions/admin/tools.js
index 01dbbd7a2..b089e71a9 100644
--- a/redactions/admin/tools.js
+++ b/redactions/admin/tools.js
@@ -1,5 +1,5 @@
 import 'isomorphic-fetch';
-import ToolsService from 'services/ToolsService';
+import ToolsService from 'services/tools';
 
 /**
  * CONSTANTS
diff --git a/redactions/widget.js b/redactions/widget.js
index 0d7e54690..ffd1905db 100644
--- a/redactions/widget.js
+++ b/redactions/widget.js
@@ -3,7 +3,7 @@ import isEmpty from 'lodash/isEmpty';
 
 // Services
 import DatasetService from 'services/DatasetService';
-import RasterService from 'services/RasterService';
+import RasterService from 'services/raster';
 import { fetchLayer } from 'services/layer';
 import UserService from 'services/UserService';
 import { fetchWidget } from 'services/widget';
diff --git a/services/RasterService.js b/services/raster.js
similarity index 100%
rename from services/RasterService.js
rename to services/raster.js
diff --git a/services/ToolsService.js b/services/tools.js
similarity index 86%
rename from services/ToolsService.js
rename to services/tools.js
index 62d28a100..bac7eddca 100644
--- a/services/ToolsService.js
+++ b/services/tools.js
@@ -16,7 +16,7 @@ export default class ToolsService {
   fetchAllData() {
     return new Promise((resolve, reject) => {
       get({
-        url: `${process.env.WRI_API_URL}/tool/?published=all`,
+        url: `${process.env.WRI_API_URL}/tool/?published=all&env=${process.env.API_ENV}&application=${process.env.APPLICATIONS}`,
         headers: [{
           key: 'Content-Type',
           value: 'application/json'
@@ -45,7 +45,7 @@ export default class ToolsService {
   fetchData(id) {
     return new Promise((resolve, reject) => {
       get({
-        url: `${process.env.WRI_API_URL}/tool/${id}`,
+        url: `${process.env.WRI_API_URL}/tool/${id}?env=${process.env.API_ENV}&application=${process.env.APPLICATIONS}`,
         headers: [{
           key: 'Content-Type',
           value: 'application/json'
@@ -76,7 +76,11 @@ export default class ToolsService {
       post({
         url: `${process.env.WRI_API_URL}/tool/${id}`,
         type,
-        body,
+        body: {
+          ...body,
+          env: process.env.API_ENV,
+          application: process.env.APPLICATIONS
+        },
         headers: [{
           key: 'Content-Type',
           value: 'application/json'
@@ -125,7 +129,7 @@ export default class ToolsService {
  */
 
 export const fetchTool = id =>
-  WRIAPI.get(`/tool/${id}`)
+  WRIAPI.get(`/tool/${id}?env=${process.env.API_ENV}&application=${process.env.APPLICATIONS}`)
     .then((response) => {
       const { status, statusText, data } = response;
       if (status >= 400) throw new Error(statusText);
diff --git a/utils/widgets/WidgetHelper.js b/utils/widgets/WidgetHelper.js
index ffc7c64b5..65e054a01 100644
--- a/utils/widgets/WidgetHelper.js
+++ b/utils/widgets/WidgetHelper.js
@@ -13,7 +13,7 @@ import ScatterChart from 'utils/widgets/scatter';
 import getQueryByFilters from 'utils/getQueryByFilters';
 
 // Services
-import RasterService from 'services/RasterService';
+import RasterService from 'services/raster';
 
 const CHART_TYPES = {
   bar: BarChart,