Fix name and regex