diff --git a/packages/build/src/commands/run.js b/packages/build/src/commands/run.js
index 4cf32aced3..0aef304c04 100644
--- a/packages/build/src/commands/run.js
+++ b/packages/build/src/commands/run.js
@@ -184,8 +184,8 @@ const shouldSkipCommand = function({ event, package, error, failedPlugins }) {
 
 // Wrap command function to measure its time
 const getFireCommand = function({ package, event }) {
-  const metricName = package === undefined ? 'command' : `${normalizeTimerName(package)}.${event}`
-  return measureDuration(tFireCommand, `run_netlify_build.${metricName}`)
+  const metricName = package === undefined ? 'run_netlify_build.command' : `${normalizeTimerName(package)}.${event}`
+  return measureDuration(tFireCommand, metricName)
 }
 
 const tFireCommand = function({
diff --git a/packages/build/tests/time/tests.js b/packages/build/tests/time/tests.js
index 874b5967aa..257957375e 100644
--- a/packages/build/tests/time/tests.js
+++ b/packages/build/tests/time/tests.js
@@ -56,6 +56,6 @@ const TIMINGS = [
   'run_netlify_build.get_plugins_options',
   'run_netlify_build.start_plugins',
   'run_netlify_build.load_plugins',
-  'run_netlify_build.plugin.onBuild',
+  'plugin.onBuild',
   'run_netlify_build.total',
 ]