diff --git a/core/base-service/redirector.spec.js b/core/base-service/redirector.spec.js
index 4a6eb54037..6fb81c5f54 100644
--- a/core/base-service/redirector.spec.js
+++ b/core/base-service/redirector.spec.js
@@ -90,7 +90,7 @@ describe('Redirector', function() {
 
     it('should forward the query params', async function() {
       const { statusCode, headers } = await got(
-        `${baseUrl}/very/old/service/hello-world.svg?colorB=123&style=flat-square`,
+        `${baseUrl}/very/old/service/hello-world.svg?color=123&style=flat-square`,
         {
           followRedirect: false,
         }
@@ -98,7 +98,7 @@ describe('Redirector', function() {
 
       expect(statusCode).to.equal(301)
       expect(headers.location).to.equal(
-        '/new/service/hello-world.svg?colorB=123&style=flat-square'
+        '/new/service/hello-world.svg?color=123&style=flat-square'
       )
     })
   })
diff --git a/services/docker/docker-automated.tester.js b/services/docker/docker-automated.tester.js
index a62f2cb85b..fb14a8820c 100644
--- a/services/docker/docker-automated.tester.js
+++ b/services/docker/docker-automated.tester.js
@@ -49,33 +49,3 @@ t.create('docker automated build - manual')
       .reply(200, { is_automated: false })
   )
   .expectJSON({ name: 'docker build', value: 'manual', color: 'yellow' })
-
-t.create('docker automated build - colorB override in manual')
-  .get('/_/ubuntu.json?colorB=fedcba&style=_shields_test')
-  .intercept(nock =>
-    nock('https://registry.hub.docker.com/')
-      .get('/v2/repositories/library/ubuntu')
-      .reply(200, { is_automated: false })
-  )
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'docker build',
-      value: isAutomatedBuildStatus,
-      color: '#fedcba',
-    })
-  )
-
-t.create('docker automated build - colorB override in automated')
-  .get('/_/ubuntu.json?colorB=fedcba&style=_shields_test')
-  .intercept(nock =>
-    nock('https://registry.hub.docker.com/')
-      .get('/v2/repositories/library/ubuntu')
-      .reply(200, { is_automated: true })
-  )
-  .expectJSONTypes(
-    Joi.object().keys({
-      name: 'docker build',
-      value: isAutomatedBuildStatus,
-      color: '#fedcba',
-    })
-  )
diff --git a/services/dynamic/dynamic-json.tester.js b/services/dynamic/dynamic-json.tester.js
index 2e9f614f84..c998d8348c 100644
--- a/services/dynamic/dynamic-json.tester.js
+++ b/services/dynamic/dynamic-json.tester.js
@@ -103,7 +103,7 @@ t.create('JSON from url | invalid url')
 
 t.create('JSON from url | user color overrides default')
   .get(
-    '.json?url=https://github.com/badges/shields/raw/master/package.json&query=$.name&colorB=10ADED&style=_shields_test'
+    '.json?url=https://github.com/badges/shields/raw/master/package.json&query=$.name&color=10ADED&style=_shields_test'
   )
   .expectJSON({ name: 'custom badge', value: 'shields.io', color: '#10aded' })
 
@@ -118,7 +118,7 @@ t.create('JSON from url | error color overrides default')
   })
 
 t.create('JSON from url | error color overrides user specified')
