coil: replace non-inclusive terms with "placeholder"

BUG=b:173227629
TEST=make buildall -j

Change-Id: I2b203dfe45416aa3b632f6f788d14264b08f44e0
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3293252
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>

26 files changed, 74 insertions, 73 deletions

diff --git a/board/host/board.c b/board/host/board.c
index c531e00ec6..210787f3a3 100644
--- a/board/host/board.c
+++ b/board/host/board.c
@@ -28,17 +28,17 @@
 
 #include "gpio_list.h"
 
-test_mockable_static int dummy_temp_get_val(int idx, int *temp_ptr)
+test_mockable_static int placeholder_temp_get_val(int idx, int *temp_ptr)
 {
 	*temp_ptr = 0;
 	return EC_SUCCESS;
 }
 
 const struct temp_sensor_t temp_sensors[] = {
-	{"CPU", TEMP_SENSOR_TYPE_CPU, dummy_temp_get_val, 0, 3},
-	{"Board", TEMP_SENSOR_TYPE_BOARD, dummy_temp_get_val, 1, 3},
-	{"Case", TEMP_SENSOR_TYPE_CASE, dummy_temp_get_val, 2, 0},
-	{"Battery", TEMP_SENSOR_TYPE_BOARD, dummy_temp_get_val, 3, 0},
+	{"CPU", TEMP_SENSOR_TYPE_CPU, placeholder_temp_get_val, 0, 3},
+	{"Board", TEMP_SENSOR_TYPE_BOARD, placeholder_temp_get_val, 1, 3},
+	{"Case", TEMP_SENSOR_TYPE_CASE, placeholder_temp_get_val, 2, 0},
+	{"Battery", TEMP_SENSOR_TYPE_BOARD, placeholder_temp_get_val, 3, 0},
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
 
diff --git a/chip/g/config_chip.h b/chip/g/config_chip.h
index 29d1fb0638..98a743b6dd 100644
--- a/chip/g/config_chip.h
+++ b/chip/g/config_chip.h
@@ -58,7 +58,7 @@
 /* Magic for gpio.inc */
 #define GPIO_PIN(port, index) (port), (1 << (index))
 #define GPIO_PIN_MASK(port, mask) (port), (mask)
-#define DUMMY_GPIO_BANK 0
+#define PLACEHOLDER_GPIO_BANK 0
 
 #define PCLK_FREQ  (24 * 1000 * 1000)
 
diff --git a/chip/g/watchdog.c b/chip/g/watchdog.c
index c5560fc0d7..25355a5f4e 100644
--- a/chip/g/watchdog.c
+++ b/chip/g/watchdog.c
@@ -69,9 +69,11 @@ void watchdog_reload(void)
 	 * the first timeout we need to reset the interrupt bit. */
 	if (status) {
 		GR_WATCHDOG_ICR = status;
-		/* That doesn't seem to unpend the watchdog interrupt (even if
-		 * we do dummy writes to force the write to be committed), so
-		 * explicitly unpend the interrupt before re-enabling it. */
+		/*
+		 * That doesn't seem to unpend the watchdog interrupt (even if
+		 * we do placeholder writes to force the write to be committed),
+		 * so explicitly unpend the interrupt before re-enabling it.
+		 */
 		task_clear_pending_irq(GC_IRQNUM_WATCHDOG0_WDOGINT);
 		task_enable_irq(GC_IRQNUM_WATCHDOG0_WDOGINT);
 	}
diff --git a/chip/host/clock.c b/chip/host/clock.c
index 1bb3d56dfb..e4e512ca92 100644
--- a/chip/host/clock.c
+++ b/chip/host/clock.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Dummy clock driver for unit test.
+ * Placeholder clock driver for unit test.
  */
 
 #include "clock.h"
diff --git a/chip/host/i2c.c b/chip/host/i2c.c
index c35f60f528..bcca8548de 100644
--- a/chip/host/i2c.c
+++ b/chip/host/i2c.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Dummy I2C driver for unit test.
+ * Placeholder I2C driver for unit test.
  */
 
 #include "hooks.h"
diff --git a/chip/host/spi_controller.c b/chip/host/spi_controller.c
index e7dfae481e..c5a5999f58 100644
--- a/chip/host/spi_controller.c
+++ b/chip/host/spi_controller.c
@@ -2,7 +2,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Dummy SPI Controller driver for unit test.
+ * Placeholder SPI Controller driver for unit test.
  */
 
 #include <stdint.h>
diff --git a/chip/host/trng.c b/chip/host/trng.c
index 80b52ce452..eb95aef80e 100644
--- a/chip/host/trng.c
+++ b/chip/host/trng.c
@@ -3,7 +3,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Dummy TRNG driver for unit test.
+ * Placeholder TRNG driver for unit test.
  *
  * Although a TRNG is designed to be anything but predictable,
  * this implementation strives to be as predictable and defined
diff --git a/common/cmsg.c b/common/cmsg.c
index af733e72ef..63560171df 100644
--- a/common/cmsg.c
+++ b/common/cmsg.c
@@ -33,7 +33,7 @@ struct console_packet {
 
 	/* Set if the sender had to discard packets due to buffer overflow. */
 	uint8_t overflow : 1;
-	uint8_t dummy : 3;
+	uint8_t placeholder : 3;
 
 	/* Channel; values from enum console_channel */
 	uint8_t channel;
diff --git a/common/new_nvmem.c b/common/new_nvmem.c
index 1be4d4b4b2..da6d5f4370 100644
--- a/common/new_nvmem.c
+++ b/common/new_nvmem.c
@@ -707,7 +707,7 @@ static enum ec_error_list set_first_page_header(void)
  */
 static int container_is_valid(struct nn_container *ch)
 {
-	struct nn_container dummy_c;
+	struct nn_container placeholder_c;
 	uint32_t hash;
 	uint32_t preserved_hash;
 	uint8_t preserved_type;
@@ -723,9 +723,9 @@ static int container_is_valid(struct nn_container *ch)
 	ch->container_hash = preserved_hash;
 	ch->container_type = preserved_type;
 
-	dummy_c.container_hash = hash;
+	placeholder_c.container_hash = hash;
 
-	return dummy_c.container_hash == ch->container_hash;
+	return placeholder_c.container_hash == ch->container_hash;
 }
 
 static uint32_t aligned_container_size(const struct nn_container *ch)
@@ -1881,7 +1881,7 @@ static void restore_object(void *pad, size_t size)
  * flash - it would never be reinstated even after TPM reinitializes.
  *
  * The reserved_bitmap array is a bitmap of all detected reserved objects,
- * those not in the array are initialized to a dummy initial value.
+ * those not in the array are initialized to a placeholder initial value.
  */
 static enum ec_error_list verify_reserved(uint8_t *reserved_bitmap,
 					  struct nn_container *ch)
@@ -3053,7 +3053,7 @@ int nvmem_erase_tpm_data_selective(const uint32_t *objs_to_erase)
 
 	/*
 	 * Now fill up the current flash page with erased objects to make sure
-	 * that it would be erased during next compaction. Use dummy key,
+	 * that it would be erased during next compaction. Use placeholder key,
 	 * value pairs as the erase objects.
 	 */
 	saved_list_index = controller_at.list_index;
diff --git a/common/test_util.c b/common/test_util.c
index 2d2d3ba462..da0daa49c7 100644
--- a/common/test_util.c
+++ b/common/test_util.c
@@ -30,13 +30,13 @@ int __test_error_count;
 /* Weak reference function as an entry point for unit test */
 test_mockable void run_test(void) { }
 
-/* Default dummy test init */
+/* Default placeholder test init */
 test_mockable void test_init(void) { }
 
-/* Default dummy before test */
+/* Default placeholder before test */
 test_mockable void before_test(void) { }
 
-/* Default dummy after test */
+/* Default placeholder after test */
 test_mockable void after_test(void) { }
 
 #ifdef TEST_COVERAGE
diff --git a/core/cortex-m/init.S b/core/cortex-m/init.S
index 5b7afb2ed8..078505d0a8 100644
--- a/core/cortex-m/init.S
+++ b/core/cortex-m/init.S
@@ -103,7 +103,7 @@ _data_end:
 _data_lma_start:
 .long __data_lma_start
 
-/* Dummy functions to avoid linker complaints */
+/* Placeholder functions to avoid linker complaints */
 .global __aeabi_unwind_cpp_pr0
 .global __aeabi_unwind_cpp_pr1
 .global __aeabi_unwind_cpp_pr2
@@ -118,4 +118,3 @@ stack_start:
 .space CONFIG_STACK_SIZE, 0
 stack_end:
 .global stack_end
-
diff --git a/core/cortex-m/switch.S b/core/cortex-m/switch.S
index ae76b64c37..4b87feac88 100644
--- a/core/cortex-m/switch.S
+++ b/core/cortex-m/switch.S
@@ -80,7 +80,8 @@ __switchto:
 .global __task_start
 .thumb_func
 __task_start:
-  ldr r2,=scratchpad     @ area used as dummy thread stack for the first switch
+  ldr r2,=scratchpad     @ area used as placeholder thread stack for the first
+			 @ switch
   mov r3, #2             @ use : priv. mode / thread stack / no floating point
                          @ setting FP to unused here means first context switch
                          @ will not store FP regs
@@ -98,4 +99,3 @@ __task_start:
   /* we should never return here */
   mov r0, #1             @ set to EC_ERROR_UNKNOWN
   bx lr
-
diff --git a/docs/ap-ec-comm.md b/docs/ap-ec-comm.md
index 27d5349ca4..a18cf38824 100644
--- a/docs/ap-ec-comm.md
+++ b/docs/ap-ec-comm.md
@@ -128,7 +128,7 @@ embedded controllers either aren't fast enough or don't have any support for
 hardware flow-control.
 
 It works like this: When the AP sends a byte to the EC, if the EC doesn't have a
-response queued up in advance, a default "dummy" byte is returned. The EC
+response queued up in advance, a default "placeholder" byte is returned. The EC
 preconfigures that default response byte to indicate its status (ready, busy,
 waiting for more input, etc.). Once the AP has sent a complete command message,
 it continues clocking bytes to the EC (which the EC ignores) and just looks at
diff --git a/docs/packetized-console.md b/docs/packetized-console.md
index b14404bf3e..44ad580d13 100644
--- a/docs/packetized-console.md
+++ b/docs/packetized-console.md
@@ -109,7 +109,7 @@ struct console_packet {
 
 	/* Set if the sender had to discard packets due to buffer overflow. */
 	uint8_t overflow : 1;
-	uint8_t dummy : 3;
+	uint8_t placeholder : 3;
 
 	/* Channel; values from enum console_channel */
 	uint8_t channel;
diff --git a/extra/usb_power/stats_manager_unittest.py b/extra/usb_power/stats_manager_unittest.py
index 9d0d708af0..e7fd542f5e 100644
--- a/extra/usb_power/stats_manager_unittest.py
+++ b/extra/usb_power/stats_manager_unittest.py
@@ -22,7 +22,7 @@ class TestStatsManager(unittest.TestCase):
   them in expected format.
   """
 
-  def _populate_dummy_stats(self):
+  def _populate_placeholder_stats(self):
     """Create a populated & processed StatsManager to test data retrieval."""
     self.data.AddSample('A', 99999.5)
     self.data.AddSample('A', 100000.5)
@@ -34,7 +34,7 @@ class TestStatsManager(unittest.TestCase):
     self.data.SetUnit('B', 'mV')
     self.data.CalculateStats()
 
-  def _populate_dummy_stats_no_unit(self):
+  def _populate_placeholder_stats_no_unit(self):
     self.data.AddSample('B', 1000)
     self.data.AddSample('A', 200)
     self.data.SetUnit('A', 'blue')
@@ -112,14 +112,14 @@ class TestStatsManager(unittest.TestCase):
 
   def test_GetRawData(self):
     """GetRawData returns exact same data as fed in."""
-    self._populate_dummy_stats()
+    self._populate_placeholder_stats()
     raw_data = self.data.GetRawData()
     self.assertListEqual([99999.5, 100000.5], raw_data['A'])
     self.assertListEqual([1.5, 2.5, 3.5], raw_data['B'])
 
   def test_GetSummary(self):
     """GetSummary returns expected stats about the data fed in."""
-    self._populate_dummy_stats()
+    self._populate_placeholder_stats()
     summary = self.data.GetSummary()
     self.assertEqual(2, summary['A']['count'])
     self.assertAlmostEqual(100000.5, summary['A']['max'])
@@ -134,7 +134,7 @@ class TestStatsManager(unittest.TestCase):
 
   def test_SaveRawData(self):
     """SaveRawData stores same data as fed in."""
-    self._populate_dummy_stats()
+    self._populate_placeholder_stats()
     dirname = 'unittest_raw_data'
     expected_files = set(['A_mW.txt', 'B_mV.txt'])
     fnames = self.data.SaveRawData(self.tempdir, dirname)
@@ -156,7 +156,7 @@ class TestStatsManager(unittest.TestCase):
 
   def test_SaveRawDataNoUnit(self):
     """SaveRawData appends no unit suffix if the unit is not specified."""
-    self._populate_dummy_stats_no_unit()
+    self._populate_placeholder_stats_no_unit()
     self.data.CalculateStats()
     outdir = 'unittest_raw_data'
     files = self.data.SaveRawData(self.tempdir, outdir)
@@ -168,7 +168,7 @@ class TestStatsManager(unittest.TestCase):
     """SaveRawData uses the smid when creating output filename."""
     identifier = 'ec'
     self.data = stats_manager.StatsManager(smid=identifier)
-    self._populate_dummy_stats()
+    self._populate_placeholder_stats()
     files = self.data.SaveRawData(self.tempdir)
     for fname in files:
       self.assertTrue(os.path.basename(fname).startswith(identifier))
@@ -202,7 +202,7 @@ class TestStatsManager(unittest.TestCase):
     """Title shows up in SummaryToString if title specified."""
     title = 'titulo'
     data = stats_manager.StatsManager(title=title)
-    self._populate_dummy_stats()
+    self._populate_placeholder_stats()
     summary_str = data.SummaryToString()
     self.assertIn(title, summary_str)
 
@@ -241,7 +241,7 @@ class TestStatsManager(unittest.TestCase):
 
   def test_SaveSummary(self):
     """SaveSummary properly dumps the summary into a file."""
-    self._populate_dummy_stats()
+    self._populate_placeholder_stats()
     fname = 'unittest_summary.txt'
     expected_fname = os.path.join(self.tempdir, fname)
     fname = self.data.SaveSummary(self.tempdir, fname)
@@ -265,13 +265,13 @@ class TestStatsManager(unittest.TestCase):
     """SaveSummary uses the smid when creating output filename."""
     identifier = 'ec'
     self.data = stats_manager.StatsManager(smid=identifier)
-    self._populate_dummy_stats()
+    self._populate_placeholder_stats()
     fname = os.path.basename(self.data.SaveSummary(self.tempdir))
     self.assertTrue(fname.startswith(identifier))
 
   def test_SaveSummaryJSON(self):
     """SaveSummaryJSON saves the added data properly in JSON format."""
-    self._populate_dummy_stats()
+    self._populate_placeholder_stats()
     fname = 'unittest_summary.json'
     expected_fname = os.path.join(self.tempdir, fname)
     fname = self.data.SaveSummaryJSON(self.tempdir, fname)
@@ -291,13 +291,13 @@ class TestStatsManager(unittest.TestCase):
     """SaveSummaryJSON uses the smid when creating output filename."""
     identifier = 'ec'
     self.data = stats_manager.StatsManager(smid=identifier)
-    self._populate_dummy_stats()
+    self._populate_placeholder_stats()
     fname = os.path.basename(self.data.SaveSummaryJSON(self.tempdir))
     self.assertTrue(fname.startswith(identifier))
 
   def test_SaveSummaryJSONNoUnit(self):
     """SaveSummaryJSON marks unknown units properly as N/A."""
-    self._populate_dummy_stats_no_unit()
+    self._populate_placeholder_stats_no_unit()
     self.data.CalculateStats()
     fname = 'unittest_summary.json'
     fname = self.data.SaveSummaryJSON(self.tempdir, fname)
diff --git a/include/clock.h b/include/clock.h
index 4b7cbd764f..d722796087 100644
--- a/include/clock.h
+++ b/include/clock.h
@@ -63,7 +63,7 @@ enum bus_type {
 /**
  * Wait for a number of peripheral bus clock cycles.
  *
- * Dummy read on peripherals for delay.
+ * Placeholder read on peripherals for delay.
  *
  * @param bus           Which bus clock cycle to use.
  * @param cycles	Number of cycles to wait.
diff --git a/include/config.h b/include/config.h
index 35ecb4dfae..288a3e480d 100644
--- a/include/config.h
+++ b/include/config.h
@@ -943,7 +943,7 @@
 #undef CONFIG_CHIPSET_COMETLAKE_DISCRETE	/* Intel Cometlake (x86),
 						 * discrete EC control
 						 */
-#undef CONFIG_CHIPSET_ECDRIVEN		/* Dummy power module */
+#undef CONFIG_CHIPSET_ECDRIVEN		/* Placeholder power module */
 #undef CONFIG_CHIPSET_GEMINILAKE	/* Intel Geminilake (x86) */
 #undef CONFIG_CHIPSET_ICELAKE		/* Intel Icelake (x86) */
 #undef CONFIG_CHIPSET_MT817X		/* MediaTek MT817x */
diff --git a/include/gpio.wrap b/include/gpio.wrap
index 37f5dadf43..614c7b4417 100644
--- a/include/gpio.wrap
+++ b/include/gpio.wrap
@@ -80,9 +80,9 @@
  * function/name then it should specify that that GPIO is not implemented using
  * the UNIMPLEMENTED macro below in the board gpio.inc file.  This macro creates
  * an entry in the gpio_signal enum and the gpio_list array that is initialized
- * to use the DUMMY_GPIO_BANK and a bitmask of zero.  The chip GPIO layer is
- * implemented such that writes to and reads from DUMMY_GPIO_BANK with a bitmask
- * of zero are harmless.
+ * to use the PLACEHOLDER_GPIO_BANK and a bitmask of zero.  The chip GPIO layer
+ * is implemented such that writes to and reads from PLACEHOLDER_GPIO_BANK with
+ * a bitmask of zero are harmless.
  *
  * This allows common code that expects these GPIOs to exist to compile and have
  * some reduced functionality.
diff --git a/include/gpio_list.h b/include/gpio_list.h
index 70d7bfc4b2..1245e42fa2 100644
--- a/include/gpio_list.h
+++ b/include/gpio_list.h
@@ -13,7 +13,7 @@
 #define GPIO(name, pin, flags) {#name, GPIO_##pin, flags},
 #endif
 
-#define UNIMPLEMENTED(name) {#name, DUMMY_GPIO_BANK, 0, GPIO_DEFAULT},
+#define UNIMPLEMENTED(name) {#name, PLACEHOLDER_GPIO_BANK, 0, GPIO_DEFAULT},
 #define GPIO_INT(name, pin, flags, signal) GPIO(name, pin, flags)
 
 /* GPIO signal list. */
diff --git a/include/spi.h b/include/spi.h
index b06f266d0c..a9bfc013ee 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -69,8 +69,8 @@ int spi_enable(int port, int enable);
 /* Issue a SPI transaction.  Assumes SPI port has already been enabled.
  *
  * Transmits <txlen> bytes from <txdata>, throwing away the corresponding
- * received data, then transmits <rxlen> dummy bytes, saving the received data
- * in <rxdata>.
+ * received data, then transmits <rxlen> placeholder bytes, saving the received
+ * data in <rxdata>.
  * If SPI_READBACK_ALL is set in <rxlen>, the received data during transmission
  * is recorded in rxdata buffer and it assumes that the real <rxlen> is equal
  * to <txlen>.
diff --git a/test/queue.c b/test/queue.c
index 664cde572e..79df79fa22 100644
--- a/test/queue.c
+++ b/test/queue.c
@@ -17,12 +17,12 @@ static struct queue const test_queue2 = QUEUE_NULL(2, int16_t);
 
 static int test_queue8_empty(void)
 {
-	char dummy = 1;
+	char placeholder = 1;
 
 	queue_init(&test_queue8);
 	TEST_ASSERT(queue_is_empty(&test_queue8));
-	TEST_ASSERT(!queue_remove_units(&test_queue8, &dummy, 1));
-	TEST_ASSERT(queue_add_units(&test_queue8, &dummy, 1) == 1);
+	TEST_ASSERT(!queue_remove_units(&test_queue8, &placeholder, 1));
+	TEST_ASSERT(queue_add_units(&test_queue8, &placeholder, 1) == 1);
 	TEST_ASSERT(!queue_is_empty(&test_queue8));
 
 	return EC_SUCCESS;
@@ -30,10 +30,10 @@ static int test_queue8_empty(void)
 
 static int test_queue8_init(void)
 {
-	char dummy = 1;
+	char placeholder = 1;
 
 	queue_init(&test_queue8);
-	TEST_ASSERT(queue_add_units(&test_queue8, &dummy, 1) == 1);
+	TEST_ASSERT(queue_add_units(&test_queue8, &placeholder, 1) == 1);
 	queue_init(&test_queue8);
 	TEST_ASSERT(queue_is_empty(&test_queue8));
 
diff --git a/test/rma_auth.c b/test/rma_auth.c
index 21f2f2d561..129cc70383 100644
--- a/test/rma_auth.c
+++ b/test/rma_auth.c
@@ -17,9 +17,9 @@
 #include "timer.h"
 #include "util.h"
 
-/* Dummy implementations for testing */
-static uint8_t dummy_board_id[4] = {'Z', 'Z', 'C', 'R'};
-static uint8_t dummy_device_id[8] = {'T', 'H', 'X', 1, 1, 3, 8, 0xfe};
+/* Placeholder implementations for testing */
+static uint8_t placeholder_board_id[4] = {'Z', 'Z', 'C', 'R'};
+static uint8_t placeholder_device_id[8] = {'T', 'H', 'X', 1, 1, 3, 8, 0xfe};
 static int server_protocol_version = RMA_CHALLENGE_VERSION;
 static uint8_t server_private_key[32] = RMA_TEST_SERVER_PRIVATE_KEY;
 static int server_key_id = RMA_TEST_SERVER_KEY_ID;
@@ -35,7 +35,7 @@ void rand_bytes(void *buffer, size_t len)
 
 int read_board_id(struct board_id *id)
 {
-	memcpy(&id->type, dummy_board_id, sizeof(id->type));
+	memcpy(&id->type, placeholder_board_id, sizeof(id->type));
 	id->type_inv = ~id->type;
 	id->flags = 0xFF00;
 	return EC_SUCCESS;
@@ -43,8 +43,8 @@ int read_board_id(struct board_id *id)
 
 int system_get_chip_unique_id(uint8_t **id)
 {
-	*id = dummy_device_id;
-	return sizeof(dummy_device_id);
+	*id = placeholder_device_id;
+	return sizeof(placeholder_device_id);
 }
 
 /**
@@ -101,11 +101,11 @@ int rma_server_side(char *out_auth_code, const char *challenge)
 	 * Since this is just a test, here we'll just make sure the BoardID
 	 * and DeviceID match what we expected.
 	 */
-	if (memcmp(c.board_id, dummy_board_id, sizeof(c.board_id))) {
+	if (memcmp(c.board_id, placeholder_board_id, sizeof(c.board_id))) {
 		printf("BoardID mismatch\n");
 		return -1;
 	}
-	if (memcmp(c.device_id, dummy_device_id, sizeof(c.device_id))) {
+	if (memcmp(c.device_id, placeholder_device_id, sizeof(c.device_id))) {
 		printf("DeviceID mismatch\n");
 		return -1;
 	}
@@ -193,13 +193,13 @@ static int test_rma_auth(void)
 	TEST_ASSERT(rma_server_side(authcode, challenge) == -1);
 	server_key_id--;
 
-	dummy_board_id[0]++;
+	placeholder_board_id[0]++;
 	TEST_ASSERT(rma_server_side(authcode, challenge) == -1);
-	dummy_board_id[0]--;
+	placeholder_board_id[0]--;
 
-	dummy_device_id[0]++;
+	placeholder_device_id[0]++;
 	TEST_ASSERT(rma_server_side(authcode, challenge) == -1);
-	dummy_device_id[0]--;
+	placeholder_device_id[0]--;
 
 	return EC_SUCCESS;
 }
diff --git a/test/stress.c b/test/stress.c
index 442c4b498e..aa7c604765 100644
--- a/test/stress.c
+++ b/test/stress.c
@@ -79,25 +79,25 @@ static int stress(const char *name,
 static int test_i2c(void)
 {
 	int res = EC_ERROR_UNKNOWN;
-	int dummy_data;
+	int placeholder_data;
 	struct i2c_test_param_t *param;
 	param = i2c_test_params + (prng_no_seed() % (sizeof(i2c_test_params) /
 				   sizeof(struct i2c_test_param_t)));
 	if (param->width == 8 && param->data == -1)
 		res = i2c_read8(param->port, param->addr,
-				param->offset, &dummy_data);
+				param->offset, &placeholder_data);
 	else if (param->width == 8 && param->data >= 0)
 		res = i2c_write8(param->port, param->addr,
 				 param->offset, param->data);
 	else if (param->width == 16 && param->data == -1)
 		res = i2c_read16(param->port, param->addr,
-				 param->offset, &dummy_data);
+				 param->offset, &placeholder_data);
 	else if (param->width == 16 && param->data >= 0)
 		res = i2c_write16(param->port, param->addr,
 				  param->offset, param->data);
 	else if (param->width == 32 && param->data == -1)
 		res = i2c_read32(param->port, param->addr,
-				 param->offset, &dummy_data);
+				 param->offset, &placeholder_data);
 	else if (param->width == 32 && param->data >= 0)
 		res = i2c_write32(param->port, param->addr,
 				  param->offset, param->data);
diff --git a/test/thermal.c b/test/thermal.c
index 6f6a7cd358..922b58da78 100644
--- a/test/thermal.c
+++ b/test/thermal.c
@@ -38,7 +38,7 @@ static int cpu_shutdown;
 static int fan_pct;
 static int no_temps_read;
 
-int dummy_temp_get_val(int idx, int *temp_ptr)
+int placeholder_temp_get_val(int idx, int *temp_ptr)
 {
 	if (mock_temp[idx] >= 0) {
 		*temp_ptr = mock_temp[idx];
diff --git a/test/tpm_test/testlib/trng.h b/test/tpm_test/testlib/trng.h
index 07c82f3333..25ff00b4f7 100644
--- a/test/tpm_test/testlib/trng.h
+++ b/test/tpm_test/testlib/trng.h
@@ -3,4 +3,4 @@
  * found in the LICENSE file.
  */
 
-/* Dummy empty file, just to make test compilation work. */
+/* Placeholder empty file, just to make test compilation work. */
diff --git a/test/tpm_test/testlib/util.h b/test/tpm_test/testlib/util.h
index 07c82f3333..25ff00b4f7 100644
--- a/test/tpm_test/testlib/util.h
+++ b/test/tpm_test/testlib/util.h
@@ -3,4 +3,4 @@
  * found in the LICENSE file.
  */
 
-/* Dummy empty file, just to make test compilation work. */
+/* Placeholder empty file, just to make test compilation work. */