diff --git a/hw/ip/csrng/doc/_index.md b/hw/ip/csrng/doc/_index.md
index 835c8fb..b0d58a1 100644
--- a/hw/ip/csrng/doc/_index.md
+++ b/hw/ip/csrng/doc/_index.md
@@ -144,13 +144,14 @@
 -----------------------------|------------------|-----------------------------|---------------
 `otp_en_csrng_sw_app_read_i` | `input `         | `otp_en_t `                 | An efuse that will enable firmware to access the NIST ctr_drbg internal state through registers.
 `lc_hw_debug_en_i`           | `input`          | `lc_tx_t `                  | A life-cycle that will allow disabling of the AES encryption block, to be used for debug only.
-`entropy_src_hw_if_o`        | `output`         | `entropy_src_hw_if_req_t`   | Seed request made to the Entropy_src module.
-`entropy_src_hw_if_i`        | `input`          | `entropy_src_hw_if_rsp_t`   | Seed response from the Entropy_src module. 
-`cs_aes_halt_i`              | `input`          | `cs_aes_halt_req_t`         | Request to CSRNG from Entropy_Src to halt requests to the AES block for power leveling purposes.
-`cs_aes_halt_o`              | `output`         | `cs_aes_halt_rsp_t`         | Response from CSRNG to Entropy_Src that all requests to AES block are halted.
+`entropy_src_hw_if_o`        | `output`         | `entropy_src_hw_if_req_t`   | Seed request made to the ENTROPY_SRC module.
+`entropy_src_hw_if_i`        | `input`          | `entropy_src_hw_if_rsp_t`   | Seed response from the ENTROPY_SRC module.
+`cs_aes_halt_i`              | `input`          | `cs_aes_halt_req_t`         | Request to CSRNG from ENTROPY_SRC to halt requests to the AES block for power leveling purposes.
+`cs_aes_halt_o`              | `output`         | `cs_aes_halt_rsp_t`         | Response from CSRNG to ENTROPY_SRC that all requests to AES block are halted.
 `csrng_cmd_i`                | `input`          | `csrng_req_t`               | Application interface request to CSRNG from an EDN block.
 `csrng_cmd_o`                | `output`         | `csrng_rsp_t`               | Application interface response from CSRNG to an EDN block.
 
+
 ## Design Details
 
 #### Non-blocking Commands
@@ -391,7 +392,7 @@
 This 129-bit bus consists of 128-bits, `genbits_bus`, for the random bit sequence itself, along with a single bit flag, `genbits_fips`, indicating whether the bits were considered fully in accordance with FIPS standards.
 
 There are two cases when the sequence will not be FIPS compliant:
-- Early in the boot sequence, the `entropy_src` generates a seed from the first 384 bits pulled from the noise source.
+- Early in the boot sequence, the `ENTROPY_SRC` generates a seed from the first 384 bits pulled from the noise source.
 This initial seed is tested to ensure some minimum quality for obfuscation use- cases, but this boot seed is not expected to be full-entropy nor do these health checks meet the 1024-bit requirement for start-up health checks required by NIST 800-90B.
 - If `flag0` is asserted during instantiation, the resulting DRBG instance will have a fully-deterministic seed, determined only by user input data.
 Such a seed will be created only using factory-entropy and will lack the physical-entropy required by NIST SP 800-90A, and thus this DRBG instance will not be FIPS compliant.
@@ -501,7 +502,7 @@
 
 The `cs_entropy_req` interrupt will assert when csrng requests for entropy from ENTROPY_SRC.
 
-The `cs_hw_inst_exc` interrupt will assert when any of the hardware-controlled CSRNG instances encounters an exception while executing a command, either due to errors on the command sequencing, or an exception within the `entropy_src` IP.
+The `cs_hw_inst_exc` interrupt will assert when any of the hardware-controlled CSRNG instances encounters an exception while executing a command, either due to errors on the command sequencing, or an exception within the `ENTROPY_SRC` IP.
 
 The `cs_fifo_err` interrupt will assert when any of the csrng FIFOs has a malfunction.
 The conditions that cause this to happen are either when there is a push to a full FIFO or a pull from an empty FIFO.
