Improve prefix
Centralising filtering
Improve name gen