Fix name registrar so it actually works