diff --git a/hw/ip/entropy_src/doc/_index.md b/hw/ip/entropy_src/doc/_index.md
index 25d33ab..f56bdbc 100644
--- a/hw/ip/entropy_src/doc/_index.md
+++ b/hw/ip/entropy_src/doc/_index.md
@@ -197,15 +197,15 @@
 -------------------------------|------------------|-----------------------------|---------------
 `otp_en_entropy_src_fw_read_i` | `input `         | `otp_en_t `                 | An efuse that will enable firmware to access final entropy through a register.
 `otp_en_entropy_src_fw_over_i` | `input `         | `otp_en_t `                 | An efuse that will enable firmware to access post-health check raw entropy through a register FIFO.
-`rng_fips_o`                   | `output`         | `logic `                    | Output that indicates to the RNG AST block that Entropy_src block is generating fips level entropy.
-`entropy_src_hw_if_i`          | `input`          | `entropy_src_hw_if_req_t`   | Seed request made to the Entropy_src module.
-`entropy_src_hw_if_o`          | `output`         | `entropy_src_hw_if_rsp_t`   | Seed response from the Entropy_src module. 
-`entropy_src_rng_i`            | `input`          | `entropy_src_hw_if_req_t`   | Request made from RNG AST to the Entropy_src module to provide raw noise bits.
-`entropy_src_rng_o`            | `output`         | `entropy_src_rng_rsp_t`     | Response to RNG AST from the Entropy_src module that raw noise bits were received.
-`cs_aes_halt_o`                | `output`         | `cs_aes_halt_req_t`         | Request from Entropy_Src tp CSRNG that all requests to AES block are halted.
-`cs_aes_halt_i`                | `input`          | `cs_aes_halt_rsp_t`         | Response from CSRNG from Entropy_Src that the AES block is halted for power leveling purposes.
-`entropy_src_xht_o`            | `output`         | `entropy_src_xht_req_t`     | Request from Entropy_Src to an external health test block, which is optional.
-`entropy_src_xht_i`            | `input`          | `entropy_src_xht_rsp_t`     | Response to Entropy_Src from an external health test block, which is optional.
+`rng_fips_o`                   | `output`         | `logic `                    | Output that indicates to the RNG AST block that ENTROPY_SRC module is generating fips level entropy.
+`entropy_src_hw_if_i`          | `input`          | `entropy_src_hw_if_req_t`   | Seed request made to the ENTROPY_SRC module.
+`entropy_src_hw_if_o`          | `output`         | `entropy_src_hw_if_rsp_t`   | Seed response from the ENTROPY_SRC module.
+`entropy_src_rng_i`            | `input`          | `entropy_src_hw_if_req_t`   | Request made from RNG AST to the ENTROPY_SRC module to provide raw noise bits.
+`entropy_src_rng_o`            | `output`         | `entropy_src_rng_rsp_t`     | Response to RNG AST from the ENTROPY_SRC module that raw noise bits were received.
+`cs_aes_halt_o`                | `output`         | `cs_aes_halt_req_t`         | Request from ENTROPY_SRC tp CSRNG that all requests to AES block are halted.
+`cs_aes_halt_i`                | `input`          | `cs_aes_halt_rsp_t`         | Response from CSRNG from ENTROPY_SRC that the AES block is halted for power leveling purposes.
+`entropy_src_xht_o`            | `output`         | `entropy_src_xht_req_t`     | Request from ENTROPY_SRC to an external health test block, which is optional.
+`entropy_src_xht_i`            | `input`          | `entropy_src_xht_rsp_t`     | Response to ENTROPY_SRC from an external health test block, which is optional.
 
 
 ## Design Details