diff --git a/elink/README.md b/elink/README.md
index 31f608d..385abae 100644
--- a/elink/README.md
+++ b/elink/README.md
@@ -149,9 +149,40 @@ has the following bit ordering.
  srcaddr[31:0] | [103:72]| Return address for read-request, upper data for write
 
 ###INTERNAL STRUCTURE
+```
+elink
+ |----ereset
+ |----ecfg_clocks
+ |----eclocks
+ |----ecfg_cdc
+ |----erx
+ |     |----erx_io (chip level I/O interface
+ |     |----erx_protocol (elink protocol-->emesh packet converter)
+ |     |----erx_remap (simple dstaddr remapping)
+ |     |----erx_mmu (advanced dstaddr mapping)
+ |     |----erx_cfgif (configuration interface)
+ |     |----erx_cfg (basic rx config registers)
+ |     |----erx_mailbox (fifo mailbox)
+ |     |----erx_dma (DMA master)
+ |     |----erx_disty (sends rx transaction to WR/RD/RR fifo)
+ |     |----rxwr_fifo (write fifo)
+ |     |----rxrd_fifo (read request fifo)
+ |     |----rxrr_fifo (read response fifo)
+ |----etx
+ |     |----etx_io (chip level I/O interface)
+ |     |----etx_protocol (emesh-->elink protocol converter)
+ |     |----etx_remap (simple dstaddr remapping)
+ |     |----etx_mmu (advanced dstaddr mapping)
+ |     |----etx_cfgif (configuration interface)
+ |     |----etx_cfg (basic rx config registers)
+ |     |----etx_dma (DMA master)
+ |     |----etx_arbiter (sends rx transaction to WR/RD/RR fifo)
+ |     |----txwr_fifo (write fifo)
+ |     |----txrd_fifo (read request fifo)
+ |     |----txrr_fifo (read response fifo)
+ |--------------------------------------------------------------------
+```
 
-(link to picture) 
- 
 ###REGISTER MAP  
  
 The full 32 bit physical address of an elink register is the address seen below
diff --git a/elink/hdl/elink.v b/elink/hdl/elink.v
index 3caca82..7bb73d7 100644
--- a/elink/hdl/elink.v
+++ b/elink/hdl/elink.v
@@ -268,7 +268,7 @@ module elink(/*AUTOARG*/
                              .reset             (elink_reset),          
                        );
    */
-   fifo_cdc fifo_cdc (/*AUTOINST*/
+   fifo_cdc ecfg_cdc (/*AUTOINST*/
 		      // Outputs
 		      .wait_in		(etx_cfg_wait),		 // Templated
 		      .access_out	(erx_cfg_access),	 // Templated
diff --git a/elink/hdl/erx.v b/elink/hdl/erx.v
index b20528a..538ac83 100644
--- a/elink/hdl/erx.v
+++ b/elink/hdl/erx.v
@@ -205,7 +205,7 @@ module erx (/*AUTOARG*/
                            );
    */
 
-   emmu emmu (
+   emmu erx_mmu (
 	      /*AUTOINST*/
 	      // Outputs
 	      .mi_dout			(mi_mmu_dout[DW-1:0]),	 // Templated
@@ -241,8 +241,8 @@ module erx (/*AUTOARG*/
     );
     */
    
-   defparam ecfg_if.RX=1;
-   ecfg_if ecfg_if (/*AUTOINST*/
+   defparam erx_cfgif.RX=1;
+   ecfg_if erx_cfgif (/*AUTOINST*/
 		    // Outputs
 		    .wait_out		(),			 // Templated
 		    .mi_mmu_en		(mi_mmu_en),
@@ -293,7 +293,7 @@ module erx (/*AUTOARG*/
 
 
 
-   ecfg_rx ecfg_rx (.rx_status    	(rx_status[15:0]),
+   ecfg_rx erx_cfg (.rx_status    	(rx_status[15:0]),
 		    .timer_cfg		(),
 		     /*AUTOINST*/
 		    // Outputs
@@ -329,7 +329,7 @@ module erx (/*AUTOARG*/
         */
 
    //shares register space with ecfg_rx
-   emailbox emailbox(.mi_en		(mi_cfg_en),
+   emailbox erx_mailbox(.mi_en		(mi_cfg_en),
 		     /*AUTOINST*/
 		     // Outputs
 		     .mi_dout		(mi_mailbox_dout[31:0]), // Templated
@@ -355,7 +355,7 @@ module erx (/*AUTOARG*/
                              
                                );
    */   
-   edma edma(/*AUTOINST*/
+   edma erx_dma(/*AUTOINST*/
 	     // Outputs
 	     .mi_dout			(mi_dma_dout[DW-1:0]),	 // Templated
 	     .edma_access		(edma_access),		 // Templated
diff --git a/elink/hdl/etx.v b/elink/hdl/etx.v
index 818ae54..920674a 100644
--- a/elink/hdl/etx.v
+++ b/elink/hdl/etx.v
@@ -209,7 +209,7 @@ module etx(/*AUTOARG*/
                                );
     */
    
-   edma edma (/*AUTOINST*/
+   edma etx_dma (/*AUTOINST*/
 	      // Outputs
 	      .mi_dout			(mi_dma_dout[DW-1:0]),	 // Templated
 	      .edma_access		(edma_access),		 // Templated
@@ -268,8 +268,8 @@ module etx(/*AUTOARG*/
     );
         */
    
-   defparam ecfg_if.RX =0;   
-   ecfg_if ecfg_if (.mi_dout3		(64'b0),
+   defparam etx_cfgif.RX =0;   
+   ecfg_if etx_cfgif (.mi_dout3		(64'b0),
 		    /*AUTOINST*/
 		    // Outputs
 		    .wait_out		(etx_cfg_wait),		 // Templated
@@ -317,7 +317,7 @@ module etx(/*AUTOARG*/
 			      txwr_fifo_full	          //0
 			      };
 
-   ecfg_tx ecfg_tx (
+   ecfg_tx etx_cfg (
 		    /*AUTOINST*/
 		    // Outputs
 		    .mi_dout		(mi_cfg_dout[DW-1:0]),	 // Templated
@@ -384,7 +384,7 @@ module etx(/*AUTOARG*/
                          );
    */
 
-   emmu emmu (
+   emmu etx_mmu (
 	      /*AUTOINST*/
 	      // Outputs
 	      .mi_dout			(mi_mmu_dout[DW-1:0]),	 // Templated