diff --git a/src/docker.js b/src/docker.js
index 83db821b3..764a5f3a2 100644
--- a/src/docker.js
+++ b/src/docker.js
@@ -18,7 +18,7 @@ exports = module.exports = {
     inspect,
     getContainerIp,
     getEvents,
-    stats,
+    getStats,
 
     update,
 
@@ -660,7 +660,7 @@ async function getEvents(options) {
     return stream;
 }
 
-async function stats(containerId) {
+async function getStats(containerId) {
     assert.strictEqual(typeof containerId, 'string');
 
     const container = gConnection.getContainer(containerId);
diff --git a/src/metrics.js b/src/metrics.js
index 4917985f4..7f5265dc8 100644
--- a/src/metrics.js
+++ b/src/metrics.js
@@ -4,7 +4,7 @@ exports = module.exports = {
     getSystem,
     getSystemStream,
 
-    getContainers,
+    getContainer,
 
     sendToGraphite
 };
@@ -191,7 +191,7 @@ async function getGraphiteUrl() {
     return `http://${ip}:8000/graphite-web/render`;
 }
 
-async function getContainers(name, options) {
+async function getContainer(name, options) {
     assert.strictEqual(typeof name, 'string');
     assert.strictEqual(typeof options, 'object');
 
@@ -295,12 +295,12 @@ async function getSystem(options) {
 
     const appStats = {};
     for (const app of await apps.list()) {
-        appStats[app.id] = await getContainers(app.id, options);
+        appStats[app.id] = await getContainer(app.id, options);
     }
 
     const serviceStats = {};
     for (const serviceId of await services.listServices()) {
-        serviceStats[serviceId] = await getContainers(serviceId, options);
+        serviceStats[serviceId] = await getContainer(serviceId, options);
     }
 
     return {
diff --git a/src/routes/apps.js b/src/routes/apps.js
index 64aad15cc..f697e852e 100644
--- a/src/routes/apps.js
+++ b/src/routes/apps.js
@@ -1075,7 +1075,7 @@ async function getMetrics(req, res, next) {
     const fromSecs = parseInt(req.query.fromSecs);
     const intervalSecs = parseInt(req.query.intervalSecs);
     const noNullPoints = !!req.query.noNullPoints;
-    const [error, result] = await safe(metrics.getContainers(req.resources.app.id, { fromSecs, noNullPoints, intervalSecs }));
+    const [error, result] = await safe(metrics.getContainer(req.resources.app.id, { fromSecs, noNullPoints, intervalSecs }));
     if (error) return next(new HttpError(500, error));
 
     next(new HttpSuccess(200, result));
diff --git a/src/routes/services.js b/src/routes/services.js
index 5f66a28b1..45c7cecc6 100644
--- a/src/routes/services.js
+++ b/src/routes/services.js
@@ -145,7 +145,7 @@ async function getMetrics(req, res, next) {
     const fromSecs = parseInt(req.query.fromSecs);
     const intervalSecs = parseInt(req.query.intervalSecs);
     const noNullPoints = !!req.query.noNullPoints;
-    const [error, result] = await safe(metrics.getContainers(req.params.service, { fromSecs, intervalSecs, noNullPoints }));
+    const [error, result] = await safe(metrics.getContainer(req.params.service, { fromSecs, intervalSecs, noNullPoints }));
     if (error) return next(new HttpError(500, error));
 
     next(new HttpSuccess(200, result));
diff --git a/src/services.js b/src/services.js
index c700b200b..b074cbb1f 100644
--- a/src/services.js
+++ b/src/services.js
@@ -342,7 +342,7 @@ async function containerStatus(containerName) {
     if (networkError) return { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for ${containerName}: ${networkError.message}` };
     if (response.status !== 200 || !response.body.status) return { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for ${containerName}. Status code: ${response.status} message: ${response.body.message}` };
 
-    const result = await docker.stats(containerName);
+    const result = await docker.getStats(containerName);
     const stats = result.memory_stats || { usage: 0, limit: 1 };
 
     return {
@@ -2045,7 +2045,7 @@ async function statusTurn() {
     if (error && error.reason === BoxError.NOT_FOUND) return { status: exports.SERVICE_STATUS_STOPPED };
     if (error) throw error;
 
-    const result = await docker.stats(container.Id);
+    const result = await docker.getStats(container.Id);
 
     const status = container.State.Running
         ? (container.HostConfig.ReadonlyRootfs ? exports.SERVICE_STATUS_ACTIVE : exports.SERVICE_STATUS_STARTING)
@@ -2110,7 +2110,7 @@ async function statusGraphite() {
     if (networkError) return { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for graphite: ${networkError.message}` };
     if (response.status !== 200) return { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for graphite. Status code: ${response.status} message: ${response.body.message}` };
 
-    const result = await docker.stats('graphite');
+    const result = await docker.getStats('graphite');
     const stats = result.memory_stats || { usage: 0, limit: 1 };
 
     return {