diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 4d9ac237486..388c2f042ca 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -128,8 +128,8 @@ Sega NAOMI Mainboard PCB Layout
 |          LED2                     14.7456MHz      |
 |---------------------------------------------------|
 Notes:
-            SH4 - Hitachi SH4 CPU (BGAxxx, with heatsink)
-       POWERVR2 - NEC POWERVR2 Video Generator IC (large BGAxxx, with heatsink and fan)
+            SH4 - Hitachi HD6417091 SH4 CPU (BGAxxx, with heatsink)
+       POWERVR2 - VideoLogic/NEC 'CLX2/HOLLY' chipset and PowerVR2 GPU (large BGAxxx, with heatsink and fan)
 EPF8452AQC160-3 - Altera FLEX EPF8452AQC160-3 FPGA (QFP160)
           93C46 - 128 bytes serial EEPROM (SOIC8)
       BIOS.IC27 - 27C160 EPROM (DIP42)
@@ -137,10 +137,10 @@ EPF8452AQC160-3 - Altera FLEX EPF8452AQC160-3 FPGA (QFP160)
     HY57V161610 - Hynix HY57V161610DTC-8 512k x 16-bit x 2-banks (16Mbit) SDRAM (TSOPII-50)
      KM416S4030 - Samsung KM416S4030 1M x 16-bit x 4 Banks SDRAM (TSOPII-54)
           62256 - 32k x8-bit SRAM (SOP28)
-       315-6145 - Sega Custom IC (QFP56)
-       315-6146 - Sega Custom IC (QFP176)
+       315-6145 - video DAC/encoder, BU1426KS equivalent (QFP56)
+       315-6146 - Sega Custom Z80-based MCU (QFP176)
        315-6188 - Altera EPC1064PC8 FPGA Configuration Device with sticker '315-6188' at IC31 (DIP8)
-       315-6232 - Sega Custom IC (QFP100)
+       315-6232 - Yamaha AICA SPU (QFP100)
      CY2308SC-3 - Cypress CY2308SC-3 2-Bank 4-Output Tri-state PLL Programmable Clock Generator IC with 2X or 4X outputs and Zero Delay Buffer (SOIC16)
            C844 - NEC uPC844 Quad Operational Amplifier (SOIC14)
           A179B - TI SN75179B Differential Driver and Receiver Pair (DIP8)
@@ -184,7 +184,7 @@ Sega NAOMI 2 Mainboard PCB Layout
 |                  LED2 LED1    *CY2308 CY2292  3773|
 |---------------------------------------------------|
 Notes: (* - these parts on other side of PCB)
-            SH4 - Hitachi SH4 CPU (BGAxxx, with heatsink)
+            SH4 - Hitachi HD6417091 SH4 CPU (BGAxxx, with heatsink)
       BIOS.IC27 - 27C160 EPROM (DIP42)
         EPF8452 - Altera FLEX EPF8452AQC160-3 FPGA (QFP160)
           93C46 - 128 bytes serial EEPROM (SOIC8)
@@ -192,14 +192,14 @@ Notes: (* - these parts on other side of PCB)
             16M - Hynix HY57V161610DTC-8 512k x 16-bit x 2-banks (16Mbit) SDRAM (TSOP-II 50)
             64M - NEC D4564323 512k x 32-bit x 4-banks (64Mbit) SDRAM (TSOP-II 86)
           62256 - 32k x8-bit SRAM (SOP28)
-       315-6146 - Sega Custom IC (QFP176)
+       315-6146 - Sega Custom Z80-based MCU (QFP176)
        315-6188 - Altera EPC1064PC8 FPGA Configuration Device with sticker '315-6188' at IC31 (DIP8)
-       315-6232 - Sega Custom IC (QFP100)
-       315-6258 - Sega Custom IC (QFP56)
-       315-6267 - NEC POWER-VR2 Video Generator IC (large BGAxxx, with heatsink and fan, x2)
+       315-6232 - Yamaha AICA SPU (QFP100)
+       315-6258 - video DAC/encoder, BU1426KS equivalent (QFP56, x2)
+       315-6267 - VideoLogic/NEC 'CLX2/HOLLY' chipset and PowerVR2 GPU (large BGAxxx, with heatsink and fan, x2)
        315-6268 - Altera EPM7032AELC44-10 CPLD with sticker '315-6268' (PLCC44)
        315-6269 - Altera MAX EPM7064AETC100-10 CPLD with sticker '315-6269' (TQFP100)
-       315-6289 - Sega custom IC (large BGAxxx, with heatsink)
+       315-6289 - VideoLogic/NEC 'ELAN' T&L coprocessor (large BGAxxx, with heatsink)
         MC33470 - ON Semiconductor MC33470 Synchronous Rectification DC/DC Converter Programmable Integrated Controller (SOIC20)
          CY2308 - Cypress CY2308SC-3 2-Bank 4-Output Tri-state PLL Programmable Clock Generator IC with 2X or 4X outputs and Zero Delay Buffer (SOIC16)
          CY2292 - Cypress CY2292SL Three-PLL General-Purpose EPROM Programmable Clock Generator IC (SOIC16)