diff --git a/dataflow_neuro/chips.act b/dataflow_neuro/chips.act
index 2dbc6c4..d1ffb0d 100644
--- a/dataflow_neuro/chips.act
+++ b/dataflow_neuro/chips.act
@@ -78,7 +78,7 @@ defproc chip_texel (bd<N_IN> in, out;
 
 	// Register
 	fifo<N_IN-1,N_BUFFERS> fifo_dmx2reg(.in = _demux.out2, .reset_B = reset_B, .supply = supply);
-	registerA_wr_array<REG_NCA, REG_NCW, REG_M> register(.in = fifo_dmx2reg.out, .data = reg_data,
+	register_wr_array<REG_NCA, REG_NCW, REG_M> register(.in = fifo_dmx2reg.out, .data = reg_data,
 		.supply = supply, .reset_B = reset_B);
 	fifo<N_IN-2,N_BUFFERS> fifo_reg2mrg(.in = register.out, .reset_B = reset_B, .supply = supply);
 
@@ -98,9 +98,9 @@ defproc chip_texel (bd<N_IN> in, out;
 	// Neurons + encoder
     pint NC_NRN;
     NC_NRN = NC_NRN_X + NC_NRN_Y;
-	nrn_hs_2D_array<N_NRN_X,N_NRN_Y,N_LINE_PD_DLY> nrn_grid(.in = neurons,
+	nrn_hs_2d_array<N_NRN_X,N_NRN_Y,N_LINE_PD_DLY> nrn_grid(.in = neurons,
 		.supply = supply, .reset_B = reset_B);
-	encoder2D<NC_NRN_X, NC_NRN_Y, N_NRN_X, N_NRN_Y, 16> encoder(
+	encoder2d<NC_NRN_X, NC_NRN_Y, N_NRN_X, N_NRN_Y, 16> encoder(
 		.inx = nrn_grid.outx,
 		.iny = nrn_grid.outy,
 		.reset_B = reset_B, .supply = supply
diff --git a/dataflow_neuro/coders.act b/dataflow_neuro/coders.act
index 1302e83..1c2e8aa 100644
--- a/dataflow_neuro/coders.act
+++ b/dataflow_neuro/coders.act
@@ -604,7 +604,7 @@ defproc decoder_2d_hybrid (avMx1of2<NxC+NyC> in; a1of1 out[Nx*Ny]; bool? dly_cfg
 
 
 		export template<pint NxC, NyC, Nx, Ny, ACK_STRENGTH>
-		defproc encoder2D(a1of1 inx[Nx]; a1of1 iny[Ny]; avMx1of2<(NxC + NyC)> out; power supply; bool reset_B)		{
+		defproc encoder2d(a1of1 inx[Nx]; a1of1 iny[Ny]; avMx1of2<(NxC + NyC)> out; power supply; bool reset_B)		{
 			// Reset buffers
 			pint H = 2*(NxC + NyC); //Reset strength? to be investigated
 			bool _reset_BX,_reset_BXX[H];
@@ -736,7 +736,7 @@ defproc decoder_2d_hybrid (avMx1of2<NxC+NyC> in; a1of1 out[Nx*Ny]; bool? dly_cfg
 	   * Then performs a 2d handshake out outy then outx.
 	   */
 		export
-		defproc nrn_hs_2D(a1of1 in; a1of1 outx; a1of1 outy; power supply; bool reset_B)	{
+		defproc nrn_hs_2d(a1of1 in; a1of1 outx; a1of1 outy; power supply; bool reset_B)	{
 			bool _reset_BX;
 			BUF_X2 reset_buf(.a = reset_B, .y = _reset_BX, .vdd = supply.vdd, .vss = supply.vss);
 
@@ -798,7 +798,7 @@ defproc decoder_2d_hybrid (avMx1of2<NxC+NyC> in; a1of1 out[Nx*Ny]; bool? dly_cfg
 	   * It should probably be set to 0 though.
 	   */
 		export template<pint Nx, Ny, N_dly>
-		defproc nrn_hs_2D_array(a1of1 in[Nx*Ny]; a1of1 outx[Nx], outy[Ny];
+		defproc nrn_hs_2d_array(a1of1 in[Nx*Ny]; a1of1 outx[Nx], outy[Ny];
 			power supply; bool reset_B) {
 
 			// Make hella signal buffers
@@ -848,7 +848,7 @@ defproc decoder_2d_hybrid (avMx1of2<NxC+NyC> in; a1of1 out[Nx*Ny]; bool? dly_cfg
 
 			// Create handshake grid 
 			pint index;
-			nrn_hs_2D neurons[Nx*Ny];
+			nrn_hs_2d neurons[Nx*Ny];
 			(i:0..Nx-1:
 				(j:0..Ny-1:
 					index = i + j*Nx;
diff --git a/dataflow_neuro/registers.act b/dataflow_neuro/registers.act
index 4f90de3..141dc21 100644
--- a/dataflow_neuro/registers.act
+++ b/dataflow_neuro/registers.act
@@ -339,7 +339,7 @@ sigbuf<N> en_buf_f(.in=_en, .out=_en_X_f, .supply=supply);
  * Currently only handles writing.
  */
 export template<pint N>
-defproc registerA(avMx1of2<N+1> in; Mx1of2<N> out;
+defproc register_acells(avMx1of2<N+1> in; Mx1of2<N> out;
     bool? reset_B; power supply) {
 
 // BIG TODO
@@ -409,7 +409,7 @@ AND2_X1 gandalf_f[N];
  * [-addr-][-word-][r/w]
  */
 export template<pint NcA, NcW, M>
-defproc registerA_w_array(avMx1of2<NcA + NcW + 1> in; Mx1of2<NcW> data[M];
+defproc register_w_array(avMx1of2<NcA + NcW + 1> in; Mx1of2<NcW> data[M];
     bool? reset_B; power supply) {
 
 // BIG TODO
@@ -442,7 +442,7 @@ A_2C_B_X1 write_selectors[M];
 )
 
 // Registers
-registerA<NcW> registers[M];
+register_acells<NcW> registers[M];
 TIELO_X1 tielow_writebit_f[M];
 (i:M:
     // Connect each register to word inputs.
@@ -478,7 +478,7 @@ TIELO_X1 tielow_writebit_f[M];
  * [-addr-][-word-][r/w]
  */
 export template<pint NcA, NcW, M>
-defproc registerA_wr_array(avMx1of2<NcA + NcW + 1> in; Mx1of2<NcW> data[M]; avMx1of2<NcA+NcW> out;
+defproc register_wr_array(avMx1of2<NcA + NcW + 1> in; Mx1of2<NcW> data[M]; avMx1of2<NcA+NcW> out;
     bool? reset_B; power supply) {
 
 // BIG TODO
@@ -521,7 +521,7 @@ A_2C_B_X1 write_selectors[M];
 
 
 // Registers
-registerA<NcW> registers[M];
+register_acells<NcW> registers[M];
 TIELO_X1 tielow_writebit_f[M];
 (i:M:
     // Connect each register to word inputs.