-  .get('.json?query=$.version&colorB=10ADED&style=_shields_test')
+  .get('.json?query=$.version&color=10ADED&style=_shields_test')
   .expectJSON({
     name: 'custom badge',
     value: 'invalid query parameter: url',
diff --git a/services/dynamic/dynamic-xml.tester.js b/services/dynamic/dynamic-xml.tester.js
index d736495eee..428594198b 100644
--- a/services/dynamic/dynamic-xml.tester.js
+++ b/services/dynamic/dynamic-xml.tester.js
@@ -122,7 +122,7 @@ t.create('XML from url | invalid url')
 
 t.create('XML from url | user color overrides default')
   .get(
-    '.json?url=https://services.addons.mozilla.org/en-US/firefox/api/1.5/addon/707078&query=/addon/name&colorB=10ADED&style=_shields_test'
+    '.json?url=https://services.addons.mozilla.org/en-US/firefox/api/1.5/addon/707078&query=/addon/name&color=10ADED&style=_shields_test'
   )
   .expectJSON({
     name: 'custom badge',
@@ -141,7 +141,7 @@ t.create('XML from url | error color overrides default')
   })
 
 t.create('XML from url | error color overrides user specified')
-  .get('.json?query=//version&colorB=10ADED&style=_shields_test')
+  .get('.json?query=//version&color=10ADED&style=_shields_test')
   .expectJSON({
     name: 'custom badge',
     value: 'invalid query parameter: url',
diff --git a/services/dynamic/dynamic-yaml.tester.js b/services/dynamic/dynamic-yaml.tester.js
index d498479b11..671bcc0e85 100644
--- a/services/dynamic/dynamic-yaml.tester.js
+++ b/services/dynamic/dynamic-yaml.tester.js
@@ -80,7 +80,7 @@ t.create('YAML from url | invalid url')
 
 t.create('YAML from url | user color overrides default')
   .get(
-    '.json?url=https://raw.githubusercontent.com/kubernetes/charts/568291d6e476c39ca8322c30c3f601d0383d4760/stable/coredns/Chart.yaml&query=$.name&colorB=10ADED&style=_shields_test'
+    '.json?url=https://raw.githubusercontent.com/kubernetes/charts/568291d6e476c39ca8322c30c3f601d0383d4760/stable/coredns/Chart.yaml&query=$.name&color=10ADED&style=_shields_test'
   )
   .expectJSON({ name: 'custom badge', value: 'coredns', color: '#10aded' })
 
@@ -95,7 +95,7 @@ t.create('YAML from url | error color overrides default')
   })
 
 t.create('YAML from url | error color overrides user specified')
-  .get('.json?query=$.version&colorB=10ADED&style=_shields_test')
+  .get('.json?query=$.version&color=10ADED&style=_shields_test')
   .expectJSON({
     name: 'custom badge',
     value: 'invalid query parameter: url',
diff --git a/services/github/github-stars.tester.js b/services/github/github-stars.tester.js
index 2727438331..aba67e6377 100644
--- a/services/github/github-stars.tester.js
+++ b/services/github/github-stars.tester.js
@@ -21,7 +21,7 @@ t.create('Stars (repo not found)')
   })
 
 t.create('Stars (named color override)')
-  .get('/badges/shields.json?colorB=yellow&style=_shields_test')
+  .get('/badges/shields.json?color=yellow&style=_shields_test')
   .expectJSONTypes(
     Joi.object().keys({
       name: 'stars',
@@ -31,7 +31,7 @@ t.create('Stars (named color override)')
   )
 
 t.create('Stars (hex color override)')
-  .get('/badges/shields.json?colorB=abcdef&style=_shields_test')
+  .get('/badges/shields.json?color=abcdef&style=_shields_test')
   .expectJSONTypes(
     Joi.object().keys({
       name: 'stars',
diff --git a/services/static-badge/static-badge.tester.js b/services/static-badge/static-badge.tester.js
index c6daccb777..d702247fa3 100644
--- a/services/static-badge/static-badge.tester.js
+++ b/services/static-badge/static-badge.tester.js
@@ -38,12 +38,16 @@ t.create('"Shields-encoded" dash')
   .get('/badge/best--license-Apache--2.0-blue.json?style=_shields_test')
   .expectJSON({ name: 'best-license', value: 'Apache-2.0', color: 'blue' })
 
-t.create('Override colorB')
+t.create('Override color')
+  .get('/badge/label-message-blue.json?style=_shields_test&color=yellow')
+  .expectJSON({ name: 'label', value: 'message', color: 'yellow' })
+
+t.create('Override color (legacy)')
   .get('/badge/label-message-blue.json?style=_shields_test&colorB=yellow')
   .expectJSON({ name: 'label', value: 'message', color: 'yellow' })
 
-t.create('Override colorB with a number')
-  .get('/badge/label-message-blue.json?style=_shields_test&colorB=123')
+t.create('Override color with a number')
+  .get('/badge/label-message-blue.json?style=_shields_test&color=123')
   .expectJSON({ name: 'label', value: 'message', color: '#123' })
 
 t.create('Override label')