diff --git a/macros/Makefile b/macros/Makefile
index 31943ad9..ca7bcdc7 100644
--- a/macros/Makefile
+++ b/macros/Makefile
@@ -33,15 +33,15 @@ configs:
 
 .PHONY: configs
 
-BROKEN := \
-	sky130_sram_1kbyte_1r1w_8x1024_8 \
-	sky130_sram_1kbyte_1rw_32x256_8 \
-	sky130_sram_2kbyte_1rw_32x512_8 \
-	sky130_sram_4kbyte_1rw_32x1024_8 \
+BROKEN := 
 
 WORKING_STAMPS=$(filter-out $(addsuffix .ok, $(BROKEN)), $(STAMPS))
+EXAMPLE_STAMPS=$(filter example%, $(WORKING_STAMPS))
+SKY130_STAMPS=$(filter sky130%, $(WORKING_STAMPS))
+FREEPDK45_STAMPS=$(filter freepdk45%, $(WORKING_STAMPS))
+SCN4M_SUBM_STAMPS=$(filter scn4m_subm%, $(WORKING_STAMPS))
 
-all: | configs
+all: | configs 
 	@echo
 	@echo "Building following working configs"
 	@for S in $(WORKING_STAMPS); do echo " - $$S"; done
@@ -49,6 +49,18 @@ all: | configs
 	$(MAKE) $(WORKING_STAMPS)
 	@echo "Built all macros."
 
+example: $(EXAMPLE_STAMPS)
+.PHONY: example
+
+sky130: $(SKY130_STAMPS)
+.PHONY: sky130
+
+freepdk45: $(FREEPDK45_STAMPS)
+.PHONY: freepdk45
+
+scn4m_subm: $(SCN4M_SUBM_STAMPS)
+.PHONY: scn4m_subm
+	
 %.ok: configs/%.py
 	@echo "Building $*"
 	@mkdir -p $*
diff --git a/macros/configs/big_config_scn4m_subm.py b/macros/configs/example_config_big_scn4m_subm.py
similarity index 100%
rename from macros/configs/big_config_scn4m_subm.py
rename to macros/configs/example_config_big_scn4m_subm.py
diff --git a/macros/configs/giant_config_scn4m_subm.py b/macros/configs/example_config_giant_scn4m_subm.py
similarity index 100%
rename from macros/configs/giant_config_scn4m_subm.py
rename to macros/configs/example_config_giant_scn4m_subm.py
diff --git a/macros/configs/medium_config_scn4m_subm.py b/macros/configs/example_config_medium_scn4m_subm.py
similarity index 100%
rename from macros/configs/medium_config_scn4m_subm.py
rename to macros/configs/example_config_medium_scn4m_subm.py
diff --git a/macros/configs/riscv_freepdk45_8kbyte.py b/macros/configs/freepdk45_sram_1rw1r_32x2048_8.py
similarity index 100%
rename from macros/configs/riscv_freepdk45_8kbyte.py
rename to macros/configs/freepdk45_sram_1rw1r_32x2048_8.py
diff --git a/macros/configs/riscv_scn4m_subm_16kbyte_1rw1r.py b/macros/configs/scn4m_subm_sram_16kbyte_1rw1r_32x4096_8.py
similarity index 100%
rename from macros/configs/riscv_scn4m_subm_16kbyte_1rw1r.py
rename to macros/configs/scn4m_subm_sram_16kbyte_1rw1r_32x4096_8.py
diff --git a/macros/configs/riscv_scn4m_subm_1kbyte_1rw1r.py b/macros/configs/scn4m_subm_sram_1kbyte_1rw1r_32x256_8.py
similarity index 100%
rename from macros/configs/riscv_scn4m_subm_1kbyte_1rw1r.py
rename to macros/configs/scn4m_subm_sram_1kbyte_1rw1r_32x256_8.py
diff --git a/macros/configs/riscv_scn4m_subm_2kbyte_1rw1r.py b/macros/configs/scn4m_subm_sram_2kbyte_1rw1r_32x512_8.py
similarity index 100%
rename from macros/configs/riscv_scn4m_subm_2kbyte_1rw1r.py
rename to macros/configs/scn4m_subm_sram_2kbyte_1rw1r_32x512_8.py
diff --git a/macros/configs/riscv_scn4m_subm_32kbyte_1rw1r.py b/macros/configs/scn4m_subm_sram_32kbyte_1rw1r_2x32x4096_8.py
similarity index 98%
rename from macros/configs/riscv_scn4m_subm_32kbyte_1rw1r.py
rename to macros/configs/scn4m_subm_sram_32kbyte_1rw1r_2x32x4096_8.py
index 87ddb5eb..285b1dbf 100644
--- a/macros/configs/riscv_scn4m_subm_32kbyte_1rw1r.py
+++ b/macros/configs/scn4m_subm_sram_32kbyte_1rw1r_2x32x4096_8.py
@@ -1,3 +1,4 @@
+num_banks=2
 word_size = 32
 num_words = 8192
 write_size = 8
diff --git a/macros/configs/riscv_scn4m_subm_4kbyte_1rw1r.py b/macros/configs/scn4m_subm_sram_4kbyte_1rw1r_32x1024_8.py
similarity index 100%
rename from macros/configs/riscv_scn4m_subm_4kbyte_1rw1r.py
rename to macros/configs/scn4m_subm_sram_4kbyte_1rw1r_32x1024_8.py
diff --git a/macros/configs/riscv_scn4m_subm_8kbyte_1rw1r.py b/macros/configs/scn4m_subm_sram_8kbyte_1rw1r_32x2048_8.py
similarity index 100%
rename from macros/configs/riscv_scn4m_subm_8kbyte_1rw1r.py
rename to macros/configs/scn4m_subm_sram_8kbyte_1rw1r_32x2048_8.py